fixed component / container relationship; added checkbox comp.

Author: forman

dashipy/dashipy/components/checkbox.py

@@ -0,0 +1,9 @@
+from dataclasses import dataclass, field
+
+from dashipy.lib import Component
+
+
+@dataclass(frozen=True)
+class Checkbox(Component):
+    value: bool | None = None
+    label: str = ""

dashipy/dashipy/components/dropdown.py

@@ -5,5 +5,4 @@
 
 @dataclass(frozen=True)
 class Dropdown(Component):
-    label: str | None = None
     options: list[tuple[str, str | int | float]] = field(default_factory=list)

dashipy/dashipy/contribs/panel.py

@@ -5,5 +5,5 @@
 
 class Panel(Contribution):
     """Panel contribution"""
-    def __init__(self, name: str, title: str):
+    def __init__(self, name: str, title: str | None = None):
         super().__init__(name, title=title)

dashipy/dashipy/lib/__init__.py

@@ -2,6 +2,6 @@
 from .callback import Input
 from .callback import Output
 from .component import Component
-from .component import Container
+from .container import Container
 from .extension import Contribution
 from .extension import Extension

dashipy/dashipy/lib/component.py

@@ -5,10 +5,16 @@
 
 @dataclass(frozen=True)
 class Component(ABC):
-    id: str = None
-    name: str = None
-    value: str | int | float = None
-    style: dict[str, Any] = None
+    # Common HTML properties
+    id: str | None = None
+    name: str | None = None
+    value: bool | int | float | str | None = None
+    style: dict[str, Any] | None = None
+    # We may add more here later
+    #
+    # Special non-HTML properties
+    label: str | None = None
+    children: list["Component"] | None = None
 
     @property
     def type(self):
@@ -21,25 +27,14 @@ def to_dict(self) -> dict[str, Any]:
                 attr_name: attr_value
                 for attr_name, attr_value in self.__dict__.items()
                 if attr_value is not None
-                and not attr_name.startswith("_")
                 and attr_name
+                and attr_name != "children"
+                and not attr_name.startswith("_")
             }
         )
-        return d
-
-
-@dataclass(frozen=True)
-class Container(Component, ABC):
-    children: list[Component] = field(default_factory=list)
-
-    def add(self, component: Component):
-        self.children.append(component)
-
-    def to_dict(self) -> dict[str, Any]:
-        d = super().to_dict()
-        # Note we use "components" instead of "children" in order
-        # to avoid later problems with React component's "children"
-        # property
-        d.pop("children")
-        d.update(components=list(c.to_dict() for c in self.children))
+        if self.children is not None:
+            # Note we use "components" instead of "children" in order
+            # to avoid later problems with React component's "children"
+            # property
+            d.update(components=list(c.to_dict() for c in self.children))
         return d

dashipy/dashipy/lib/container.py

@@ -0,0 +1,12 @@
+from abc import ABC
+from dataclasses import dataclass, field
+
+from .component import Component
+
+
+@dataclass(frozen=True)
+class Container(Component, ABC):
+    children: list[Component] = field(default_factory=list)
+
+    def add(self, component: Component):
+        self.children.append(component)

dashipy/tests/lib/container_test.py

@@ -1,12 +1,7 @@
-import inspect
 import unittest
 from dataclasses import dataclass
-from typing import Any
-
-import pytest
 
 from dashipy.lib import Component, Container
-from dashipy.lib.callback import Input, Callback
 
 
 @dataclass(frozen=True)