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

ex4nicegui/__init__.py

@@ -20,7 +20,7 @@ from ex4nicegui.utils.signals import (
     is_reactive,
 )
 from ex4nicegui.utils.asyncComputed import async_computed
-
+from ex4nicegui.utils.clientScope import new_scope
 
 __all__ = [
     "async_computed",
@@ -43,6 +43,7 @@ __all__ = [
     "batch",
     "to_raw",
     "is_setter_ref",
+    "new_scope",
 ]
 
-__version__ = "0.6.4"
+__version__ = "0.6.6"

ex4nicegui/bi/dataSource.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from typing import Callable, Dict, List, Optional, Set, cast, TYPE_CHECKING
 from ex4nicegui import to_ref, ref_computed, on, batch, effect
-from nicegui import context as ng_context, Client, ui
+from nicegui import Client, ui
 
 from dataclasses import dataclass, field
 from . import types
@@ -149,7 +149,7 @@ class DataSource:
             self.__notify_update()
 
     def get_component_info_key(self, element_id: types._TElementID):
-        client_id = ng_context.get_client().id
+        client_id = ui.context.client.id
         return ComponentInfoKey(client_id, element_id)
 
     def get_filtered_data(self, element: ui.element):
@@ -175,7 +175,7 @@ class DataSource:
         update_callback: Optional[_TComponentUpdateCallback] = None,
         ui_result: Optional[UiResult] = None,
     ):
-        ng_client = ng_context.get_client()
+        ng_client = ui.context.client
         client_id = ng_client.id
 
         if not self._component_map.has_client_record(client_id):
@@ -198,7 +198,7 @@ class DataSource:
         filter: Optional[Filter],
         notify_update=True,
     ):
-        client_id = ng_context.get_client().id
+        client_id = ui.context.client.id
         key = ComponentInfoKey(client_id, element_id)
 
         if not self._component_map.has_record(key):
@@ -216,7 +216,7 @@ class DataSource:
         return self
 
     def notify_update(self, exclude: Optional[List[UiResult]] = None):
