Fix up typing

- Don't allow `GeneratorType` as a type for children
- Now `children` is a more specific type

Author: mofojed

plugins/ui/src/deephaven/ui/components/action_button.py

@@ -21,13 +21,13 @@
 )
 
 from .basic import component_element
-from ..elements import Element
+from ..elements import Element, NodeType
 
 ActionButtonElement = Element
 
 
 def action_button(
-    *children: Any,
+    *children: NodeType,
     type: ButtonType = "button",
     on_press: PressEventCallable | None = None,
     on_press_start: PressEventCallable | None = None,

plugins/ui/src/deephaven/ui/components/action_group.py

@@ -17,12 +17,12 @@
     Position,
 )
 from .basic import component_element
-from ..elements import Element
+from ..elements import Element, NodeType
 from ..types import ActionGroupDensity, SelectedKeys, SelectionMode, Key, Selection
 
 
 def action_group(
-    *children: Any,
+    *children: NodeType,
     is_emphasized: bool | None = None,
     density: ActionGroupDensity | None = "regular",
     is_justified: bool | None = None,

plugins/ui/src/deephaven/ui/components/badge.py

@@ -10,12 +10,12 @@
     Position,
 )
 from .basic import component_element
-from ..elements import Element
+from ..elements import Element, NodeType
 from ..types import BadgeVariant
 
 
 def badge(
-    *children: Any,
+    *children: NodeType,
     variant: BadgeVariant | None = None,
     flex: LayoutFlex | None = None,
     flex_grow: float | None = None,

plugins/ui/src/deephaven/ui/components/basic.py

@@ -1,14 +1,35 @@
 from __future__ import annotations
 from typing import Any
-from ..elements import BaseElement
+from ..elements import BaseElement, NodeType
+from ..types import Key
 
 NAME_PREFIX = "deephaven.ui.components."
 
 
-def component_element(name: str, /, *children: Any, **props: Any) -> BaseElement:
+def component_element(
+    name: str,
+    /,
+    *children: NodeType,
+    key: Key | None = None,
+    _nullable_props: list[str] = [],
+    **props: Any,
+) -> BaseElement:
     """
     Base class for UI elements.
     All names are automatically prefixed with "deephaven.ui.components.", and
     all props are automatically camelCased.
+
+    Args:
+        name: The name of the element, e.g. "button", "input", "my_component", etc. The full name of the element will be "deephaven.ui.components.{name}".
+        children: The children of the element.
+        key: The key for the element.
+        _nullable_props: A list of prop names that can be set to None.
+        props: The props for the element.
     """
-    return BaseElement(f"{NAME_PREFIX}{name}", *children, **props)
+    return BaseElement(
+        f"{NAME_PREFIX}{name}",
+        *children,
+        key=key,
+        _nullable_props=_nullable_props,
+        **props,
+    )

plugins/ui/src/deephaven/ui/components/button.py

@@ -22,11 +22,11 @@
     Position,
 )
 from .basic import component_element
-from ..elements import Element
+from ..elements import Element, NodeType
 
 
 def button(
-    *children: Any,
+    *children: NodeType,
     variant: ButtonVariant | None = "accent",
     style: ButtonStyle | None = "fill",
     static_color: StaticColor | None = None,

plugins/ui/src/deephaven/ui/components/button_group.py

@@ -13,13 +13,13 @@
     Position,
 )
 from .basic import component_element
-from ..elements import Element
+from ..elements import Element, NodeType
 
 BUTTON_GROUP_NAME = "ButtonGroup"
 
 
 def button_group(
-    *children: Any,
+    *children: NodeType,
     is_disabled: bool | None = None,
     orientation: Orientation = "horizontal",
     align: ButtonGroupAlignment = "start",

plugins/ui/src/deephaven/ui/components/checkbox.py

@@ -14,11 +14,11 @@
     Position,
 )
 from .basic import component_element
-from ..elements import Element
+from ..elements import Element, NodeType
 
 
 def checkbox(
-    *children: Any,
+    *children: NodeType,
     is_emphasized: bool | None = None,
     is_indeterminate: bool | None = None,
     default_selected: bool | None = None,

plugins/ui/src/deephaven/ui/components/checkbox_group.py

@@ -16,12 +16,12 @@
     LabelPosition,
 )
 from .basic import component_element
-from ..elements import Element
+from ..elements import Element, NodeType
 from ..types import Key, Selection
 
 
 def checkbox_group(
-    *children: Any,
+    *children: NodeType,
     orientation: Orientation = "vertical",
     is_emphasized: bool | None = None,
     value: Selection | None = None,

plugins/ui/src/deephaven/ui/components/color_picker.py

@@ -2,12 +2,12 @@
 from typing import Any, Callable
 
 from .basic import component_element
-from ..elements import Element
+from ..elements import Element, NodeType
 from ..types import CSSColor
 
 
 def color_picker(
-    *children: Any,
+    *children: NodeType,
     label: Any = None,
     size: str = "M",
     rounding: str = "default",

plugins/ui/src/deephaven/ui/components/column.py

@@ -2,11 +2,11 @@
 
 from typing import Any
 from .basic import component_element
-from ..elements import Element
+from ..elements import Element, NodeType
 
 
 def column(
-    *children: Any, width: float | None = None, key: str | None = None
+    *children: NodeType, width: float | None = None, key: str | None = None
 ) -> Element:
     """
     A column is a container that can be used to group elements.