From d0ed552890e9307e5ccaa2cbcb4c23d7c9f20bbc Mon Sep 17 00:00:00 2001 From: Juan-Pablo Scaletti Date: Wed, 29 May 2024 13:07:34 -0500 Subject: [PATCH] ui --- src/jinjax/catalog.py | 2 -- src/jinjax/html_attrs.py | 3 +++ src/jinjax/jinjax.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/jinjax/catalog.py b/src/jinjax/catalog.py index bcb4581..86c6f44 100644 --- a/src/jinjax/catalog.py +++ b/src/jinjax/catalog.py @@ -181,7 +181,6 @@ def irender( attrs = kw.pop("__attrs", None) or {} file_ext = kw.pop("__file_ext", "") source = kw.pop("__source", "") - prefix, name = self._split_name(__name) url_prefix = self._get_url_prefix(prefix) self.jinja_env.loader = self.prefixes[prefix] @@ -235,7 +234,6 @@ def irender( attrs = attrs.as_dict if isinstance(attrs, HTMLAttrs) else attrs attrs.update(kw) kw = attrs - props, extra = component.filter_args(kw) try: props[PROP_ATTRS] = HTMLAttrs(extra) diff --git a/src/jinjax/html_attrs.py b/src/jinjax/html_attrs.py index d4936f2..3162cef 100644 --- a/src/jinjax/html_attrs.py +++ b/src/jinjax/html_attrs.py @@ -83,6 +83,9 @@ def __getitem__(self, name: str) -> Any: def __delitem__(self, name: str) -> None: self._remove(name) + def __str__(self) -> str: + return str(self.as_dict) + def set(self, **kw) -> None: """ Sets an attribute or property: diff --git a/src/jinjax/jinjax.py b/src/jinjax/jinjax.py index d6c5ed0..17d4e3b 100644 --- a/src/jinjax/jinjax.py +++ b/src/jinjax/jinjax.py @@ -31,9 +31,9 @@ (?P[a-zA-Z@:$_][a-zA-Z@:$_0-9-]*) (?: \s*=\s* - (?P".*?"|'.*?'|\{.*?\}) + (?P".*?"|'.*?'|\{\s*.*?\s*\}) )? -(?:\s+|/|$) +(?:\s+|/|"|$) """ RX_ATTR = re.compile(re_attr, re.VERBOSE | re.DOTALL)