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

ex4nicegui/reactive/officials/checkbox.py

@@ -4,10 +4,9 @@ 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 (
-    ReadonlyRef,
+    TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
     to_value,
 )
@@ -44,14 +43,14 @@ class CheckboxBindableUi(BindableUi[ui.checkbox], DisableableMixin):
     def value(self):
         return self.element.value
 
-    def bind_prop(self, prop: str, ref_ui: ReadonlyRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "value":
             return self.bind_value(ref_ui)
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_value(self, ref_ui: ReadonlyRef[bool]):
-        @ui_effect
+    def bind_value(self, ref_ui: TGetterOrReadonlyRef[bool]):
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
             self.element.update()

ex4nicegui/reactive/officials/circular_progress.py

@@ -1,11 +1,10 @@
 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 (
-    ReadonlyRef,
+    TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
     to_value,
 )
@@ -50,14 +49,14 @@ class CircularProgressBindableUi(
     def value(self):
         return self.element.value
 
-    def bind_prop(self, prop: str, ref_ui: ReadonlyRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "value":
             return self.bind_value(ref_ui)
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_value(self, ref_ui: ReadonlyRef[float]):
-        @ui_effect
+    def bind_value(self, ref_ui: TGetterOrReadonlyRef[float]):
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/color_picker.py

@@ -4,11 +4,10 @@ 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 (
-    ReadonlyRef,
+    TGetterOrReadonlyRef,
     Ref,
     _TMaybeRef as TMaybeRef,
     is_setter_ref,
@@ -69,21 +68,21 @@ class ColorPickerBindableUi(BindableUi[ui.color_picker]):
     def value(self):
         return self.element.value
 
-    def bind_prop(self, prop: str, ref_ui: ReadonlyRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "value":
             return self.bind_value(ref_ui)
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_color(self, ref_ui: ReadonlyRef[str]):
-        @ui_effect
+    def bind_color(self, ref_ui: TGetterOrReadonlyRef[str]):
+        @self._ui_effect
         def _():
             self.element.set_color(to_value(ref_ui))
 
         return self
 
-    def bind_value(self, ref_ui: ReadonlyRef[bool]):
-        @ui_effect
+    def bind_value(self, ref_ui: TGetterOrReadonlyRef[bool]):
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/column.py

@@ -1,8 +1,9 @@
 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,
 )
 from nicegui import ui
@@ -19,13 +20,13 @@ class ColumnBindableUi(BindableUi[ui.column]):
         for key, value in pc.get_bindings().items():
             self.bind_prop(key, value)  # type: ignore
 
-    def bind_prop(self, prop: str, ref_ui: TMaybeRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "wrap":
             return self.bind_wrap(ref_ui)
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_wrap(self, ref_ui: TMaybeRef):
+    def bind_wrap(self, ref_ui: TGetterOrReadonlyRef):
         self.bind_classes({"wrap": ref_ui})
 
     def __enter__(self):

ex4nicegui/reactive/officials/date.py

@@ -1,10 +1,9 @@
 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 (
-    ReadonlyRef,
+    TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
     to_value,
 )
@@ -45,13 +44,8 @@ class DateBindableUi(BindableUi[ui.date]):
         pc = ParameterClassifier(
             locals(),
             maybeRefs=[
-                "label",
                 "value",
-                "placeholder",
-                "password",
-                "password_toggle_button",
-                "autocomplete",
-                "validation",
+                "mask",
             ],
             v_model=("value", "on_change"),
             events=["on_change"],
@@ -68,14 +62,14 @@ class DateBindableUi(BindableUi[ui.date]):
     def value(self):
         return self.element.value
 
-    def bind_prop(self, prop: str, ref_ui: ReadonlyRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "value":
             return self.bind_value(ref_ui)
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_value(self, ref_ui: ReadonlyRef[bool]):
-        @ui_effect
+    def bind_value(self, ref_ui: TGetterOrReadonlyRef[bool]):
+        @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,14 +1,13 @@
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Union, cast, Optional
-from ex4nicegui.reactive.utils import ParameterClassifier
+from typing import Any, Callable, Dict, List, Union, cast, Optional, Literal
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
-    ReadonlyRef,
+    TGetterOrReadonlyRef,
     is_ref,
     ref_computed,
     _TMaybeRef as TMaybeRef,
     to_value,
     to_raw,
-    on,
 )
 from .base import BindableUi
 from ex4nicegui.reactive.EChartsComponent.ECharts import echarts
@@ -17,6 +16,7 @@ from ex4nicegui.reactive.EChartsComponent.events import EChartsMouseEventArgumen
 
 from nicegui.awaitable_response import AwaitableResponse
 from nicegui import ui, app
+import orjson as json
 
 
 class EChartsBindableUi(BindableUi[echarts]):
@@ -46,7 +46,14 @@ class EChartsBindableUi(BindableUi[echarts]):
             self.bind_prop(key, value)  # type: ignore
 
     @classmethod
-    def register_map(cls, map_name: str, src: Union[str, Path]):
+    def register_map(
+        cls,
+        map_name: str,
+        src: Union[str, Path],
+        *,
+        type: Literal["geoJSON", "svg"] = "geoJSON",
+        special_areas: Optional[Dict[str, Any]] = None,
+    ):
         """Registers available maps. This can only be used after including geo component or chart series of map.
 
         @see - https://github.com/CrystalWindSnake/ex4nicegui/blob/main/README.en.md#rxuiechartsregister_map
@@ -55,6 +62,8 @@ class EChartsBindableUi(BindableUi[echarts]):
         Args:
             map_name (str): Map name, referring to map value set in geo component or map.
             src (Union[str, Path]): Map data. If str, it should be a network address. If path, it should be a valid file.
+            type (Literal["geoJSON", "svg"], optional): Map data type. Defaults to "geoJSON".
+            special_areas (Optional[Dict[str, Any]], optional): Special areas. Defaults to None.
         """
         if isinstance(src, Path):
             src = app.add_static_file(local_file=src)
@@ -63,13 +72,21 @@ class EChartsBindableUi(BindableUi[echarts]):
 
         ui.add_body_html(
             rf"""
-            <script>
-                if (typeof window.ex4ngEchartsMapTasks === "undefined") {{ 
-                    window.ex4ngEchartsMapTasks = new Map();
-                }}
-
-                window.ex4ngEchartsMapTasks.set('{map_name}', '{src}');
-            </script>
+<script>
+    (function () {{
+        if (typeof window.ex4ngEchartsMapTasks === "undefined") {{
+            window.ex4ngEchartsMapTasks = new Map();
+        }}
+
+        const value = {{
+            src: '{src}',
+            type: '{type}',
+            specialAreas: {json.dumps(special_areas).decode('utf-8')}
+        }}
+
+        window.ex4ngEchartsMapTasks.set('{map_name}', value);
+    }})()
+</script>
         """
         )
 
@@ -116,14 +133,14 @@ class EChartsBindableUi(BindableUi[echarts]):
             code = code.read_text("utf8")
         return cls(code=code)
 
-    def bind_prop(self, prop: str, ref_ui: ReadonlyRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "options":
             return self.bind_options(ref_ui)
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_options(self, ref_ui: ReadonlyRef[Dict]):
-        @on(ref_ui)
+    def bind_options(self, ref_ui: TGetterOrReadonlyRef[Dict]):
+        @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,8 +1,8 @@
 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,
     to_value,
 )
@@ -45,14 +45,14 @@ class ExpansionBindableUi(BindableUi[ui.expansion]):
     def value(self):
         return self.element.value
 
-    def bind_prop(self, prop: str, ref_ui: TMaybeRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "value":
             return self.bind_value(ref_ui)
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_value(self, ref_ui: TMaybeRef):
-        @ui_effect
+    def bind_value(self, ref_ui: TGetterOrReadonlyRef):
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/grid.py

@@ -3,7 +3,7 @@ from typing import (
     Optional,
 )
 
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 
 from nicegui import ui
 from .base import BindableUi

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,11 +2,9 @@ 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 (
-    ReadonlyRef,
+    TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
     to_value,
 )
@@ -14,7 +12,8 @@ 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.services import color_service
 
 
 class IconBindableUi(BindableUi[ui.icon]):
@@ -35,7 +34,7 @@ class IconBindableUi(BindableUi[ui.icon]):
         for key, value in pc.get_bindings().items():
             self.bind_prop(key, value)  # type: ignore
 
-    def bind_prop(self, prop: str, ref_ui: ReadonlyRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "name":
             return self.bind_name(ref_ui)
 
@@ -44,11 +43,11 @@ class IconBindableUi(BindableUi[ui.icon]):
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_color(self, ref_ui: ReadonlyRef):
-        return _bind_color(self, ref_ui)
+    def bind_color(self, ref_ui: TGetterOrReadonlyRef):
+        return color_service.bind_color(self, ref_ui)
 
-    def bind_name(self, ref_ui: ReadonlyRef):
-        @ui_effect
+    def bind_name(self, ref_ui: TGetterOrReadonlyRef):
+        @self._ui_effect
         def _():
             ele = cast(TextColorElement, self.element)
             ele._props["name"] = to_value(ref_ui)

ex4nicegui/reactive/officials/image.py

@@ -2,11 +2,9 @@ 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 (
-    ReadonlyRef,
+    TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
     to_value,
 )
@@ -27,13 +25,13 @@ class ImageBindableUi(BindableUi[ui.image]):
         for key, value in pc.get_bindings().items():
             self.bind_prop(key, value)  # type: ignore
 
-    def bind_prop(self, prop: str, ref_ui: ReadonlyRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "source":
             return self.bind_source(ref_ui)
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_source(self, ref_ui: ReadonlyRef[Union[str, Path]]):
-        @ui_effect
+    def bind_source(self, ref_ui: TGetterOrReadonlyRef[Union[str, Path]]):
+        @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 (
-    ReadonlyRef,
+    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):
@@ -53,7 +51,7 @@ class InputBindableUi(BindableUi[ui.input], DisableableMixin):
         for key, value in pc.get_bindings().items():
             self.bind_prop(key, value)  # type: ignore
 
-    def bind_prop(self, prop: str, ref_ui: ReadonlyRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "value":
             return self.bind_value(ref_ui)
         if prop == "password":
@@ -61,16 +59,16 @@ class InputBindableUi(BindableUi[ui.input], DisableableMixin):
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_value(self, ref_ui: ReadonlyRef[str]):
-        @ui_effect
+    def bind_value(self, ref_ui: TGetterOrReadonlyRef[str]):
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
             self.element.update()
 
         return self
 
-    def bind_password(self, ref_ui: ReadonlyRef[bool]):
-        @ui_effect
+    def bind_password(self, ref_ui: TGetterOrReadonlyRef[bool]):
+        @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,13 +3,11 @@ 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 (
-    ReadonlyRef,
     _TMaybeRef as TMaybeRef,
     to_value,
+    TGetterOrReadonlyRef,
 )
 from nicegui import ui
 from .base import BindableUi, DisableableMixin
@@ -61,14 +59,14 @@ class KnobBindableUi(
     def value(self):
         return self.element.value
 
-    def bind_prop(self, prop: str, ref_ui: ReadonlyRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "value":
             return self.bind_value(ref_ui)
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_value(self, ref_ui: ReadonlyRef[float]):
-        @ui_effect
+    def bind_value(self, ref_ui: TGetterOrReadonlyRef[float]):
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 

ex4nicegui/reactive/officials/label.py

@@ -1,6 +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,
     to_value,
     _TMaybeRef as TMaybeRef,
 )
@@ -25,7 +26,7 @@ class LabelBindableUi(BindableUi[ui.label]):
     def text(self):
         return self.element.text
 
-    def bind_prop(self, prop: str, ref_ui: TMaybeRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "text":
             return self.bind_text(ref_ui)
 
@@ -34,7 +35,7 @@ class LabelBindableUi(BindableUi[ui.label]):
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_color(self, ref_ui: TMaybeRef):
+    def bind_color(self, ref_ui: TGetterOrReadonlyRef):
         @self._ui_effect
         def _():
             ele = self.element
@@ -42,7 +43,7 @@ class LabelBindableUi(BindableUi[ui.label]):
             ele._style["color"] = color
             ele.update()
 
-    def bind_text(self, ref_ui: TMaybeRef):
+    def bind_text(self, ref_ui: TGetterOrReadonlyRef):
         @self._ui_effect
         def _():
             self.element.set_text(str(to_value(ref_ui)))

ex4nicegui/reactive/officials/linear_progress.py

@@ -1,17 +1,16 @@
 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 (
-    ReadonlyRef,
+    TGetterOrReadonlyRef,
     _TMaybeRef as TMaybeRef,
     to_value,
 )
 from nicegui import ui
 
-from .base import BindableUi, _bind_color
+from .base import BindableUi
+from ex4nicegui.reactive.services import color_service
 
 
 class LinearProgressBindableUi(BindableUi[ui.linear_progress]):
@@ -47,7 +46,7 @@ class LinearProgressBindableUi(BindableUi[ui.linear_progress]):
     def value(self):
         return self.element.value
 
-    def bind_prop(self, prop: str, ref_ui: ReadonlyRef):
+    def bind_prop(self, prop: str, ref_ui: TGetterOrReadonlyRef):
         if prop == "value":
             return self.bind_value(ref_ui)
 
@@ -56,11 +55,11 @@ class LinearProgressBindableUi(BindableUi[ui.linear_progress]):
 
         return super().bind_prop(prop, ref_ui)
 
-    def bind_color(self, ref_ui: ReadonlyRef):
-        return _bind_color(self, ref_ui)
+    def bind_color(self, ref_ui: TGetterOrReadonlyRef):
+        return color_service.bind_color(self, ref_ui)
 
-    def bind_value(self, ref_ui: ReadonlyRef):
-        @ui_effect
+    def bind_value(self, ref_ui: TGetterOrReadonlyRef):
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))