ex4nicegui 0.6.7__py3-none-any.whl → 0.6.9__py3-none-any.whl

ex4nicegui/reactive/officials/column.py

@@ -1,7 +1,7 @@
 from typing import (
     Any,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,

ex4nicegui/reactive/officials/date.py

@@ -1,7 +1,6 @@
 from typing import Any, Callable, List, Optional, TypeVar
 from typing_extensions import TypedDict
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
@@ -70,7 +69,7 @@ class DateBindableUi(BindableUi[ui.date]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[bool]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/drawer.py

@@ -2,8 +2,7 @@ from typing import (
     Any,
 )
 from typing_extensions import Literal
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 
 from ex4nicegui.utils.signals import (
     is_setter_ref,
@@ -61,7 +60,7 @@ class DrawerBindableUi(BindableUi[Drawer]):
 
         super().__init__(element)  # type: ignore
 
-        @ui_effect
+        @self._ui_effect
         def _():
             mvalue = "true" if to_value(value) else "false"
             element.props(f":model-value={mvalue}")

ex4nicegui/reactive/officials/echarts.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Union, cast, Optional, Literal
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     is_ref,
@@ -8,7 +8,6 @@ from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
     to_value,
     to_raw,
-    on,
 )
 from .base import BindableUi
 from ex4nicegui.reactive.EChartsComponent.ECharts import echarts
@@ -141,7 +140,7 @@ class EChartsBindableUi(BindableUi[echarts]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_options(self, ref_ui: TGetterOrReadonlyRef[Dict]):
-        @on(ref_ui)
+        @self._ui_signal_on(ref_ui)
         def _():
             ele = self.element
             ele.update_options(to_raw(to_value(ref_ui)), self.__update_setting)

ex4nicegui/reactive/officials/expansion.py

@@ -1,7 +1,6 @@
 from typing import Any, Optional, Callable
 from nicegui import ui
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -53,7 +52,7 @@ class ExpansionBindableUi(BindableUi[ui.expansion]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/grid.py

@@ -1,9 +1,10 @@
 from typing import (
     Any,
     Optional,
+    Union,
 )
 
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 
 from nicegui import ui
 from .base import BindableUi
@@ -13,8 +14,8 @@ from ex4nicegui.utils.signals import _TMaybeRef as TMaybeRef
 class GridBindableUi(BindableUi[ui.grid]):
     def __init__(
         self,
-        rows: Optional[TMaybeRef[int]] = None,
-        columns: Optional[TMaybeRef[int]] = None,
+        rows: Optional[TMaybeRef[Union[int, str]]] = None,
+        columns: Optional[TMaybeRef[Union[int, str]]] = None,
     ) -> None:
         pc = ParameterClassifier(locals(), maybeRefs=["rows", "columns"], events=[])
 

ex4nicegui/reactive/officials/html.py

@@ -1,5 +1,3 @@
-from ex4nicegui.utils.apiEffect import ui_effect
-
 from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
     to_value,
@@ -20,7 +18,7 @@ class html(BindableUi[HtmlComponent]):
 
         super().__init__(element)
 
-        @ui_effect
+        @self._ui_effect
         def _():
             element._props["content"] = to_value(content)
             element.update()

ex4nicegui/reactive/officials/icon.py

@@ -2,9 +2,7 @@ from typing import (
     Optional,
     cast,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -14,10 +12,11 @@ from nicegui import ui
 from nicegui.elements.mixins.color_elements import (
     TextColorElement,
 )
-from .base import BindableUi, _bind_color
+from .base import BindableUi
+from ex4nicegui.reactive.mixins.textColor import TextColorableMixin
 
 
-class IconBindableUi(BindableUi[ui.icon]):
+class IconBindableUi(BindableUi[ui.icon], TextColorableMixin):
     def __init__(
         self,
         name: TMaybeRef[str],
@@ -44,11 +43,8 @@ class IconBindableUi(BindableUi[ui.icon]):
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_color(self, ref_ui: TGetterOrReadonlyRef):
-        return _bind_color(self, ref_ui)
-
     def bind_name(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect
+        @self._ui_effect
         def _():
             ele = cast(TextColorElement, self.element)
             ele._props["name"] = to_value(ref_ui)

ex4nicegui/reactive/officials/image.py

@@ -2,9 +2,7 @@ from pathlib import Path
 from typing import (
     Union,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -34,6 +32,6 @@ class ImageBindableUi(BindableUi[ui.image]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_source(self, ref_ui: TGetterOrReadonlyRef[Union[str, Path]]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_source(to_value(ref_ui))

ex4nicegui/reactive/officials/input.py

@@ -1,12 +1,10 @@
 from typing import Any, Callable, List, Optional, Dict, cast
-from ex4nicegui.utils.apiEffect import ui_effect
 
 
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     Ref,
     _TMaybeRef as TMaybeRef,
-    effect,
     is_setter_ref,
     to_value,
 )
@@ -14,7 +12,7 @@ from ex4nicegui.utils.signals import (
 from nicegui import ui
 from nicegui.events import handle_event
 from .base import BindableUi, DisableableMixin
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 
 
 class InputBindableUi(BindableUi[ui.input], DisableableMixin):
@@ -62,7 +60,7 @@ class InputBindableUi(BindableUi[ui.input], DisableableMixin):
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[str]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
             self.element.update()
@@ -70,7 +68,7 @@ class InputBindableUi(BindableUi[ui.input], DisableableMixin):
         return self
 
     def bind_password(self, ref_ui: TGetterOrReadonlyRef[bool]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element._props["type"] = "password" if to_value(ref_ui) else "text"
             self.element.update()
@@ -116,7 +114,7 @@ class LazyInputBindableUi(InputBindableUi):
 
             ele = self.element
 
-            @effect
+            @self._ui_effect
             def _():
                 ele.value = ref.value
 

ex4nicegui/reactive/officials/knob.py

@@ -3,9 +3,7 @@ from typing import (
     Callable,
     Optional,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
     to_value,
@@ -13,11 +11,13 @@ from ex4nicegui.utils.signals import (
 )
 from nicegui import ui
 from .base import BindableUi, DisableableMixin
+from ex4nicegui.reactive.mixins.textColor import TextColorableMixin
 
 
 class KnobBindableUi(
     BindableUi[ui.knob],
     DisableableMixin,
+    TextColorableMixin,
 ):
     def __init__(
         self,
@@ -64,11 +64,13 @@ class KnobBindableUi(
     def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "value":
             return self.bind_value(ref_ui)
+        if prop == "color":
+            return self.bind_color(ref_ui)
 
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[float]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/label.py

@@ -1,5 +1,5 @@
 from typing import Any
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     to_value,
@@ -7,9 +7,10 @@ from ex4nicegui.utils.signals import (
 )
 from nicegui import ui
 from .base import BindableUi
+from ex4nicegui.reactive.mixins.textColor import HtmlTextColorableMixin
 
 
-class LabelBindableUi(BindableUi[ui.label]):
+class LabelBindableUi(BindableUi[ui.label], HtmlTextColorableMixin):
     def __init__(
         self,
         text: TMaybeRef[Any] = "",
@@ -35,14 +36,6 @@ class LabelBindableUi(BindableUi[ui.label]):
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_color(self, ref_ui: TGetterOrReadonlyRef):
-        @self._ui_effect
-        def _():
-            ele = self.element
-            color = to_value(ref_ui)
-            ele._style["color"] = color
-            ele.update()
-
     def bind_text(self, ref_ui: TGetterOrReadonlyRef):
         @self._ui_effect
         def _():

ex4nicegui/reactive/officials/linear_progress.py

@@ -1,9 +1,7 @@
 from typing import (
     Optional,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -11,10 +9,11 @@ from ex4nicegui.utils.signals import (
 )
 from nicegui import ui
 
-from .base import BindableUi, _bind_color
+from .base import BindableUi
+from ex4nicegui.reactive.mixins.textColor import TextColorableMixin
 
 
-class LinearProgressBindableUi(BindableUi[ui.linear_progress]):
+class LinearProgressBindableUi(BindableUi[ui.linear_progress], TextColorableMixin):
     def __init__(
         self,
         value: TMaybeRef[float] = 0.0,
@@ -56,11 +55,8 @@ class LinearProgressBindableUi(BindableUi[ui.linear_progress]):
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_color(self, ref_ui: TGetterOrReadonlyRef):
-        return _bind_color(self, ref_ui)
-
     def bind_value(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/number.py

@@ -6,14 +6,11 @@ from typing import (
     Dict,
     Union,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
     to_value,
-    on,
 )
 from nicegui import ui
 from .base import BindableUi
@@ -83,14 +80,14 @@ class NumberBindableUi(BindableUi[ui.number]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[float]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 
         return self
 
     def _bind_precision(self, ref_ui: TGetterOrReadonlyRef[int]):
-        @on(ref_ui, onchanges=True)
+        @self._ui_signal_on(ref_ui, onchanges=True)
         def _():
             self.element.precision = to_value(ref_ui)
             self.element.sanitize()

ex4nicegui/reactive/officials/radio.py

@@ -8,9 +8,7 @@ from typing import (
     Dict,
     Union,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -63,14 +61,14 @@ class RadioBindableUi(BindableUi[ui.radio]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_options(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_options(to_value(ref_ui))
 
         return self
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect
+        @self._ui_effect
         def _():
             cast(ValueElement, self.element).set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/row.py

@@ -1,7 +1,7 @@
 from typing import (
     Any,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
 )

ex4nicegui/reactive/officials/select.py

@@ -8,9 +8,7 @@ from typing import (
     Dict,
     Union,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -85,14 +83,14 @@ class SelectBindableUi(BindableUi[ui.select]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_options(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect()
+        @self._ui_effect()
         def _():
             self.element.set_options(to_value(ref_ui))
 
         return self
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef):
-        @ui_effect()
+        @self._ui_effect()
         def _():
             cast(ValueElement, self.element).set_value(to_value(ref_ui) or None)
 

ex4nicegui/reactive/officials/slider.py

@@ -5,9 +5,7 @@ from typing import (
     TypeVar,
     cast,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     Ref,
@@ -32,7 +30,7 @@ class SliderBindableUi(
         min: TMaybeRef[_TSliderValue],
         max: TMaybeRef[_TSliderValue],
         step: TMaybeRef[_TSliderValue] = 1.0,
-        value: TMaybeRef[_TSliderValue] = None,
+        value: Optional[TMaybeRef[_TSliderValue]] = None,
         on_change: Optional[Callable[..., Any]] = None,
     ) -> None:
         pc = ParameterClassifier(
@@ -67,7 +65,7 @@ class SliderBindableUi(
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[float]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
             self.element.update()
@@ -95,7 +93,7 @@ class LazySliderBindableUi(SliderBindableUi):
             ref = cast(Ref, org_value)
             ele = self.element
 
-            @ui_effect
+            @self._ui_effect
             def _():
                 ele.value = ref.value
 

ex4nicegui/reactive/officials/switch.py

@@ -4,9 +4,7 @@ from typing import (
     Optional,
     TypeVar,
 )
-from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
-
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
@@ -56,7 +54,7 @@ class SwitchBindableUi(BindableUi[ui.switch]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[bool]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/tab.py

@@ -1,5 +1,5 @@
 from typing import Dict, Optional
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     to_value,
     _TMaybeRef as TMaybeRef,

ex4nicegui/reactive/officials/tab_panel.py

@@ -1,4 +1,4 @@
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
 )

ex4nicegui/reactive/officials/tab_panels.py

@@ -1,11 +1,14 @@
-from typing import Any, Callable, Optional
-from ex4nicegui.reactive.utils import ParameterClassifier
+import inspect
+from typing import Any, Awaitable, Callable, Optional, Union
+from weakref import WeakValueDictionary
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     to_value,
     _TMaybeRef as TMaybeRef,
 )
-from nicegui import ui
+from ex4nicegui.utils.scheduler import next_tick
+from nicegui import ui, background_tasks, core
 from .base import BindableUi
 
 
@@ -56,3 +59,106 @@ class TabPanelsBindableUi(BindableUi[ui.tab_panels]):
         @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
+
+
+class lazy_tab_panel(ui.tab_panel):
+    def __init__(self, name: str) -> None:
+        super().__init__(name)
+        self._build_fn = None
+
+    def try_run_build_fn(self):
+        if self._build_fn:
+            _helper.run_build_fn(self, self._props["name"])
+            self._build_fn = None
+
+    def build_fn(self, fn: Callable[..., Union[None, Awaitable]]):
+        self._build_fn = fn
+        return fn
+
+
+class LazyTabPanelsBindableUi(TabPanelsBindableUi):
+    def __init__(
+        self,
+        value: Optional[TMaybeRef[str]] = None,
+        *,
+        on_change: Optional[Callable[..., Any]] = None,
+        animated: TMaybeRef[bool] = True,
+        keep_alive: TMaybeRef[bool] = True,
+    ) -> None:
+        """Lazy Tab Panels
+
+        @see - https://github.com/CrystalWindSnake/ex4nicegui/blob/main/README.en.md#lazy_tab_panels
+        @中文文档 - https://gitee.com/carson_add/ex4nicegui/tree/main/#lazy_tab_panels
+
+        Args:
+            value (Optional[TMaybeRef[str]], optional): The value of the tab panel. Defaults to None.
+            on_change (Optional[Callable[..., Any]], optional):  The callback function when the value of the tab panel changes. Defaults to None.
+            animated (TMaybeRef[bool], optional):  Whether to animate the tab panel. Defaults to True.
+            keep_alive (TMaybeRef[bool], optional):  Whether to keep the tab panel alive. Defaults to True.
+        """
+        super().__init__(
+            value, on_change=on_change, animated=animated, keep_alive=keep_alive
+        )
+
+        self.__panels: WeakValueDictionary[str, lazy_tab_panel] = WeakValueDictionary()
+
+        if value:
+
+            @self._ui_effect
+            def _():
+                current_value = to_value(value)
+                if current_value in self.__panels:
+                    panel = self.__panels[current_value]
+
+                    @next_tick
+                    def _():
+                        panel.try_run_build_fn()
+
+    def add_tab_panel(self, name: str):
+        def decorator(fn: Callable[..., Union[None, Awaitable]]):
+            with self:
+                panel = lazy_tab_panel(name)
+            str_name = panel._props["name"]
+            self.__panels[str_name] = panel
+            panel.build_fn(fn)
+
+            if self.value == name:
+                panel.try_run_build_fn()
+
+            return panel
+
+        return decorator
+
+
+class _helper:
+    @staticmethod
+    def run_build_fn(panel: lazy_tab_panel, name: str) -> None:
+        """ """
+        fn = panel._build_fn
+        if fn is None:
+            return
+        try:
+            expects_arguments = any(
+                p.default is inspect.Parameter.empty
+                and p.kind is not inspect.Parameter.VAR_POSITIONAL
+                and p.kind is not inspect.Parameter.VAR_KEYWORD
+                for p in inspect.signature(fn).parameters.values()
+            )
+
+            with panel:
+                result = fn(name) if expects_arguments else fn()
+            if isinstance(result, Awaitable):
+                # NOTE: await an awaitable result even if the handler is not a coroutine (like a lambda statement)
+                async def wait_for_result():
+                    with panel:
+                        try:
+                            await result
+                        except Exception as e:
+                            core.app.handle_exception(e)
+
+                if core.loop and core.loop.is_running():
+                    background_tasks.create(wait_for_result(), name=str(fn))
+                else:
+                    core.app.on_startup(wait_for_result())
+        except Exception as e:
+            core.app.handle_exception(e)