Skip to content

In html2xt, move class to end #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2024
Merged

In html2xt, move class to end #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion fasthtml/components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@ def _parse(elm, lvl=0, indent=4):
cs = [repr(c.strip()) if isinstance(c, str) else _parse(c, lvl+1)
for c in cts if str(c).strip()]
attrs = []
for key, value in elm.attrs.items():
elm_attrs = list(elm.attrs.items())
cls_idx = next((i for i, item in enumerate(elm_attrs) if item[0] == 'class'), None)
if cls_idx is not None: elm_attrs.append(elm_attrs.pop(cls_idx))
for key, value in elm_attrs:
if isinstance(value,(tuple,list)): value = " ".join(value)
attrs.append(f'{rev_map.get(key, key).replace("-", "_")}={value!r}')
spc = " "*lvl*indent
Expand Down
34 changes: 17 additions & 17 deletions nbs/01_components.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,9 @@
"```xml\n",
"<form>\n",
" <fieldset>\n",
" <input id=\"title\" name=\"title\" value=\"Profit\"></input>\n",
" <input id=\"title\" class=\"char\" name=\"title\" value=\"Profit\"></input>\n",
" <label>\n",
" <input type=\"checkbox\" data-foo=\"bar\" id=\"done\" name=\"done\" checked=\"1\"></input>\n",
" <input type=\"checkbox\" data-foo=\"bar\" id=\"done\" class=\"checkboxer\" name=\"done\" checked=\"1\"></input>\n",
"Done\n",
" </label>\n",
" <input type=\"hidden\" id=\"id\" name=\"id\" value=\"2\"></input>\n",
Expand All @@ -281,13 +281,16 @@
"text/plain": [
"['form',\n",
" (['fieldset',\n",
" (['input', (), {'id': 'title', 'name': 'title', 'value': 'Profit'}],\n",
" (['input',\n",
" (),\n",
" {'id': 'title', 'class': 'char', 'name': 'title', 'value': 'Profit'}],\n",
" ['label',\n",
" (['input',\n",
" (),\n",
" {'type': 'checkbox',\n",
" 'data-foo': 'bar',\n",
" 'id': 'done',\n",
" 'class': 'checkboxer',\n",
" 'name': 'done',\n",
" 'checked': '1'}],\n",
" 'Done'),\n",
Expand All @@ -310,8 +313,8 @@
" title:str; id:int; done:bool; details:str\n",
" \n",
"todo = TodoItem(id=2, title=\"Profit\", done=True, details=\"Details\")\n",
"check = Label(Input(type=\"checkbox\", id=\"done\", data_foo=\"bar\"), \"Done\")\n",
"form = Form(Fieldset(Input(id=\"title\"), check, Input(type=\"hidden\", id=\"id\"), Textarea(id='details'), Button(\"Save\")))\n",
"check = Label(Input(type=\"checkbox\", cls=\"checkboxer\", id=\"done\", data_foo=\"bar\"), \"Done\")\n",
"form = Form(Fieldset(Input(cls=\"char\", id=\"title\"), check, Input(type=\"hidden\", id=\"id\"), Textarea(id='details'), Button(\"Save\")))\n",
"form = fill_form(form, todo)\n",
"form"
]
Expand Down Expand Up @@ -384,7 +387,9 @@
{
"data": {
"text/plain": [
"[['input', (), {'id': 'title', 'name': 'title', 'value': 'Profit'}]]"
"[['input',\n",
" (),\n",
" {'id': 'title', 'class': 'char', 'name': 'title', 'value': 'Profit'}]]"
]
},
"execution_count": null,
Expand Down Expand Up @@ -461,7 +466,10 @@
" cs = [repr(c.strip()) if isinstance(c, str) else _parse(c, lvl+1)\n",
" for c in cts if str(c).strip()]\n",
" attrs = []\n",
" for key, value in elm.attrs.items():\n",
" elm_attrs = list(elm.attrs.items())\n",
" cls_idx = next((i for i, item in enumerate(elm_attrs) if item[0] == 'class'), None)\n",
" if cls_idx is not None: elm_attrs.append(elm_attrs.pop(cls_idx))\n",
" for key, value in elm_attrs:\n",
" if isinstance(value,(tuple,list)): value = \" \".join(value)\n",
" attrs.append(f'{rev_map.get(key, key).replace(\"-\", \"_\")}={value!r}')\n",
" spc = \" \"*lvl*indent\n",
Expand All @@ -486,9 +494,9 @@
"```python\n",
"Form(\n",
" Fieldset(\n",
" Input(id='title', name='title', value='Profit'),\n",
" Input(id='title', name='title', value='Profit', cls='char'),\n",
" Label(\n",
" Input(type='checkbox', data_foo='bar', id='done', name='done', checked='1'),\n",
" Input(type='checkbox', data_foo='bar', id='done', name='done', checked='1', cls='checkboxer'),\n",
" 'Done'\n",
" ),\n",
" Input(type='hidden', id='id', name='id', value='2'),\n",
Expand Down Expand Up @@ -530,14 +538,6 @@
"#|hide\n",
"import nbdev; nbdev.nbdev_export()"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "0a942593",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand Down