Merge pull request #738 from gazpachoking/any-mapping-attrs

[PR] Allow any Mapping children to specify attributes. fix #737

Author: jph00

fasthtml/components.py

@@ -19,7 +19,7 @@
 # %% ../nbs/api/01_components.ipynb
 from dataclasses import dataclass, asdict, is_dataclass, make_dataclass, replace, astuple, MISSING
 from bs4 import BeautifulSoup, Comment
-from typing import Literal, Optional
+from typing import Literal, Mapping, Optional
 
 from fastcore.utils import *
 from fastcore.xml import *
@@ -84,7 +84,7 @@ def attrmap_x(o):
 
 # %% ../nbs/api/01_components.ipynb
 def ft_html(tag: str, *c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=None, **kwargs):
-    ds,c = partition(c, risinstance(dict))
+    ds,c = partition(c, risinstance(Mapping))
     for d in ds: kwargs = {**kwargs, **d}
     if ft_cls is None: ft_cls = fh_cfg.ft_cls
     if attrmap is None: attrmap=fh_cfg.attrmap

nbs/api/01_components.ipynb

@@ -29,7 +29,7 @@
     "#| export\n",
     "from dataclasses import dataclass, asdict, is_dataclass, make_dataclass, replace, astuple, MISSING\n",
     "from bs4 import BeautifulSoup, Comment\n",
-    "from typing import Literal, Optional\n",
+    "from typing import Literal, Mapping, Optional\n",
     "\n",
     "from fastcore.utils import *\n",
     "from fastcore.xml import *\n",
@@ -50,6 +50,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "from collections import UserDict\n",
     "from lxml import html as lx\n",
     "from pprint import pprint"
    ]
@@ -311,7 +312,7 @@
    "source": [
     "#| export\n",
     "def ft_html(tag: str, *c, id=None, cls=None, title=None, style=None, attrmap=None, valmap=None, ft_cls=None, **kwargs):\n",
-    "    ds,c = partition(c, risinstance(dict))\n",
+    "    ds,c = partition(c, risinstance(Mapping))\n",
     "    for d in ds: kwargs = {**kwargs, **d}\n",
     "    if ft_cls is None: ft_cls = fh_cfg.ft_cls\n",
     "    if attrmap is None: attrmap=fh_cfg.attrmap\n",
@@ -377,6 +378,26 @@
     "ft_html('a', {'@click.away':1})"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "979e9bc8614fb3c1",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/markdown": "```html\n<a @click.away=\"1\"></a>\n```",
+      "text/plain": [
+       "a((),{'@click.away': 1})"
+      ]
+     },
+     "execution_count": null,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": "ft_html('a', UserDict({'@click.away':1}))"
+  },
   {
    "cell_type": "code",
    "execution_count": null,