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

ex4nicegui/reactive/officials/label.py

@@ -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

@@ -10,10 +10,10 @@ from ex4nicegui.utils.signals import (
 from nicegui import ui
 
 from .base import BindableUi
-from ex4nicegui.reactive.services import color_service
+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,
@@ -55,9 +55,6 @@ class LinearProgressBindableUi(BindableUi[ui.linear_progress]):
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_color(self, ref_ui: TGetterOrReadonlyRef):
-        return color_service.bind_color(self, ref_ui)
-
     def bind_value(self, ref_ui: TGetterOrReadonlyRef):
         @self._ui_effect
         def _():

ex4nicegui/reactive/officials/slider.py

@@ -30,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(

ex4nicegui/reactive/officials/tab_panels.py

@@ -1,11 +1,14 @@
-from typing import Any, Callable, Optional
+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)

ex4nicegui/reactive/scopedStyle.py

@@ -1,5 +1,6 @@
 from nicegui.element import Element
 from ex4nicegui.helper import client_instance_locker
+from nicegui import ui
 
 
 class ScopedStyle(Element, component="scopedStyle.js"):
@@ -7,7 +8,9 @@ class ScopedStyle(Element, component="scopedStyle.js"):
 
     @staticmethod
     def get():
-        return _scoped_style_factory.get_object()
+        if not ui.context.slot_stack:
+            return None
+        return _scoped_style_factory.get_object(ui.context.client)
 
     def create_style(self, element: Element, css: str):
         element_id = f"c{element.id}"

ex4nicegui/reactive/systems/color_system.py

@@ -2,11 +2,14 @@ from __future__ import annotations
 
 from typing import Literal
 
+from nicegui import ui
 from nicegui.elements.mixins.color_elements import (
     QUASAR_COLORS,
     TAILWIND_COLORS,
 )
 
+from functools import lru_cache
+
 
 _color_system_type = Literal["QUASAR", "TAILWIND", "STYLE"]
 
@@ -23,3 +26,132 @@ def get_text_color_info(name: str):
         pass
 
     return system_type, name
+
+
+def get_bg_color_info(color: str):
+    system_type: _color_system_type = "STYLE"
+
+    if color in QUASAR_COLORS:
+        system_type = "QUASAR"
+    elif color in TAILWIND_COLORS:
+        system_type = "TAILWIND"
+        color = f"bg-{color}"
+    else:
+        pass
+
+    return system_type, color
+
+
+def _remove_text_color_from_quasar(element: ui.element, color: str):
+    color_prop = getattr(element, "TEXT_COLOR_PROP", None)
+    if color_prop:
+        element._props.pop(color_prop, None)
+
+
+def _remove_text_color_from_tailwind(element: ui.element, color: str):
+    color = f"text-{color}"
+    element._classes.remove(color)
+
+
+def _remove_text_color(element: ui.element, color: str):
+    element._style.pop("color", None)
+
+
+def _add_text_color_from_quasar(element: ui.element, color: str):
+    color_prop = getattr(element, "TEXT_COLOR_PROP", None)
+    if color_prop:
+        element._props[color_prop] = color
+
+
+def _add_text_color_from_tailwind(element: ui.element, color: str):
+    color = f"text-{color}"
+    element.classes(color)
+
+
+def _add_text_color(element: ui.element, color: str):
+    element._style["color"] = f"{color} !important"
+
+
+@lru_cache(maxsize=10)
+def _query_text_color(color: str, add_handler=True):
+    if color in QUASAR_COLORS:
+        return (
+            _add_text_color_from_quasar
+            if add_handler
+            else _remove_text_color_from_quasar
+        )
+    elif color in TAILWIND_COLORS:
+        return (
+            _add_text_color_from_tailwind
+            if add_handler
+            else _remove_text_color_from_tailwind
+        )
+    elif color is not None:
+        return _add_text_color if add_handler else _remove_text_color
+
+
+def remove_text_color(element: ui.element, color: str):
+    handler = _query_text_color(color, add_handler=False)
+    if handler:
+        handler(element, color)
+
+
+def add_text_color(element: ui.element, color: str):
+    handler = _query_text_color(color)
+    if handler:
+        handler(element, color)
+
+
+# background color handlers
+
+
+def _remove_bg_from_quasar(element: ui.element, color: str):
+    color_prop = getattr(element, "BACKGROUND_COLOR_PROP", None)
+    if color_prop:
+        element._props.pop(color_prop, None)
+
+
+def _remove_bg_from_tailwind(element: ui.element, color: str):
+    color = f"bg-{color}"
+    element._classes.remove(color)
+
+
+def _remove_background_color(element: ui.element, color: str):
+    element._style.pop("background-color", None)
+
+
+def _add_bg_from_quasar(element: ui.element, color: str):
+    color_prop = getattr(element, "BACKGROUND_COLOR_PROP", None)
+    if color_prop:
+        element._props[color_prop] = color
+
+
+def _add_bg_from_tailwind(element: ui.element, color: str):
+    color = f"bg-{color}"
+    element.classes(color)
+
+
+def _add_background_color(element: ui.element, color: str):
+    element._style["background-color"] = f"{color} !important"
+
+
+@lru_cache(maxsize=10)
+def _query_background_color(color: str, add_handler=True):
+    if color in QUASAR_COLORS:
+        return _add_bg_from_quasar if add_handler else _remove_bg_from_quasar
+    elif color in TAILWIND_COLORS:
+        return _add_bg_from_tailwind if add_handler else _remove_bg_from_tailwind
+    elif color is not None:
+        return _add_background_color if add_handler else _remove_background_color
+
+
+def remove_background_color(element: ui.element, color: str):
+    handler = _query_background_color(color, add_handler=False)
+    if handler:
+        handler(element, color)
+
+
+def add_background_color(element: ui.element, color: str):
+    handler = _query_background_color(color)
+    if handler:
+        handler(element, color)

ex4nicegui/utils/apiEffect.py

@@ -1,5 +1,6 @@
 import signe
 from signe.core.scope import Scope
+from signe.core.consts import EffectState
 from typing import (
     TypeVar,
     overload,
@@ -88,7 +89,10 @@ def ui_effect(
             **kws,
             scope=scope or _CLIENT_SCOPE_MANAGER.get_current_scope(),
         )
-        res.update()
+
+        res.trigger(EffectState.NEED_UPDATE)
+        scheduler.run()
+        # res.update()
 
         return res
 

ex4nicegui/utils/effect.py

@@ -1,4 +1,5 @@
 import signe
+from signe.core.consts import EffectState
 from typing import (
     TypeVar,
     overload,
@@ -6,7 +7,6 @@ from typing import (
     Callable,
     Union,
 )
-
 from .scheduler import get_uiScheduler
 from .clientScope import _CLIENT_SCOPE_MANAGER
 
@@ -81,7 +81,8 @@ def effect(
             scope=_CLIENT_SCOPE_MANAGER.get_current_scope(),
         )
 
-        res.update()
+        res.trigger(EffectState.NEED_UPDATE)
+        scheduler.run()
 
         return res
 

ex4nicegui/utils/scheduler.py

@@ -1,15 +1,13 @@
 from collections import deque
 import signe
-from typing import (
-    TypeVar,
-    Callable,
-)
+from typing import TypeVar, Callable, Literal
 from functools import lru_cache
 
 
 T = TypeVar("T")
 
 T_JOB_FN = Callable[[], None]
+T_JOB_TYPE = Literal["pre", "post"]
 
 
 class UiScheduler(signe.ExecutionScheduler):
@@ -18,6 +16,7 @@ class UiScheduler(signe.ExecutionScheduler):
 
         self._pre_deque: deque[T_JOB_FN] = deque()
         self._post_deque: deque[T_JOB_FN] = deque()
+        self._next_tick_deque: deque[T_JOB_FN] = deque()
 
     def pre_job(self, job: T_JOB_FN):
         self._pre_deque.appendleft(job)
@@ -25,6 +24,9 @@ class UiScheduler(signe.ExecutionScheduler):
     def post_job(self, job: T_JOB_FN):
         self._post_deque.appendleft(job)
 
+    def next_tick_job(self, job: T_JOB_FN):
+        self._next_tick_deque.appendleft(job)
+
     def run(self):
         while self._scheduler_fns:
             super().run()
@@ -33,6 +35,7 @@ class UiScheduler(signe.ExecutionScheduler):
             try:
                 self.run_pre_deque()
                 self.run_post_deque()
+                self.run_next_tick_deque()
                 pass
             except Exception as e:
                 raise e
@@ -47,7 +50,20 @@ class UiScheduler(signe.ExecutionScheduler):
         while self._post_deque:
             self._post_deque.pop()()
 
+    def run_next_tick_deque(self):
+        while self._next_tick_deque:
+            self._next_tick_deque.pop()()
+
 
 @lru_cache(maxsize=1)
 def get_uiScheduler():
     return UiScheduler()
+
+
+def next_tick(job: T_JOB_FN):
+    """Schedule a job to run on the next tick of the event loop.
+
+    Args:
+        job (T_JOB_FN):  The job to run on the next tick.
+    """
+    get_uiScheduler().next_tick_job(job)

{ex4nicegui-0.6.8.dist-info → ex4nicegui-0.6.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ex4nicegui
-Version: 0.6.8
+Version: 0.6.9
 Summary: Extension library based on nicegui, providing data responsive,BI functionality modules
 Home-page: https://github.com/CrystalWindSnake/ex4nicegui
 License: MIT
@@ -890,6 +890,34 @@ rxui.label(lambda: f"当前 tab 为:{current_tab.value}")
 ```
 ---
 
+### lazy_tab_panels
+
+懒加载模式下，只有当前激活的 tab 才会渲染。
+```python
+from ex4nicegui import to_ref, rxui, on, deep_ref
+
+current_tab = to_ref("t1")
+
+with rxui.tabs(current_tab):
+    ui.tab("t1")
+    ui.tab("t2")
+
+with rxui.lazy_tab_panels(current_tab) as panels:
+
+    @panels.add_tab_panel("t1")
+    def _():
+        ui.notify("Hello from t1")
+
+    @panels.add_tab_panel("t2")
+    def _():
+        ui.notify("Hello from t2")
+
+```
+
+页面加载后，立刻显示 "Hello from t1"。当切换到 "t2" 页签，才会显示 "Hello from t2"。
+
+---
+
 ### scoped_style
 
 `scoped_style` 方法允许你创建限定在组件内部的样式。

{ex4nicegui-0.6.8.dist-info → ex4nicegui-0.6.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ex4nicegui/__init__.py,sha256=waq1asZd0w4BKeBozgDVKSFJTCgyK55ojdtRr-QFs1U,1048
+ex4nicegui/__init__.py,sha256=olowSWbRsHGj1uoL28cZ5697vwXUzgJzusMVFe7adfg,1116
 ex4nicegui/bi/__init__.py,sha256=eu-2CuzzrcHCyKQOfoo87v6C9nSwFDdeLhjY0cRV13M,315
 ex4nicegui/bi/dataSource.py,sha256=hOOUN4PpSfPx4Vp1sg9Sfxi5K-wROw9C22Z-mmNXs6w,7644
 ex4nicegui/bi/dataSourceFacade.py,sha256=6NuAyrTIk_L2Tz9IRFpuHKRQY_OwJINDzxoM6JYOc14,8186
@@ -28,7 +28,7 @@ ex4nicegui/gsap/timeline.js,sha256=CB300drH7UUSfy_WDeuWHSNh3WX-vwbRtKBLL1Ak43o,1
 ex4nicegui/gsap/timeline.py,sha256=EfJ3Iom3EbJMML8PnRDAO_nn58j2bone3uWrd3UubeU,2390
 ex4nicegui/gsap/wrapGsap.js,sha256=0Iz7qh8aA-h3svV7fW4U5k_pX7zXCcIdHDaG7NNvgLU,1045
 ex4nicegui/helper/__init__.py,sha256=a-9skUII1iofsWU8xlieQrmeKYb9PjVsqF5TTO34wn8,98
-ex4nicegui/helper/client_instance_locker.py,sha256=mrgwYjb_OricG5kDscBI4UvItLu0N_HmOwIiAaH2dWE,968
+ex4nicegui/helper/client_instance_locker.py,sha256=d-T5M0SFM8zOcr1paTn6gN5MVciGToL-fri4vJ7iY08,1027
 ex4nicegui/layout/__init__.py,sha256=YT76Ec7p4aFOGms6wc19207flBeyI6jrq7Kg_FQ2wnQ,278
 ex4nicegui/layout/gridFlex/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 ex4nicegui/layout/gridFlex/GridFlex.js,sha256=ljkxGFucBUIPksMAT5w_35sxGogC7OzxzXnOw21Z3_k,4468
@@ -70,8 +70,9 @@ ex4nicegui/libs/gsap/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 ex4nicegui/libs/gsap/utils/matrix.js,sha256=77scrxbQZXx4ex5HkvnT9IkhMG1rQoDNp4TSYgUeYVk,15235
 ex4nicegui/libs/gsap/utils/paths.js,sha256=2SPaRHQ7zgba9cH8hGhkTYPCZdrrEhE2qhh6ECAEvSA,49314
 ex4nicegui/libs/gsap/utils/strings.js,sha256=47G9slz5ltG9mDSwrfQDtWzzdV5QJ-AIMLRMNK0VSiM,10472
-ex4nicegui/reactive/__init__.py,sha256=-FC9JUa7bMqozkbbKlpWJB7WY8HuojAINgAD8ZcxHdY,3714
-ex4nicegui/reactive/deferredTask.py,sha256=l__Qdis24jAO97_DSHW1yBns0f13-OK02O2SSkyvoZQ,824
+ex4nicegui/reactive/__init__.py,sha256=mutWUjTNYefm_FC7yrjg5beceQCWFX0YGGFoRP01he0,3881
+ex4nicegui/reactive/base.py,sha256=_1n78kAC65jLyHm91HkeuCq4MuvISY_gc3J6xXipLec,13635
+ex4nicegui/reactive/deferredTask.py,sha256=g78TTG1EIkBxjPih01xmrCZw9OxQG93veSVSELWKfcU,987
 ex4nicegui/reactive/dropZone/dropZone.js,sha256=7rSpFJX-Fk_W_NGZhOTyuEw0bzR-YUc8ZYPzQG9KzE0,2713
 ex4nicegui/reactive/dropZone/dropZone.py,sha256=hg9UKTayff8v8Ek-n38h_3wX1Qmiotvdyv1Hsqilh5Y,2590
 ex4nicegui/reactive/EChartsComponent/ECharts.js,sha256=ye2FZNLfY4T41YAGQQYqn3LThSlnbY0pqnGtpyEg9bE,3548
@@ -85,12 +86,16 @@ ex4nicegui/reactive/fileWatcher.py,sha256=gjeZhgar02f-qGQa47Tj5SMaCP_ftRtSU898XU
 ex4nicegui/reactive/local_file_picker.py,sha256=MoInXSauFdCuhYi_CmNKZwxAtsOqXh8roWWdqNwjPBY,6199
 ex4nicegui/reactive/mermaid/mermaid.js,sha256=Ds5VevGWZE1_N0WKf-uITd8xSCO9gQzVUsmb80EajNY,2308
 ex4nicegui/reactive/mermaid/mermaid.py,sha256=uP321QiNj_S5E5I2KF9h03WlSFdRITE8tvObGdk6m7M,2144
+ex4nicegui/reactive/mixins/backgroundColor.py,sha256=R2ES4CcYm26O15No9r6Xr-vxCJg3fH6C0Y4ZxQv0NC8,1123
+ex4nicegui/reactive/mixins/disableable.py,sha256=hprIcmcq9k2xUy0hJDbhzX4EvkALOmOnWHg9UNLXYZw,1113
+ex4nicegui/reactive/mixins/textColor.py,sha256=oY3hhnj1Mb6G2Io9h1dPycIidgerxuPBWq9z5874LW8,1816
 ex4nicegui/reactive/officials/aggrid.py,sha256=AhDmbCUk8PU97eP25HCTYfGhdtKCZ6noLE3Snb2O6pU,2974
-ex4nicegui/reactive/officials/base.py,sha256=4UWSB0q7nE-Z4bzAka5VyfNkO0CGF914-fiXihipAqA,14360
-ex4nicegui/reactive/officials/button.py,sha256=TSq8PcebIbW_rjHNhzLiYbl9NhJDaNMz31-QTcL6hM8,1721
+ex4nicegui/reactive/officials/base.py,sha256=SVJz0UYPvlpSHN193X-EFCNT-lAP2LYEo8HJBQ0i8Tg,153
+ex4nicegui/reactive/officials/button.py,sha256=zbV8AFaAZ23dDxhssAHB5RCyqt6-LVmkfmAoba5obRU,2670
 ex4nicegui/reactive/officials/card.py,sha256=8-tBwm3xfVybolQ87i8lAYUpBV6FdaVdeSH6xu0736U,1275
 ex4nicegui/reactive/officials/checkbox.py,sha256=c_CDUlPx7izgaZY3Y4CaCIyxM3moQ0x_lLEs4MylSOc,1565
-ex4nicegui/reactive/officials/circular_progress.py,sha256=B24s7zwLQB8C7ScHxjlLA0rrHCYXiWgk3-8WvuZrZpE,1790
+ex4nicegui/reactive/officials/chip.py,sha256=M_4zODM-oIrnLor6qjqbvj4D67sLDqXIRDsYe4Wn8Y8,3185
+ex4nicegui/reactive/officials/circular_progress.py,sha256=DXTGC18BD2kcbAfLX6sdPFxSaQX6LkU7pUfooV3-VKE,1964
 ex4nicegui/reactive/officials/color_picker.py,sha256=FUuHhSQ96bCaVua5Cq28_V08PYIVOHFxygVawJkqo1I,3420
 ex4nicegui/reactive/officials/column.py,sha256=Ox2OZRmKjAR8pRTWNXej8I-AYI8FGujIAhZyAoi9cNY,1109
 ex4nicegui/reactive/officials/date.py,sha256=E5Xs4mJgknQzpBqW_lwJ8c3GZf8wlyi7xCPQrJ70MWE,2515
@@ -98,24 +103,24 @@ ex4nicegui/reactive/officials/drawer.py,sha256=_Ro6stOh8U3igYMeDwI4omBgi1nld5ber
 ex4nicegui/reactive/officials/echarts.py,sha256=YvoVfxRl2V93e6pC5l5O6-VJqMxvfwqEf0JLXv639UY,10072
 ex4nicegui/reactive/officials/element.py,sha256=-qsHcxfF3fMfU0sJlKtTksX_wYPMIPJ_AgFcZbbI754,412
 ex4nicegui/reactive/officials/expansion.py,sha256=N0mp7_ZO0gHjGTAA69-mAdDCNZWr3FP_sqFL4-Rvhes,1898
-ex4nicegui/reactive/officials/grid.py,sha256=ih2Ew4AMx6U6k3ZXwLstn9XH0OjNiWrK6lwdp1f3e6s,885
+ex4nicegui/reactive/officials/grid.py,sha256=Bq83jejsxQSYVc9O1IE6JUgUndUm1uexb4fq9EZWjHQ,921
 ex4nicegui/reactive/officials/html.js,sha256=lyvRAdMKZGOc7MPEapeU6WbOzq_MVzqzUJEhKuC8zWc,119
 ex4nicegui/reactive/officials/html.py,sha256=XrOpGoAJDo8dtTnZVLSmi7H5iHffmYpeZ94lXxHjBwI,629
-ex4nicegui/reactive/officials/icon.py,sha256=cFrnWAuO-i5Aj_aHZ4yJrlaR0j4KitcL_EJ2cbduoQ8,1625
+ex4nicegui/reactive/officials/icon.py,sha256=qCfdxTGrwtIYEgEYkxnxTGj1C0yEfFa6EfdLzSkjmXs,1544
 ex4nicegui/reactive/officials/image.py,sha256=ifuBU_RORV8FTG_3xKQtj6d5F5exz-nxqD70HKo0S7g,1121
 ex4nicegui/reactive/officials/input.py,sha256=osu9HfT6W3zXhFkCLNIaN-q3LjlFvz6GknksO6h7r7Y,4044
-ex4nicegui/reactive/officials/knob.py,sha256=5wQJxCWx45pi09c0jP-szbcch3YX_7He-3iL0bV7rCw,2154
-ex4nicegui/reactive/officials/label.py,sha256=_t0SGYbaKlSiR4phfgoZlWUcvyZPH5yvWsKVsQraHLw,1478
-ex4nicegui/reactive/officials/linear_progress.py,sha256=TAcy9iYnGmRldNyWvdzmL0VpVu6IFtkcF4nHsWoPBls,2194
+ex4nicegui/reactive/officials/knob.py,sha256=GRtrgnne7TdCtx_BjLeCuN8YlNsyn1Rf55Bj3e5QCzU,2321
+ex4nicegui/reactive/officials/label.py,sha256=_4a9MQJCohWQumdyUoi7dHmeuVOUpmrI5U7HOzkUhJM,1335
+ex4nicegui/reactive/officials/linear_progress.py,sha256=VhqiW64wO6QxFbv0TAVVlwtpVgysWVmUSsLe2Vd9aKY,2113
 ex4nicegui/reactive/officials/number.py,sha256=H5_6_NfcC4tosomHJXht9DHAF3q87zQKBIkPoKmHgZk,2786
 ex4nicegui/reactive/officials/radio.py,sha256=N13zS2FVzA3gew77_OjRCyzdcnheGLAeGYlWK3CxGTc,1945
 ex4nicegui/reactive/officials/row.py,sha256=fGNcEHS2sMT1GY33jpLTvUh-MjqdNSuyCrjgBXM-p2Q,1049
 ex4nicegui/reactive/officials/select.py,sha256=japHOAIeFM860W9RCOXAQtMdslN9tLjxdYuzNZ3p4rM,2996
-ex4nicegui/reactive/officials/slider.py,sha256=6dXVNsW1l0DN9ljC610FlR6wfVHfpv5xSQdkN7VaiAM,2961
+ex4nicegui/reactive/officials/slider.py,sha256=eF3W7hwxmTXmRfP_aZGM8z_zXi3Z7-mGjAZr7Sjc6vA,2971
 ex4nicegui/reactive/officials/switch.py,sha256=9OtkOB1QD3wCEyPBwPvzAPyYJku5v5MvuTciNE9EQvo,1606
 ex4nicegui/reactive/officials/tab.py,sha256=A83oxhlr8-YBeuUJTfPk05Kt9DeA5knNwbpwE5-i7Lk,1816
 ex4nicegui/reactive/officials/tab_panel.py,sha256=Y05XTIOE6qXYZjcCoVIPm9lruyR7av58McRLmPc2yxg,650
-ex4nicegui/reactive/officials/tab_panels.py,sha256=VND49QlINVBjMdaNiqI1UaDR2Rhk6tqt79ePl-jh1oA,2123
+ex4nicegui/reactive/officials/tab_panels.py,sha256=hjNDSTslwnzSPIf-mEVlhOE8AfoN5z-DDP_fUk0D5PU,6049
 ex4nicegui/reactive/officials/table.py,sha256=oNOuG8rT0oKbnn-MpO2sRisdJwpGILDZkxk96g7GYtQ,6208
 ex4nicegui/reactive/officials/tabs.py,sha256=w-wXIRUnYBgBDZDTNLhcUrIvP6rpiZRs0kd2GvJ7zPw,1301
 ex4nicegui/reactive/officials/textarea.py,sha256=dCF_uNUIveK6Nuy-OxJDSb7jzPyw-rIsNw51uwsg090,3043
@@ -123,11 +128,10 @@ ex4nicegui/reactive/officials/upload.py,sha256=5SX2CFkf3s_4bPcnx0bmKRA4eYVlm0S8R
 ex4nicegui/reactive/q_pagination.py,sha256=hvX8abzp7nmeOy2gKwtNM6Dhpt7fYqw7d8YNHYAltx8,1560
 ex4nicegui/reactive/rxui.py,sha256=gZ8ZEjGuJFKcedEZhcm4PIZguNkY-Wv5yQx80QnsBKI,31
 ex4nicegui/reactive/scopedStyle.js,sha256=RtpfUwkpjMv_cbplkr2UtydKAxB5Dz7Sm6jRgPHRhow,1569
-ex4nicegui/reactive/scopedStyle.py,sha256=lwykOybREj2mjjiN_oQ7S-TRda40kO-TxVlHtXF0M3c,633
-ex4nicegui/reactive/services/color_service.py,sha256=UIQXP4PQ_l5601Opqw5T6E_wOyd3yt1dtMLmHdRP5L4,1746
+ex4nicegui/reactive/scopedStyle.py,sha256=aYP4sIFzAmPaLyZV8m9jqyuGmOcJnC-5s07UQnoNSag,738
 ex4nicegui/reactive/services/pandas_service.py,sha256=XOoy6tZr4TpTyhewAH59eiSwVFxqwOipdM_j-mkGpdM,1043
 ex4nicegui/reactive/services/reactive_service.py,sha256=cgw7Qirc70avsgvGuMT4RCT_mFouJb1-KR3dWOgucX8,2742
-ex4nicegui/reactive/systems/color_system.py,sha256=zJvFd2UobkAtMN3yb6amGgHoR9BLyEiTSfLY-107r4w,542
+ex4nicegui/reactive/systems/color_system.py,sha256=qXRTczxfILduHAVlNJqLSed-0x-LN6TyBSegYwW9vfk,4352
 ex4nicegui/reactive/systems/object_system.py,sha256=bja9YNb4v5fVZl5gJvVA4HbwRssRp-2yFy3JBzNeKxA,752
 ex4nicegui/reactive/systems/reactive_system.py,sha256=EYDshl4UR9VheNcxcNHc231Dwko9VudilfMIxCD_uOk,685
 ex4nicegui/reactive/transitionGroup.js,sha256=rbfNU3Jrz9WFDQih3BgZOgC1MBr6j9cODZ9XggMAaTs,898
@@ -143,18 +147,18 @@ ex4nicegui/reactive/vmodel.py,sha256=cKfclpvUvQf_UYGLSYWOJVOJP2iPu8KvE7p6D-ZAHOg
 ex4nicegui/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ex4nicegui/tools/debug.py,sha256=h9iYHxw7jWWvmiExSpGi2hQl1PfhPZgC2KNS_GTuHSw,4868
 ex4nicegui/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ex4nicegui/utils/apiEffect.py,sha256=tAvQ-6sbSbZBZ1bibdAdQNb_BjrUF1uALwOkAdV_Y8M,2527
+ex4nicegui/utils/apiEffect.py,sha256=uwIi-R4Q0MaGSVmvhEFIL0O8pjBWobB_8brGAe19Qm4,2645
 ex4nicegui/utils/asyncComputed.py,sha256=-v19ic20URewLkjbms5Teco1k8LPRnpP7usjrgo1pRU,1505
 ex4nicegui/utils/clientScope.py,sha256=AM5GQLXSIrLALnzz72ZmplykhKVhRjRxQdHdAeR7g7k,1719
 ex4nicegui/utils/common.py,sha256=7P0vboDadLun6EMxNi3br9rKJgKt0QT4sy_66cHEwb4,994
-ex4nicegui/utils/effect.py,sha256=MgvWuAP3OFs2bR4ef6uXPwGCkKORUK-4hmx1oSwl04Y,2310
+ex4nicegui/utils/effect.py,sha256=LTtPTxx8-sP4VtZaFQjERB-ef3L2y5hu95GvTdj-nLo,2400
 ex4nicegui/utils/refComputed.py,sha256=Vb7fyi0wNieFeLfCjXl6wSzpws3i6_aeCka1s9dsc8E,4232
 ex4nicegui/utils/refWrapper.py,sha256=gX5sdfC1P4UXmMYM6FwdImfLD39y02kq7Af6dIMDrZ8,1472
-ex4nicegui/utils/scheduler.py,sha256=Wa963Df3UDvWHjXXoVYGIBevIILzCFoz-yAWjvxeyfQ,1218
+ex4nicegui/utils/scheduler.py,sha256=1gyq7Y2BkbwmPK_Q9kpRpc1MOC9H7xcpxuix-RZhN9k,1787
 ex4nicegui/utils/signals.py,sha256=t21k-XUjQpX0UlW_diyzx_OxNN1Al-kNqk4u8Wx0L14,7024
 ex4nicegui/utils/types.py,sha256=pE5WOSbcTHxaAhnT24FaZEd1B2Z_lTcsd46w0OKiMyc,359
 ex4nicegui/version.py,sha256=NE7u1piESstg3xCtf5hhV4iedGs2qJQw9SiC3ZSpiio,90
-ex4nicegui-0.6.8.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
-ex4nicegui-0.6.8.dist-info/METADATA,sha256=NK_zTEIdCukO1X2BGBtmWUEb-DBzsnkU2roJLU7P73Q,29500
-ex4nicegui-0.6.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ex4nicegui-0.6.8.dist-info/RECORD,,
+ex4nicegui-0.6.9.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
+ex4nicegui-0.6.9.dist-info/METADATA,sha256=7ZTJqu2FUrvBpqWBn1GdkKkuuOKCsTg3xsAlPo6mBA0,30069
+ex4nicegui-0.6.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ex4nicegui-0.6.9.dist-info/RECORD,,

ex4nicegui/reactive/services/color_service.py

@@ -1,56 +0,0 @@
-from __future__ import annotations
-from typing import TYPE_CHECKING, Literal, cast
-from ex4nicegui.utils.signals import to_value
-from nicegui.elements.mixins.color_elements import (
-    TextColorElement,
-    QUASAR_COLORS,
-    TAILWIND_COLORS,
-)
-
-if TYPE_CHECKING:
-    from ex4nicegui.reactive.officials.base import BindableUi
-    from ex4nicegui import TGetterOrReadonlyRef
-
-
-_color_sys_type = Literal["QUASAR", "TAILWIND", "STYLE"]
-_color_attr_name = "data-ex4ng-color"
-
-
-def bind_color(bindable_ui: BindableUi, ref_ui: TGetterOrReadonlyRef):
-    @bindable_ui._ui_effect
-    def _():
-        ele = cast(TextColorElement, bindable_ui.element)
-        color = to_value(ref_ui)
-
-        # get exists color
-        # e.g 'QUASAR:red'
-        pre_color = ele._props.get(_color_attr_name)  # type: str | None
-        if pre_color:
-            color_sys, value = pre_color.split(":")  # type: ignore
-            color_sys: _color_sys_type
-
-            if color_sys == "QUASAR":
-                del ele._props[ele.TEXT_COLOR_PROP]
-            elif color_sys == "TAILWIND":
-                ele.classes(remove=value)
-            else:
-                del ele._style["color"]
-
-        cur_sys: _color_sys_type = "STYLE"
-        cur_color = color
-
-        if color in QUASAR_COLORS:
-            ele._props[ele.TEXT_COLOR_PROP] = color
-            cur_sys = "QUASAR"
-        elif color in TAILWIND_COLORS:
-            cur_color = f"text-{color}"
-            ele.classes(replace=cur_color)
-            cur_sys = "TAILWIND"
-        elif color is not None:
-            ele._style["color"] = color
-
-        ele._props[_color_attr_name] = f"{cur_sys}:{color}"
-
-        ele.update()
-
-    return bindable_ui