Fixed naming collision with imported types + added **props to combo_b…

…ox.py (deephaven#201)
bmingles · Jun 21, 2024 · 45c3fe9 · 45c3fe9
1 parent 8cbee84
commit 45c3fe9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins/ui/src/deephaven/ui/components/__init__.py b/plugins/ui/src/deephaven/ui/components/__init__.py
@@ -46,7 +46,6 @@
 from .text_field import text_field
 from .toggle_button import toggle_button
 from .view import view
-from .types import *
 
 from . import html
 

diff --git a/plugins/ui/src/deephaven/ui/components/combo_box.py b/plugins/ui/src/deephaven/ui/components/combo_box.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Callable
+from typing import Callable, Any
 
 from .types import (
     FocusEventCallable,
@@ -127,6 +127,7 @@ def combo_box(
     aria_details: str | None = None,
     UNSAFE_class_name: str | None = None,
     UNSAFE_style: CSSProperties | None = None,
+    **props: Any,
 ) -> ComboBoxElement:
     """
     A combo box that can be used to search or select from a list. Children should be one of five types: