Make attrs optional

Author: frmdstryr

CHANGELOG.md

@@ -6,6 +6,7 @@
 the `attrs` dict to define these instead.
 - The `alt` attribute was moved from `Tag` to `A` and `Img`, for other nodes use the `attrs` dict.
 - The `cls` attributes now only accept strings. These values are now internd to save memory
+- The `attrs` is now `None` by default and can be set to `None` to clear any old attrs set
 - Tags now have a `find_by_id` method to retrieve a node by it's `id` field
 - Fix bug where an item removed attrs dict was not removed from the html
 - Any proxy `set_{attr}` methods now take a second argument that includes the oldvalue.

tests/test_html.py

@@ -125,8 +125,28 @@ def test_html(app, tag, attr, query):
         ("Source", "type", '"a"', "b", '//source[@type="b"]'),
         ("P", "text", '"a"', "b", '//p[text()="b"]'),
         ("P", "tail", '"a"', "b", '//body[text()="b"]'),
-        ("A", "attrs", {"data-x": "a"}, {"data-x": "b"}, '//a[@data-x="b"]'),
         (
+            "A",
+            "attrs",
+            {"data-x": "a"},
+            {"data-x": "b"},
+            '//a[@data-x="b"]',
+        ),  # attrs value changed
+        (
+            "A",
+            "attrs",
+            None,
+            {"data-x": "b"},
+            '//a[@data-x="b"]',
+        ),  # attrs from none to new
+        (
+            "A",
+            "attrs",
+            {"data-x": "b"},
+            None,
+            "//a[not(@data-x)]",
+        ),  # attrs from old to none
+        (  # Test attrs key change
             "A",
             "attrs",
             {"data-x": "a"},

web/components/html.py

@@ -16,7 +16,6 @@
 from atom.api import (
     Event,
     Enum,
-    Dict,
     Instance,
     Value,
     Str,
@@ -96,7 +95,7 @@ class Tag(ToolkitObject):
     tail = d_(Str()).tag(attr=False)
 
     #: Custom attributes not explicitly defined
-    attrs = d_(Dict()).tag(attr=False)
+    attrs = d_(Typed(dict)).tag(attr=False)
 
     #: Event triggered on click
     clicked = d_(Event())

web/impl/lxml_toolkit_object.py

@@ -97,8 +97,9 @@ def init_widget(self):
             if "dragstart" in engine._handlers:
                 set_attr("draggable", "true")
 
-        for k, v in d.attrs.items():
-            set_attr(k, v)
+        if attrs := d.attrs:
+            for k, v in attrs.items():
+                set_attr(k, v)
 
         for m in get_fields(d.__class__):
             name = m.name
@@ -262,16 +263,27 @@ def set_tag(self, tag: str, oldvalue: str):
         assert w is not None
         w.tag = tag
 
-    def set_attrs(self, attrs: dict[str, str], oldattrs: dict[str, str]):
+    def set_attrs(
+        self, attrs: Optional[dict[str, str]], oldattrs: Optional[dict[str, str]]
+    ):
         """Set any attributes not explicitly defined"""
         w = self.widget
         assert w is not None
-        set_attr = w.set
-        for k in oldattrs:
-            if k not in attrs:
+        if attrs and oldattrs:
+            # Attrs changed
+            for k in oldattrs:
+                if k not in attrs:
+                    w.attrib.pop(k, None)
+            for k, v in attrs.items():
+                w.set(k, v)
+        elif not attrs and oldattrs:
+            # All attrs removed
+            for k in oldattrs:
                 w.attrib.pop(k, None)
-        for k, v in attrs.items():
-            set_attr(k, v)
+        elif attrs and not oldattrs:
+            # Only new attrs
+            for k, v in attrs.items():
+                w.set(k, v)
 
     def set_cls(self, cls: str, oldvalue: str):
         w = self.widget