-        client_id = ng_context.get_client().id
+        client_id = ui.context.client.id
         exclude_infos = [
             self._component_map.get_info(ComponentInfoKey(client_id, ur.id))
             for ur in (exclude or [])

ex4nicegui/bi/elements/ui_echarts.py

@@ -2,10 +2,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any, Callable, Dict, Union, cast
 from nicegui.events import UiEventArguments
 from ex4nicegui.reactive import rxui
-from ex4nicegui.reactive.EChartsComponent.ECharts import (
-    EChartsMouseEventArguments,
-    echarts,
-)
+from ex4nicegui.reactive.EChartsComponent.ECharts import echarts
 from nicegui import ui
 from ex4nicegui.bi.dataSource import DataSource
 from .models import UiResult
@@ -21,7 +18,7 @@ class EChartsResult(UiResult[echarts]):
         super().__init__(element, dataSource)
         self.chart_update = chart_update
 
-    def on_chart_click(self, handler: Callable[[EChartsMouseEventArguments], Any]):
+    def on_chart_click(self, handler: Callable[[UiEventArguments], Any]):
         return self.element.echarts_on("click", handler)
 
     def on_chart_click_blank(self, handler: Callable[[UiEventArguments], Any]):

ex4nicegui/gsap/gsap.py

@@ -2,7 +2,7 @@ import os
 from pathlib import Path
 from typing import Dict, Optional, Union
 from nicegui.element import Element
-from nicegui import context as ng_context
+from nicegui import ui
 from weakref import WeakKeyDictionary
 
 
@@ -45,7 +45,7 @@ class Gsap(
         def fn():
             self.run_method("runScript", script)
 
-        if ng_context.get_client().has_socket_connection:
+        if ui.context.client.has_socket_connection:
             fn()
         else:
             tasks = self._props["scriptTasks"]
@@ -55,7 +55,7 @@ class Gsap(
         def fn():
             self.run_method(name, targets, vars)
 
-        if ng_context.get_client().has_socket_connection:
+        if ui.context.client.has_socket_connection:
             fn()
         else:
             tasks = self._props["tasks"]
@@ -66,7 +66,7 @@ __instance_map = WeakKeyDictionary()
 
 
 def _get_instance():
-    current_client = ng_context.get_client()
+    current_client = ui.context.client
     ins = __instance_map.get(current_client)
 
     if not ins:

ex4nicegui/gsap/timeline.py

@@ -2,7 +2,7 @@ import os
 from pathlib import Path
 from typing import Dict, Optional, Union
 from nicegui.element import Element
-from nicegui import context as ng_context
+from nicegui import ui
 
 
 class Timeline(
@@ -40,7 +40,7 @@ class Timeline(
         def fn():
             self.run_method("runScript", script)
 
-        if ng_context.get_client().has_socket_connection:
+        if ui.context.client.has_socket_connection:
             fn()
         else:
             tasks = self._props["scriptTasks"]
@@ -52,7 +52,7 @@ class Timeline(
         def fn():
             self.run_method(name, targets, vars)
 
-        if ng_context.get_client().has_socket_connection:
+        if ui.context.client.has_socket_connection:
             fn()
         else:
             tasks = self._props["tasks"]

ex4nicegui/reactive/EChartsComponent/ECharts.js

@@ -1,83 +1,79 @@
 import { convertDynamicProperties } from "../../static/utils/dynamic_properties.js";
 
+function collectMapRegisterTask() {
+  const tasks = new Map();
 
-function retry(fn, options = {}) {
+  if (typeof window.ex4ngEchartsMapTasks !== "undefined") {
 
-  options = {
-    error: 'Maximum number of tries exceeded',
-    tryMaxTimes: 5,
-    intervalMs: 800,
-    ...options
-  }
+    for (const [mapName, src] of window.ex4ngEchartsMapTasks.entries()) {
+
+      const registerPromise = new Promise((resolve, reject) => {
+        fetch(src)
+          .then((response) => response.json())
+          .then((data) => {
+            echarts.registerMap(mapName, data);
+            resolve();
+          });
 
-  let tryTimes = 0
-  let isDone = false
+      });
 
-  const doneFn = () => {
-    isDone = true
+      tasks.set(mapName, registerPromise);
+    }
   }
 
-  function callback() {
-    tryTimes += 1
+  return tasks;
+}
 
-    if (tryTimes <= options.tryMaxTimes) {
-      fn(doneFn)
+function hasMapOrGeo(options) {
+  if (options) {
+    const hasMapSeries = options.series && Array.isArray(options.series) &&
+      options.series.some(seriesItem =>
+        seriesItem.type === 'map' ||
+        seriesItem.type === 'lines'
+      );
 
-      if (isDone) {
-        clearInterval(task)
-      }
-
-    } else {
-      console.error(options.error)
-      clearInterval(task)
-    }
+    const hasGeoConfig = options.geo && (typeof options.geo === 'object' || Array.isArray(options.geo));
 
+    return hasMapSeries || hasGeoConfig;
   }
-
-  callback();
-  const task = setInterval(callback, options.intervalMs);
+  return false;
 }
 
+const mapRegisterTasks = collectMapRegisterTask();
 
 export default {
   template: "<div></div>",
-  mounted() {
+  async mounted() {
+    await this.$nextTick(); // wait for Tailwind classes to be applied
 
-    function initChart() {
-      this.chart = echarts.init(this.$el, this.theme);
+    if (hasMapOrGeo(this.options)) {
+      await Promise.all(Array.from(mapRegisterTasks.values()));
+    }
 
-      if (this.options) {
-        this.update_chart();
-      } else {
-        const fn = new Function('return ' + this.code)()
-        fn(this.chart)
-        this.$emit("__update_options_from_client", this.chart.getOption())
-      }
-      this.chart.getZr().on("click", (e) => {
-        if (!e.target) {
-          this.$emit("clickBlank")
-        }
-      });
-      this.resizeObs = new ResizeObserver(this.chart.resize)
+    this.chart = echarts.init(this.$el, this.theme);
+
+    this.resizeObs = new ResizeObserver(this.chart.resize)
+
+    // Prevent interruption of chart animations due to resize operations.
+    // It is recommended to register the callbacks for such an event before setOption.
+    const createResizeObserver = () => {
       this.resizeObs.observe(this.$el);
-    }
+      this.chart.off("finished", createResizeObserver);
+    };
+    this.chart.on("finished", createResizeObserver);
 
-    initChart = initChart.bind(this)
-
-    retry((done) => {
-      try {
-        initChart()
-        done()
-      } catch (e) {
-        if (e instanceof TypeError && e.message === `Cannot read properties of undefined (reading 'regions')`) {
-          echarts.dispose(this.chart)
-          return
-        } else {
-          done()
-          throw e;
-        }
+    if (this.options) {
+      this.update_chart();
+    } else {
+      const fn = new Function('return ' + this.code)()
+      fn(this.chart)
+      this.$emit("__update_options_from_client", this.chart.getOption())
+    }
+    this.chart.getZr().on("click", (e) => {
+      if (!e.target) {
+        this.$emit("clickBlank")
       }
-    }, { error: 'Maximum number of retries echart init' })
+    });
 
   },
   beforeDestroy() {
@@ -94,33 +90,10 @@ export default {
       this.chart.setOption(this.options, opts ?? { notMerge: this.chart.options?.series.length != this.options.series.length });
     },
 
-
-    echarts_on(eventName, query, callbackId) {
-
-      retry((done) => {
-        if (this.chart) {
-
-          this.chart.on(eventName, query, (e) => {
-            const eventParams = {
-              componentType: e.componentType,
-              seriesType: e.seriesType,
-              seriesIndex: e.seriesIndex,
-              seriesName: e.seriesName,
-              name: e.name,
-              dataIndex: e.dataIndex,
-              data: e.data,
-              dataType: e.dataType,
-              value: e.value,
-              color: e.color,
-            }
-
-            this.$emit('event_on', { params: eventParams, callbackId })
-          })
-
-          done()
-        }
-      }, { error: 'Maximum number of retries on echarts event' })
-
+    echarts_on(eventName, query) {
+      this.chart.on(eventName.replace(/^chart:/, ''), query, (e) => {
+        this.$emit(eventName, e);
+      });
     },
 
     run_chart_method(name, ...args) {
@@ -128,7 +101,7 @@ export default {
         name = name.slice(1);
         args = args.map((arg) => new Function("return " + arg)());
       }
-      return this.chart[name](...args);
+      return runMethod(this.chart, name, args);
     },
   },
   props: {

ex4nicegui/reactive/EChartsComponent/ECharts.py

@@ -3,70 +3,26 @@ from typing import (
     Any,
     Callable,
     Dict,
-    List,
     Optional,
     Union,
 )
-from typing_extensions import Literal
-from dataclasses import dataclass
-from nicegui.dataclasses import KWONLY_SLOTS
-from nicegui.events import (
-    handle_event,
-    UiEventArguments,
-)
+
+from nicegui.events import handle_event, UiEventArguments, GenericEventArguments
 from nicegui.element import Element
 from nicegui.awaitable_response import AwaitableResponse
-from nicegui import context as ng_context
 from pathlib import Path
 import nicegui
-import uuid
+
+from .types import (
+    _T_event_name,
+)
+from ex4nicegui.reactive.deferredTask import DeferredTask
+from .utils import get_bound_event_args, create_event_handler_args
 
 NG_ROOT = Path(nicegui.__file__).parent / "elements"
 libraries = [NG_ROOT / "lib/echarts/echarts.min.js"]
 
 
-_Chart_Click_Args = [
-    "componentType",
-    "seriesType",
-    "seriesIndex",
-    "seriesName",
-    "name",
-    "dataIndex",
-    "data",
-    "dataType",
-    "value",
-    "color",
-]
-
-
-@dataclass(**KWONLY_SLOTS)
-class EChartsMouseEventArguments(UiEventArguments):
-    componentType: str
-    seriesType: str
-    seriesIndex: int
-    seriesName: str
-    name: str
-    dataIndex: int
-    data: dict
-    dataType: Optional[str]
-    value: Any
-    color: str
-
-
-_T_echats_on_callback = Callable[[EChartsMouseEventArguments], Any]
-_T_mouse_event_name = Literal[
-    "click",
-    "dblclick",
-    "mousedown",
-    "mousemove",
-    "mouseup",
-    "mouseover",
-    "mouseout",
-    "globalout",
-    "contextmenu",
-]
-
-
 class echarts(Element, component="ECharts.js", libraries=libraries):  # type: ignore
     def __init__(
         self,
@@ -74,6 +30,7 @@ class echarts(Element, component="ECharts.js", libraries=libraries):  # type: ig
         code: Optional[str] = None,
     ) -> None:
         super().__init__()
+        self.__deferred_task = DeferredTask()
 
         if (options is None) and (bool(code) is False):
             raise ValueError("At least one of options and code must be valid.")
@@ -89,36 +46,6 @@ class echarts(Element, component="ECharts.js", libraries=libraries):  # type: ig
         self._props["options"] = options
         self._props["code"] = code
 
-        self._echarts_on_tasks: List[Callable] = []
-        self._echarts_on_callback_map: Dict[str, _T_echats_on_callback] = {}
-
-        async def on_client_connect(
-            client: nicegui.Client,
-        ) -> Any:
-            await client.connected()
-
-            for func in self._echarts_on_tasks:
-                func()
-
-            client.connect_handlers.remove(on_client_connect)  # type: ignore
-
-        ng_context.get_client().on_connect(on_client_connect)
-
-        def echartsOn_handler(e):
-            callbackId = e.args["callbackId"]
-            params: Dict = e.args["params"]
-            params["dataType"] = params.get("dataType")
-
-            if callbackId in self._echarts_on_callback_map:
-                event_args = EChartsMouseEventArguments(
-                    sender=e.sender, client=e.client, **params
-                )
-                handler = self._echarts_on_callback_map[callbackId]
-
-                handle_event(handler, event_args)
-
-        self.on("event_on", echartsOn_handler)
-
     def update_chart(
         self,
         merge_opts: Optional[dict] = None,
@@ -164,34 +91,24 @@ class echarts(Element, component="ECharts.js", libraries=libraries):  # type: ig
                 ),
             )
 
-        self.on(
-            "clickBlank",
-            inner_handler,
-            _Chart_Click_Args,
-        )
+        self.on("clickBlank", inner_handler)
 
     def echarts_on(
         self,
-        event_name: _T_mouse_event_name,
-        handler: _T_echats_on_callback,
+        event_name: _T_event_name,
+        handler: Callable[[UiEventArguments], None],
         query: Optional[Union[str, Dict]] = None,
     ):
-        if not ng_context.get_client().has_socket_connection:
+        def org_handler(e: GenericEventArguments) -> None:
+            event_args = create_event_handler_args(event_name, e)
+            handle_event(handler, event_args)
 
-            def task_func():
-                self.echarts_on(event_name, handler, query)
+        ui_event_name = f"chart:{event_name}"
+        super().on(ui_event_name, org_handler, args=get_bound_event_args(event_name))
 
-            self._echarts_on_tasks.append(task_func)
-            return
-
-        callback_id = uuid.uuid4().hex
-        self.run_method(
-            "echarts_on",
-            event_name,
-            query,
-            callback_id,
-        )
-        self._echarts_on_callback_map[callback_id] = handler
+        @self.__deferred_task.register
+        def _():
+            self.run_method("echarts_on", ui_event_name, query)
 
     def run_chart_method(
         self, name: str, *args, timeout: float = 1, check_interval: float = 0.01

ex4nicegui/reactive/EChartsComponent/events.py

@@ -0,0 +1,26 @@
+from typing import (
+    Any,
+    Optional,
+)
+from dataclasses import dataclass, fields
+from nicegui.dataclasses import KWONLY_SLOTS
+from nicegui.events import (
+    UiEventArguments,
+)
+
+
+@dataclass(**KWONLY_SLOTS)
+class EChartsMouseEventArguments(UiEventArguments):
+    componentType: str
+    seriesType: str
+    seriesIndex: int
+    seriesName: str
+    name: str
+    dataIndex: int
+    data: dict
+    dataType: Optional[str]
+    value: Any
+    color: str
+
+
+_Mouse_Event_Arguments_Fields = [f.name for f in fields(EChartsMouseEventArguments)]

ex4nicegui/reactive/EChartsComponent/types.py

@@ -0,0 +1,51 @@
+from typing import (
+    Union,
+)
+from typing_extensions import Literal
+
+
+_T_mouse_event_name = Literal[
+    "click",
+    "dblclick",
+    "mousedown",
+    "mousemove",
+    "mouseup",
+    "mouseover",
+    "mouseout",
+    "globalout",
+    "contextmenu",
+]
+
+_T_generic_event_name = Literal[
+    "highlight",
+    "downplay",
+    "selectchanged",
+    "legendselectchanged",
+    "legendselected",
+    "legendunselected",
+    "legendselectall",
+    "legendinverseselect",
+    "legendscroll",
+    "datazoom",
+    "datarangeselected",
+    "graphroam",
+    "georoam",
+    "treeroam",
+    "timelinechanged",
+    "timelineplaychanged",
+    "restore",
+    "dataviewchanged",
+    "magictypechanged",
+    "geoselectchanged",
+    "geoselected",
+    "geounselected",
+    "axisareaselected",
+    "brush",
+    "brushEnd",
+    "brushselected",
+    "globalcursortaken",
+    "rendered",
+    "finished",
+]
+
+_T_event_name = Union[_T_mouse_event_name, _T_generic_event_name]

ex4nicegui/reactive/EChartsComponent/utils.py

@@ -0,0 +1,44 @@
+from typing import List, Optional
+import typing
+from .types import _T_event_name, _T_mouse_event_name
+from .events import EChartsMouseEventArguments, _Mouse_Event_Arguments_Fields
+from nicegui.events import UiEventArguments, GenericEventArguments
+from functools import lru_cache
+
+
+@lru_cache(maxsize=1)
+def _get_mouse_event_names():
+    return set(typing.get_args(_T_mouse_event_name))
+
+
+def is_mouse_event(event_name: _T_event_name) -> bool:
+    return event_name in _get_mouse_event_names()
+
+
+def get_bound_event_args(event_name: _T_event_name) -> Optional[List[str]]:
+    if is_mouse_event(event_name):
+        return _Mouse_Event_Arguments_Fields
+
+    return None
+
+
+def create_event_handler_args(
+    event_name: _T_event_name, e: GenericEventArguments
+) -> UiEventArguments:
+    if is_mouse_event(event_name):
+        return EChartsMouseEventArguments(
+            sender=e.sender,
+            client=e.client,
+            componentType=e.args["componentType"],
+            seriesType=e.args["seriesType"],
+            seriesIndex=e.args["seriesIndex"],
+            seriesName=e.args["seriesName"],
+            name=e.args["name"],
+            dataIndex=e.args["dataIndex"],
+            data=e.args["data"],
+            dataType=e.args.get("dataType"),
+            value=e.args["value"],
+            color=e.args["color"],
+        )
+
+    return GenericEventArguments(sender=e.sender, client=e.client, args=e.args)

ex4nicegui/reactive/deferredTask.py

@@ -0,0 +1,29 @@
+from typing import Callable
+from nicegui import ui, Client as ng_client
+
+
+class DeferredTask:
+    def __init__(self):
+        self._tasks = []
+
+        async def on_client_connect(
+            client: ng_client,
+        ):
+            await client.connected()
+
+            for task in self._tasks:
+                task()
+
+            self._tasks.clear()
+
+            # Avoid events becoming ineffective due to page refresh when sharing the client.
+            if not client.shared:
+                client.connect_handlers.remove(on_client_connect)  # type: ignore
+
+        ui.context.client.on_connect(on_client_connect)
+
+    def register(self, task: Callable[..., None]):
+        if ui.context.client.has_socket_connection:
+            task()
+        else:
+            self._tasks.append(task)

ex4nicegui/reactive/officials/echarts.py

@@ -1,9 +1,6 @@
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Union, cast, Optional
-from typing_extensions import Literal
 from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.signals import on
-
 from ex4nicegui.utils.signals import (
     ReadonlyRef,
     is_ref,
@@ -11,28 +8,16 @@ from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
     to_value,
     to_raw,
+    on,
 )
 from .base import BindableUi
-from ex4nicegui.reactive.EChartsComponent.ECharts import (
-    echarts,
-    EChartsMouseEventArguments,
-)
+from ex4nicegui.reactive.EChartsComponent.ECharts import echarts
+from ex4nicegui.reactive.EChartsComponent.types import _T_event_name
+from ex4nicegui.reactive.EChartsComponent.events import EChartsMouseEventArguments
 
 from nicegui.awaitable_response import AwaitableResponse
 from nicegui import ui, app
 
-_TEventName = Literal[
-    "click",
-    "dblclick",
-    "mousedown",
-    "mousemove",
-    "mouseup",
-    "mouseover",
-    "mouseout",
-    "globalout",
-    "contextmenu",
-]
-
 
 class EChartsBindableUi(BindableUi[echarts]):
     EChartsMouseEventArguments = EChartsMouseEventArguments
@@ -50,6 +35,7 @@ class EChartsBindableUi(BindableUi[echarts]):
         value_kws = pc.get_values_kws()
 
         element = echarts(**value_kws).classes("grow self-stretch h-[16rem]")
+
         super().__init__(element)  # type: ignore
 
         self.__update_setting = None
@@ -78,17 +64,17 @@ class EChartsBindableUi(BindableUi[echarts]):
         ui.add_body_html(
             rf"""
             <script>
-                window.addEventListener('DOMContentLoaded', () => {{
-                    fetch("{src}")
-                        .then((response) => response.json())
-                        .then((data) => {{
-                            echarts.registerMap('{map_name}', data);
-                        }});
-                }});
+                if (typeof window.ex4ngEchartsMapTasks === "undefined") {{ 
+                    window.ex4ngEchartsMapTasks = new Map();
+                }}
+
+                window.ex4ngEchartsMapTasks.set('{map_name}', '{src}');
             </script>
         """
         )
 
+        return cls
+
     @classmethod
     def from_pyecharts(cls, chart: TMaybeRef):
         if is_ref(chart):
@@ -147,7 +133,7 @@ class EChartsBindableUi(BindableUi[echarts]):
 
     def on(
         self,
-        event_name: _TEventName,
+        event_name: _T_event_name,
         handler: Callable[..., Any],
         query: Optional[Union[str, Dict]] = None,
     ):
@@ -224,6 +210,7 @@ class EChartsBindableUi(BindableUi[echarts]):
         ---
         """
         self.element.echarts_on(event_name, handler, query)
+        return self
 
     def run_chart_method(
         self, name: str, *args, timeout: float = 1, check_interval: float = 0.01

ex4nicegui/reactive/officials/number.py

@@ -4,6 +4,7 @@ from typing import (
     Optional,
     TypeVar,
     Dict,
+    Union,
 )
 from ex4nicegui.reactive.utils import ParameterClassifier
 from ex4nicegui.utils.apiEffect import ui_effect
@@ -25,7 +26,7 @@ class NumberBindableUi(BindableUi[ui.number]):
         label: Optional[TMaybeRef[str]] = None,
         *,
         placeholder: Optional[TMaybeRef[str]] = None,
-        value: Optional[TMaybeRef[float]] = None,
+        value: Optional[Union[TMaybeRef[float], TMaybeRef[int]]] = None,
         min: Optional[TMaybeRef[float]] = None,
         max: Optional[TMaybeRef[float]] = None,
         step: Optional[TMaybeRef[float]] = None,

ex4nicegui/reactive/vfor.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from nicegui.element import Element
-from nicegui import context
+from nicegui import ui
 from ex4nicegui.utils.clientScope import _CLIENT_SCOPE_MANAGER
 from ex4nicegui.utils.signals import (
     TReadonlyRef,
@@ -158,7 +158,7 @@ class vfor(Generic[_T]):
             key, element, store, scope = build_element(idx, value)
             self._store_map[key] = StoreItem(store, element.id, scope)
 
-        ng_client = context.get_client()
+        ng_client = ui.context.client
 
         @on(self._data, deep=True)
         def _():

ex4nicegui/utils/clientScope.py

@@ -1,7 +1,6 @@
 from typing import Dict
 from signe.core.scope import ScopeSuite
-from nicegui import Client, context as ng_context
-
+from nicegui import Client, ui
 
 _TClientID = str
 
@@ -18,26 +17,36 @@ class NgClientScopeManager:
         self._client_scope_map: Dict[_TClientID, NgScopeSuite] = {}
 
     def new_scope(self, detached: bool = False):
-        return self.get_current_scope().scope(detached)
+        """Create a scope that can collect all reactive watch functions within it, allowing for a unified destruction process.
 
-    def get_current_scope(self):
-        # if len(ng_context.get_slot_stack()) <= 0:
-        #     return
+        @see - https://github.com/CrystalWindSnake/ex4nicegui/blob/main/README.en.md#new_scope
+        @中文文档 - https://gitee.com/carson_add/ex4nicegui/tree/main/#new_scope
+
+        Args:
+            detached (bool, optional): Whether the scope should be detached from the client. Defaults to False.
+
+        """
+        return self.get_current_scope().scope(detached=detached)
 
-        client = ng_context.get_client()
-        # if client.shared:
-        #     return
+    def get_current_scope(self):
+        client = ui.context.client
 
         if client.id not in self._client_scope_map:
             self._client_scope_map[client.id] = NgScopeSuite()
 
-            @client.on_disconnect
-            def _(e: Client):
-                if e.id in self._client_scope_map:
-                    self._client_scope_map[e.id]._top_scope.dispose()
-                    del self._client_scope_map[e.id]
+            # shared clients always not dispose their scope
+            if not client.shared:
+
+                @client.on_disconnect
+                def _(e: Client):
+                    if e.id in self._client_scope_map:
+                        self._client_scope_map[e.id]._top_scope.dispose()  # type: ignore
+                        del self._client_scope_map[e.id]
 
         return self._client_scope_map[client.id]
 
 
 _CLIENT_SCOPE_MANAGER = NgClientScopeManager()
+
+
+new_scope = _CLIENT_SCOPE_MANAGER.new_scope

{ex4nicegui-0.6.4.dist-info → ex4nicegui-0.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ex4nicegui
-Version: 0.6.4
+Version: 0.6.6
 Summary: Extension library based on nicegui, providing data responsive,BI functionality modules
 Home-page: 
 Author: carson_jia
@@ -15,7 +15,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: signe (>=0.4.14)
-Requires-Dist: nicegui (>=1.4.0)
+Requires-Dist: nicegui (>=1.4.23)
 Requires-Dist: typing-extensions
 Requires-Dist: executing
 
@@ -424,6 +424,31 @@ ui.button("change b", on_click=change_b)
 
 ---
 
+### `new_scope`
+
+By default, all watch functions are automatically destroyed when the client connection is disconnected. For finer-grained control, the `new_scope` function can be utilized.
+
+```python
+from nicegui import ui
+from ex4nicegui import rxui, to_ref, effect, new_scope
+
+a = to_ref(0.0)
+
+scope1 = new_scope()
+
+@scope1.run
+def _():
+    @effect
+    def _():
+        print(f"scope 1:{a.value}")
+
+
+rxui.number(value=a)
+rxui.button("dispose scope 1", on_click=scope1.dispose)
+```
+
+---
+
 ## functionality
 
 ### vmodel

{ex4nicegui-0.6.4.dist-info → ex4nicegui-0.6.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
-ex4nicegui/__init__.py,sha256=OlpBWKkLVaeZyjt3XRpj_OsmU7tg_g0ptTI0mOvj_XQ,818
+ex4nicegui/__init__.py,sha256=NxkjzifbZg-o2hX4ENk1ekPacAnu1PLi7dr34QsomEw,886
 ex4nicegui/bi/__init__.py,sha256=eu-2CuzzrcHCyKQOfoo87v6C9nSwFDdeLhjY0cRV13M,315
-ex4nicegui/bi/dataSource.py,sha256=sQzuQvNWBf20n9cz--1OX5gxT6RUAhwrq_xTQEpSa0o,7691
+ex4nicegui/bi/dataSource.py,sha256=hOOUN4PpSfPx4Vp1sg9Sfxi5K-wROw9C22Z-mmNXs6w,7644
 ex4nicegui/bi/dataSourceFacade.py,sha256=6NuAyrTIk_L2Tz9IRFpuHKRQY_OwJINDzxoM6JYOc14,8186
 ex4nicegui/bi/index.py,sha256=ZuwFxUD1KcxBpKvTLO7CGQQ5gN7FDpaHo9tfAS3UpQ4,2067
 ex4nicegui/bi/protocols.py,sha256=SjwYrS21L6dcNfYrLvh5pESya0NIa6ihQ6URMU6z-6Q,4529
@@ -13,7 +13,7 @@ ex4nicegui/bi/elements/text.py,sha256=oX7S1cVQL6YGMOlQG_cdwK9duzOHCPG0lOi9qTZwo6
 ex4nicegui/bi/elements/ui_aggrid.py,sha256=Lbtcmu_GR5_metQ9p8a2bzYSXsgElOZRMGl1h0fqcFU,2009
 ex4nicegui/bi/elements/ui_date_picker.js,sha256=Tk6NACKVsCnqhWZtuNA6Xt2e-AWI54AnjfHPIldaM5A,852
 ex4nicegui/bi/elements/ui_date_picker.py,sha256=PGv8gsgc4hkvWa-EN19qznEllV7DAzz7v4aTwdx9do4,2260
-ex4nicegui/bi/elements/ui_echarts.py,sha256=o_wIqxyrU27UvTSIRp6_58nQSic9llh1CuHI9QcRMOc,2302
+ex4nicegui/bi/elements/ui_echarts.py,sha256=B-YCMLzb4Wr3sQIMbtTZAoVXfPqTBvbZk-CU4vFBbBk,2248
 ex4nicegui/bi/elements/ui_radio.py,sha256=tIoBZVhoY-z3dhGxh2pYENuxVnwkHhZB5g4_a5QPMRE,5447
 ex4nicegui/bi/elements/ui_range.py,sha256=1tnka-a0jVfqTwvypKIRgHb6EzYGn3DmsWr3yvSVD-g,4128
 ex4nicegui/bi/elements/ui_select.py,sha256=yOab3YrHCZ5kkU3bmDdr-LIAMhOunUsCbtctR8WpnLI,3872
@@ -23,9 +23,9 @@ ex4nicegui/experimental_/__init__.py,sha256=HODL0f70HUzVrfRwUzdCwxTp_9mYr4D1nnzd
 ex4nicegui/experimental_/gridLayout/__init__.py,sha256=c9k-zykhKW3Ol6QECUoKqJW9QEuhA9xPi8s4Dm4m7SU,125
 ex4nicegui/experimental_/gridLayout/index.py,sha256=zFXuvFroo5EC1CFjt-b4hMiEy67hGP5J1GYTKH6kpUU,4737
 ex4nicegui/gsap/__init__.py,sha256=xBApQlq9st9exhgcSkqCzWeS6bc1eKiPJfYP25MSInw,218
-ex4nicegui/gsap/gsap.py,sha256=-1sncG2_37LYN6RosnHZAgYSI899HMj9FB6MQWUj8yw,4675
+ex4nicegui/gsap/gsap.py,sha256=JM3xM9OjjmUMSV-be5-H-geiw61xDU3ZljDyl8yyZAU,4638
 ex4nicegui/gsap/timeline.js,sha256=CB300drH7UUSfy_WDeuWHSNh3WX-vwbRtKBLL1Ak43o,1241
-ex4nicegui/gsap/timeline.py,sha256=B3CvN83CzJMMFMVdZZC2UHR0l_I90amRQ0Sf-P623zo,2421
+ex4nicegui/gsap/timeline.py,sha256=EfJ3Iom3EbJMML8PnRDAO_nn58j2bone3uWrd3UubeU,2390
 ex4nicegui/gsap/wrapGsap.js,sha256=0Iz7qh8aA-h3svV7fW4U5k_pX7zXCcIdHDaG7NNvgLU,1045
 ex4nicegui/layout/__init__.py,sha256=YT76Ec7p4aFOGms6wc19207flBeyI6jrq7Kg_FQ2wnQ,278
 ex4nicegui/layout/gridFlex/GridFlex.js,sha256=ljkxGFucBUIPksMAT5w_35sxGogC7OzxzXnOw21Z3_k,4468
@@ -67,6 +67,7 @@ ex4nicegui/libs/gsap/utils/matrix.js,sha256=77scrxbQZXx4ex5HkvnT9IkhMG1rQoDNp4TS
 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/empty.js,sha256=Y-caS4CN8jUq59LgGgcvgfkndze-RgWF_ZMmAcxOrbw,50
 ex4nicegui/reactive/empty.py,sha256=kB851B12V1_VCNsFKW6OmjcdIiuZqGEGjLgA6k6yug8,132
 ex4nicegui/reactive/fileWatcher.py,sha256=gjeZhgar02f-qGQa47Tj5SMaCP_ftRtSU898XUmXl1U,1472
@@ -78,11 +79,14 @@ ex4nicegui/reactive/transitionGroup.py,sha256=VWyYL3QUfX6YQXuxwBFF4sJ4P5VP1S-bCj
 ex4nicegui/reactive/usePagination.py,sha256=Gop9KV780DcQK5bH4zQZ5sRpV3jOD2sRX_Bpmb1LTFI,2598
 ex4nicegui/reactive/utils.py,sha256=DZ77y0qQAeHUb52yyCKlLE5_3MQlE_OAUH_M1s31_Qg,4360
 ex4nicegui/reactive/vfor.js,sha256=xtKVUPSN0BP99H0BO6LRUYFqxqTGIRttQh5UjoUTwBc,282
-ex4nicegui/reactive/vfor.py,sha256=MirlPrwDSy0YR85i4wcGGGX4QjuN5iek3fIxhIpFbGo,5786
+ex4nicegui/reactive/vfor.py,sha256=LntYIilx3JoeGjplRKLgW9cxzX9uRw27n6YRF9ROxN8,5778
 ex4nicegui/reactive/vmodel.py,sha256=SgmchPVfM6uQAH60VlVyNobfuTg3ScuxlXNFJLRD-r8,5091
-ex4nicegui/reactive/EChartsComponent/ECharts.js,sha256=HMmgXlDl548H4JpozDSbLWv-opvPi3OdJz_XY_MHbnY,3326
-ex4nicegui/reactive/EChartsComponent/ECharts.py,sha256=hoUZ7h-KOUKNd-1BybSX4xxv33gYuTkky70yEzv-oIA,6344
+ex4nicegui/reactive/EChartsComponent/ECharts.js,sha256=TA7a4NXWJOo7WrLLiA_TUFvgVygVHVQBQ2mE2m193F4,3164
+ex4nicegui/reactive/EChartsComponent/ECharts.py,sha256=ho6Cnz5zv99UXyQGdoln81KSCWlLsA4ZUT0Jdic4Xmo,4490
 ex4nicegui/reactive/EChartsComponent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ex4nicegui/reactive/EChartsComponent/events.py,sha256=_BtmLRcAIZciDQT5i1eFc-r3e0pBnAabW1BSl6uzhCc,570
+ex4nicegui/reactive/EChartsComponent/types.py,sha256=_7AekG0IyzRpDEBZMtKRiZ3o3dUCcn6btegBk8c9Fig,1001
+ex4nicegui/reactive/EChartsComponent/utils.py,sha256=a5r2fghC6IIZbyfUUR8TEkpLj9HPbcf8QHEBatXaL2M,1463
 ex4nicegui/reactive/UseDraggable/UseDraggable.js,sha256=xZm_g_L2lamxAjiAeGPDR0CNmjlvgzuiJ6gH77pNrg4,5473
 ex4nicegui/reactive/UseDraggable/UseDraggable.py,sha256=Zh6NfQPSf3nMvCL8wDA4tjhyH7jfqt9cnbJ7L4cI-SU,3929
 ex4nicegui/reactive/UseDraggable/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -103,7 +107,7 @@ ex4nicegui/reactive/officials/color_picker.py,sha256=fSRICdzdH16w3BIGyAk3CtaauYq
 ex4nicegui/reactive/officials/column.py,sha256=CfoJigEdpRoGaJTY_O7wbK8cp8ufX8mYUKNRUnPWUr0,1040
 ex4nicegui/reactive/officials/date.py,sha256=jp75WgZaICnCHLS_wpF3uJI2kaGeNqmRLj3qpn5IIyg,2681
 ex4nicegui/reactive/officials/drawer.py,sha256=y9_gbDDy_6Y7mRfSB8BGawM-_g6kECM1ieZXMX2YCQo,2370
-ex4nicegui/reactive/officials/echarts.py,sha256=btLYAqYuWv_zlX3KJH-L_rofx8HblYbscnVDf-bz23w,9696
+ex4nicegui/reactive/officials/echarts.py,sha256=QCpShx9Gy-0kriSPXb4CFNHhSlfjtXjIQVNTk8juXes,9495
 ex4nicegui/reactive/officials/element.py,sha256=-qsHcxfF3fMfU0sJlKtTksX_wYPMIPJ_AgFcZbbI754,412
 ex4nicegui/reactive/officials/expansion.py,sha256=pAFGaj_N88KLNPw2476lthyZbCOa3APlMtHsgRT9rWI,1873
 ex4nicegui/reactive/officials/grid.py,sha256=z3mdvDnpxKECtvioTgGXROc1kcAugNCBOvwZ7NCpQHI,865
@@ -115,7 +119,7 @@ ex4nicegui/reactive/officials/input.py,sha256=d338LH7tYArhUQYXJleytIOXsDieXEm4yL
 ex4nicegui/reactive/officials/knob.py,sha256=ZCKXUbFQUhdsRoTADk2gqdEwmi1CeW9Jmc7AGJyV1Yg,2153
 ex4nicegui/reactive/officials/label.py,sha256=7xhvQIa-3Zm44xJIoKeMys1M6d6AMJTeE5l9THPICGo,1398
 ex4nicegui/reactive/officials/linear_progress.py,sha256=3ew4uqUIDrDH0PdX42K7rnKQL4khmZgxmJfmWX6qMDs,2128
-ex4nicegui/reactive/officials/number.py,sha256=Ro20LiSjzeLkcPM5oIe3phulLH5Gsw3YwYBCyRl9bqI,2201
+ex4nicegui/reactive/officials/number.py,sha256=Ndzjbo9eilNd-pfOLqpB4RVlUNXoMHnfyO_b7Jbdx4Q,2236
 ex4nicegui/reactive/officials/radio.py,sha256=35KCAE0JhzBczaCGrlufZystgpzljobOoIw1H7js1KA,1929
 ex4nicegui/reactive/officials/row.py,sha256=pwFJBdv3_D5-E-oga-OG5t57ahHcYXGSI_-UofWg_j0,1029
 ex4nicegui/reactive/officials/select.py,sha256=Fj4V96ju2tpsP1ok0RFokN1K7TxzNS9YLVCz55O788Y,2980
@@ -137,13 +141,13 @@ ex4nicegui/tools/debug.py,sha256=h9iYHxw7jWWvmiExSpGi2hQl1PfhPZgC2KNS_GTuHSw,486
 ex4nicegui/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ex4nicegui/utils/apiEffect.py,sha256=tAvQ-6sbSbZBZ1bibdAdQNb_BjrUF1uALwOkAdV_Y8M,2527
 ex4nicegui/utils/asyncComputed.py,sha256=-v19ic20URewLkjbms5Teco1k8LPRnpP7usjrgo1pRU,1505
-ex4nicegui/utils/clientScope.py,sha256=-KJnrZGqdAQUNNbQbqMAqNzWHCVon-lC3aaQGuaTdxI,1225
+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/scheduler.py,sha256=Wa963Df3UDvWHjXXoVYGIBevIILzCFoz-yAWjvxeyfQ,1218
 ex4nicegui/utils/signals.py,sha256=-80iaAzIyUDR_7LBr8TfOY59Fj4dSq92klWXoRy538g,11346
-ex4nicegui-0.6.4.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
-ex4nicegui-0.6.4.dist-info/METADATA,sha256=rB9OqtAzUeM8P4K1L5QTGvEvM0mcyFn3KD3xlzlJ4zI,27618
-ex4nicegui-0.6.4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-ex4nicegui-0.6.4.dist-info/top_level.txt,sha256=VFwMiO9AFjj5rfLMJwN1ipLRASk9fJXB8tM6DNrpvPQ,11
-ex4nicegui-0.6.4.dist-info/RECORD,,
+ex4nicegui-0.6.6.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
+ex4nicegui-0.6.6.dist-info/METADATA,sha256=J896pvPcnLUqNJMZ_xk2lf92TsPqsEjW7Ot68ouz770,28134
+ex4nicegui-0.6.6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+ex4nicegui-0.6.6.dist-info/top_level.txt,sha256=VFwMiO9AFjj5rfLMJwN1ipLRASk9fJXB8tM6DNrpvPQ,11
+ex4nicegui-0.6.6.dist-info/RECORD,,