ex4nicegui 0.7.1__py3-none-any.whl → 0.8.0__py3-none-any.whl

ex4nicegui/reactive/officials/knob.py

@@ -6,18 +6,16 @@ from typing import (
 from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
-    to_value,
     TGetterOrReadonlyRef,
 )
 from nicegui import ui
 from .base import BindableUi, DisableableMixin
 from ex4nicegui.reactive.mixins.textColor import TextColorableMixin
+from ex4nicegui.reactive.mixins.value_element import ValueElementMixin
 
 
 class KnobBindableUi(
-    BindableUi[ui.knob],
-    DisableableMixin,
-    TextColorableMixin,
+    BindableUi[ui.knob], DisableableMixin, TextColorableMixin, ValueElementMixin[float]
 ):
     def __init__(
         self,
@@ -62,16 +60,9 @@ class KnobBindableUi(
         return self.element.value
 
     def bind_prop(self, prop: str, value: TGetterOrReadonlyRef):
-        if prop == "value":
-            return self.bind_value(value)
+        if ValueElementMixin._bind_specified_props(self, prop, value):
+            return self
         if prop == "color":
             return self.bind_color(value)
 
         return super().bind_prop(prop, value)
-
-    def bind_value(self, value: TGetterOrReadonlyRef[float]):
-        @self._ui_signal_on(value)
-        def _():
-            self.element.set_value(to_value(value))
-
-        return self

ex4nicegui/reactive/officials/linear_progress.py

@@ -5,15 +5,17 @@ from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
-    to_value,
 )
 from nicegui import ui
 
 from .base import BindableUi
 from ex4nicegui.reactive.mixins.textColor import TextColorableMixin
+from ex4nicegui.reactive.mixins.value_element import ValueElementMixin
 
 
-class LinearProgressBindableUi(BindableUi[ui.linear_progress], TextColorableMixin):
+class LinearProgressBindableUi(
+    BindableUi[ui.linear_progress], TextColorableMixin, ValueElementMixin[float]
+):
     def __init__(
         self,
         value: TMaybeRef[float] = 0.0,
@@ -47,17 +49,10 @@ class LinearProgressBindableUi(BindableUi[ui.linear_progress], TextColorableMixi
         return self.element.value
 
     def bind_prop(self, prop: str, value: TGetterOrReadonlyRef):
-        if prop == "value":
-            return self.bind_value(value)
+        if ValueElementMixin._bind_specified_props(self, prop, value):
+            return self
 
         if prop == "color":
             return self.bind_color(value)
 
         return super().bind_prop(prop, value)
-
-    def bind_value(self, value: TGetterOrReadonlyRef):
-        @self._ui_signal_on(value)
-        def _():
-            self.element.set_value(to_value(value))
-
-        return self

ex4nicegui/reactive/officials/number.py

@@ -7,6 +7,7 @@ from typing import (
     Union,
 )
 from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
+from ex4nicegui.reactive.mixins.value_element import ValueElementMixin
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -22,7 +23,7 @@ def _default_vmodel_args_getter(e):
     return e.sender.value
 
 
-class NumberBindableUi(BindableUi[ui.number]):
+class NumberBindableUi(BindableUi[ui.number], ValueElementMixin[Union[float, int]]):
     def __init__(
         self,
         label: Optional[TMaybeRef[str]] = None,
@@ -37,7 +38,9 @@ class NumberBindableUi(BindableUi[ui.number]):
         suffix: Optional[TMaybeRef[str]] = None,
         format: Optional[TMaybeRef[str]] = None,
         on_change: Optional[Callable[..., Any]] = None,
-        validation: Dict[str, Callable[..., bool]] = {},
+        validation: Optional[
+            Union[Callable[..., Optional[str]], Dict[str, Callable[..., bool]]]
+        ] = None,
     ) -> None:
         pc = ParameterClassifier(
             locals(),
@@ -71,21 +74,14 @@ class NumberBindableUi(BindableUi[ui.number]):
         return self.element.value
 
     def bind_prop(self, prop: str, value: TGetterOrReadonlyRef):
-        if prop == "value":
-            return self.bind_value(value)
+        if ValueElementMixin._bind_specified_props(self, prop, value):
+            return self
 
         if prop == "precision":
             return self._bind_precision(value)
 
         return super().bind_prop(prop, value)
 
-    def bind_value(self, value: TGetterOrReadonlyRef[float]):
-        @self._ui_signal_on(value)
-        def _():
-            self.element.set_value(to_value(value))
-
-        return self
-
     def _bind_precision(self, precision: TGetterOrReadonlyRef[int]):
         @self._ui_signal_on(precision)
         def _():

ex4nicegui/reactive/officials/radio.py

@@ -4,7 +4,6 @@ from typing import (
     List,
     Optional,
     TypeVar,
-    cast,
     Dict,
     Union,
 )
@@ -15,13 +14,13 @@ from ex4nicegui.utils.signals import (
     to_value,
 )
 from nicegui import ui
-from nicegui.elements.mixins.value_element import ValueElement
+from ex4nicegui.reactive.mixins.value_element import ValueElementMixin
 from .base import BindableUi
 
 T = TypeVar("T")
 
 
-class RadioBindableUi(BindableUi[ui.radio]):
+class RadioBindableUi(BindableUi[ui.radio], ValueElementMixin[Any]):
     def __init__(
         self,
         options: Union[TMaybeRef[List], TMaybeRef[Dict]],
@@ -52,8 +51,8 @@ class RadioBindableUi(BindableUi[ui.radio]):
         return self.element.value
 
     def bind_prop(self, prop: str, value: TGetterOrReadonlyRef):
-        if prop == "value":
-            return self.bind_value(value)
+        if ValueElementMixin._bind_specified_props(self, prop, value):
+            return self
 
         if prop == "options":
             return self.bind_options(value)
@@ -66,10 +65,3 @@ class RadioBindableUi(BindableUi[ui.radio]):
             self.element.set_options(to_value(options))
 
         return self
-
-    def bind_value(self, value: TGetterOrReadonlyRef):
-        @self._ui_signal_on(value)
-        def _():
-            cast(ValueElement, self.element).set_value(to_value(value))
-
-        return self

ex4nicegui/reactive/officials/row.py

@@ -1,17 +1,25 @@
 from typing import (
     Any,
+    Literal,
+    Optional,
 )
 from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
-from ex4nicegui.utils.signals import (
-    _TMaybeRef as TMaybeRef,
-)
+from ex4nicegui.reactive.mixins.flexLayout import FlexAlignItemsMixin, FlexWrapMixin
+from ex4nicegui.utils.signals import TMaybeRef
 from nicegui import ui
 from .base import BindableUi
 
 
-class RowBindableUi(BindableUi[ui.row]):
-    def __init__(self, *, wrap: TMaybeRef[bool] = True) -> None:
-        pc = ParameterClassifier(locals(), maybeRefs=["wrap"], events=[])
+class RowBindableUi(BindableUi[ui.row], FlexAlignItemsMixin, FlexWrapMixin):
+    def __init__(
+        self,
+        *,
+        wrap: TMaybeRef[bool] = True,
+        align_items: Optional[
+            TMaybeRef[Literal["start", "end", "center", "baseline", "stretch"]]
+        ] = None,
+    ) -> None:
+        pc = ParameterClassifier(locals(), maybeRefs=["wrap", "align_items"], events=[])
         element = ui.row(**pc.get_values_kws())
 
         super().__init__(element)
@@ -19,14 +27,13 @@ class RowBindableUi(BindableUi[ui.row]):
             self.bind_prop(key, value)  # type: ignore
 
     def bind_prop(self, prop: str, value: TMaybeRef):
-        if prop == "wrap":
-            return self.bind_wrap(value)
+        if FlexAlignItemsMixin._bind_specified_props(self, prop, value):
+            return self
+        if FlexWrapMixin._bind_specified_props(self, prop, value):
+            return self
 
         return super().bind_prop(prop, value)
 
-    def bind_wrap(self, value: TMaybeRef):
-        self.bind_classes({"wrap": value})
-
     def __enter__(self):
         self.element.__enter__()
         return self

ex4nicegui/reactive/officials/slider.py

@@ -16,14 +16,14 @@ from ex4nicegui.utils.signals import (
 from nicegui import ui
 from nicegui.events import handle_event
 from .base import BindableUi, DisableableMixin
+from ex4nicegui.reactive.mixins.value_element import ValueElementMixin
 
 
 _TSliderValue = TypeVar("_TSliderValue", float, int, None)
 
 
 class SliderBindableUi(
-    BindableUi[ui.slider],
-    DisableableMixin,
+    BindableUi[ui.slider], DisableableMixin, ValueElementMixin[_TSliderValue]
 ):
     def __init__(
         self,
@@ -59,19 +59,11 @@ class SliderBindableUi(
         return self.element.value
 
     def bind_prop(self, prop: str, value: TGetterOrReadonlyRef):
-        if prop == "value":
-            return self.bind_value(value)
+        if ValueElementMixin._bind_specified_props(self, prop, value):
+            return self
 
         return super().bind_prop(prop, value)
 
-    def bind_value(self, value: TGetterOrReadonlyRef[float]):
-        @self._ui_signal_on(value)
-        def _():
-            self.element.set_value(to_value(value))
-            self.element.update()
-
-        return self
-
 
 class LazySliderBindableUi(SliderBindableUi):
     def __init__(

ex4nicegui/reactive/officials/switch.py

@@ -8,15 +8,16 @@ from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
-    to_value,
 )
 from nicegui import ui
 from .base import BindableUi
+from ex4nicegui.reactive.mixins.value_element import ValueElementMixin
+
 
 T = TypeVar("T")
 
 
-class SwitchBindableUi(BindableUi[ui.switch]):
+class SwitchBindableUi(BindableUi[ui.switch], ValueElementMixin[bool]):
     def __init__(
         self,
         text: TMaybeRef[str] = "",
@@ -47,14 +48,6 @@ class SwitchBindableUi(BindableUi[ui.switch]):
         return self.element.value
 
     def bind_prop(self, prop: str, value: TGetterOrReadonlyRef):
-        if prop == "value":
-            return self.bind_value(value)
-
+        if ValueElementMixin._bind_specified_props(self, prop, value):
+            return self
         return super().bind_prop(prop, value)
-
-    def bind_value(self, value: TGetterOrReadonlyRef[bool]):
-        @self._ui_signal_on(value)
-        def _():
-            self.element.set_value(to_value(value))
-
-        return self

ex4nicegui/reactive/officials/tab_panels.py

@@ -10,9 +10,10 @@ from ex4nicegui.utils.signals import (
 from ex4nicegui.utils.scheduler import next_tick
 from nicegui import ui, background_tasks, core
 from .base import BindableUi
+from ex4nicegui.reactive.mixins.value_element import ValueElementMixin
 
 
-class TabPanelsBindableUi(BindableUi[ui.tab_panels]):
+class TabPanelsBindableUi(BindableUi[ui.tab_panels], ValueElementMixin[bool]):
     def __init__(
         self,
         value: Optional[TMaybeRef[str]] = None,
@@ -50,16 +51,11 @@ class TabPanelsBindableUi(BindableUi[ui.tab_panels]):
         return self.element.value
 
     def bind_prop(self, prop: str, value: TGetterOrReadonlyRef):
-        if prop == "value":
-            return self.bind_value(value)
+        if ValueElementMixin._bind_specified_props(self, prop, value):
+            return self
 
         return super().bind_prop(prop, value)
 
-    def bind_value(self, value: TGetterOrReadonlyRef):
-        @self._ui_effect
-        def _():
-            self.element.set_value(to_value(value))
-
 
 class lazy_tab_panel(ui.tab_panel):
     def __init__(self, name: str) -> None:

ex4nicegui/reactive/officials/tabs.py

@@ -2,14 +2,14 @@ from typing import Any, Callable, Optional
 from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
-    to_value,
     _TMaybeRef as TMaybeRef,
 )
 from nicegui import ui
 from .base import BindableUi
+from ex4nicegui.reactive.mixins.value_element import ValueElementMixin
 
 
-class TabsBindableUi(BindableUi[ui.tabs]):
+class TabsBindableUi(BindableUi[ui.tabs], ValueElementMixin[str]):
     def __init__(
         self,
         value: Optional[TMaybeRef[str]] = None,
@@ -33,12 +33,7 @@ class TabsBindableUi(BindableUi[ui.tabs]):
         return self.element.value
 
     def bind_prop(self, prop: str, value: TGetterOrReadonlyRef):
-        if prop == "value":
-            return self.bind_value(value)
+        if ValueElementMixin._bind_specified_props(self, prop, value):
+            return self
 
         return super().bind_prop(prop, value)
-
-    def bind_value(self, value: TGetterOrReadonlyRef):
-        @self._ui_effect
-        def _():
-            self.element.set_value(to_value(value))

ex4nicegui/reactive/officials/textarea.py

@@ -16,9 +16,10 @@ from ex4nicegui.utils.signals import (
 from nicegui import ui
 from nicegui.events import handle_event
 from .base import BindableUi
+from ex4nicegui.reactive.mixins.value_element import ValueElementMixin
 
 
-class TextareaBindableUi(BindableUi[ui.textarea]):
+class TextareaBindableUi(BindableUi[ui.textarea], ValueElementMixin[str]):
     def __init__(
         self,
         label: Optional[TMaybeRef[str]] = None,
@@ -53,18 +54,11 @@ class TextareaBindableUi(BindableUi[ui.textarea]):
         return self.element.value
 
     def bind_prop(self, prop: str, value: TGetterOrReadonlyRef):
-        if prop == "value":
-            return self.bind_value(value)
+        if ValueElementMixin._bind_specified_props(self, prop, value):
+            return self
 
         return super().bind_prop(prop, value)
 
-    def bind_value(self, value: TGetterOrReadonlyRef[str]):
-        @self._ui_signal_on(value)
-        def _():
-            self.element.set_value(to_value(value))
-
-        return self
-
 
 class LazyTextareaBindableUi(TextareaBindableUi):
     def __init__(