ex4nicegui 0.2.18__py3-none-any.whl → 0.3.1__py3-none-any.whl

ex4nicegui/reactive/officials/base.py

@@ -29,7 +29,7 @@ from nicegui.elements.mixins.text_element import TextElement
 
 T = TypeVar("T")
 
-TWidget = TypeVar("TWidget")
+TWidget = TypeVar("TWidget", bound=ui.element)
 
 
 class BindableUi(Generic[TWidget]):
@@ -61,6 +61,13 @@ class BindableUi(Generic[TWidget]):
         cast(ui.element, self.element).style(add, remove=remove, replace=replace)
         return self
 
+    def __enter__(self) -> Self:
+        self.element.__enter__()
+        return self
+
+    def __exit__(self, *_):
+        self.element.default_slot.__exit__(*_)
+
     def tooltip(self, text: str) -> Self:
         cast(ui.element, self.element).tooltip(text)
         return self
@@ -78,6 +85,10 @@ class BindableUi(Generic[TWidget]):
     def element(self):
         return self.__element
 
+    def delete(self) -> None:
+        """Delete the element."""
+        self.element.delete()
+
     def bind_prop(self, prop: str, ref_ui: ReadonlyRef):
         if prop == "visible":
             return self.bind_visible(ref_ui)

ex4nicegui/reactive/officials/button.py

@@ -57,7 +57,7 @@ class ButtonBindableUi(SingleValueBindableUi[str, ui.button]):
         @effect
         def _():
             ele = self.element
-            ele._props["text"] = ref_ui.value
+            ele._props["label"] = ref_ui.value
             ele.update()
 
         return self

ex4nicegui/reactive/officials/drawer.py

@@ -51,8 +51,7 @@ class DrawerBindableUi(SingleValueBindableUi[bool, Drawer]):
         else:
             element = ui.right_drawer(**value_kws)
 
-        element.style(f"background-color:rgba(25, 118, 210,0.3)")
-        element.classes("flex flex-col gap-4")
+        element.classes("flex flex-col gap-4 backdrop-blur-md bg-[#5898d4]/30")
 
         init_value = (
             element._props["model-value"]

ex4nicegui/reactive/officials/echarts.py

@@ -26,7 +26,7 @@ class EChartsBindableUi(BindableUi[echarts]):
 
         value_kws = _convert_kws_ref2value(kws)
 
-        element = echarts(**value_kws)
+        element = echarts(**value_kws).classes("grow self-stretch h-[16rem]")
 
         super().__init__(element)
 

ex4nicegui/utils/clientScope.py

@@ -0,0 +1,42 @@
+from typing import Dict, List
+from signe.core.effect import Effect
+from signe.core.scope import IScope
+from nicegui import globals as ng_globals, Client
+
+
+_TClientID = str
+
+
+class NgClientScope(IScope):
+    def __init__(self) -> None:
+        self._effects: List[Effect] = []
+
+    def add_effect(self, effect: Effect):
+        self._effects.append(effect)
+
+    def dispose(self):
+        for effect in self._effects:
+            effect.dispose()
+
+
+class NgClientScopeManager:
+    def __init__(self) -> None:
+        self._client_scope_map: Dict[_TClientID, NgClientScope] = {}
+
+    def get_scope(self):
+        if len(ng_globals.get_slot_stack()) <= 0:
+            return
+
+        client = ng_globals.get_client()
+        if client.shared:
+            return
+
+        if client.id not in self._client_scope_map:
+            self._client_scope_map[client.id] = NgClientScope()
+
+            @client.on_disconnect
+            def _(e: Client):
+                if e.id in self._client_scope_map:
+                    self._client_scope_map[e.id].dispose()
+
+        return self._client_scope_map[client.id]

ex4nicegui/utils/signals.py

@@ -1,9 +1,12 @@
-from signe import createSignal, effect, computed, on as signe_on
+from signe import createSignal, effect as signe_effect, computed, on as signe_on
 from signe.core.signal import Signal, SignalOption
+from signe.core.effect import Effect
 from signe import utils as signe_utils
+from .clientScope import NgClientScopeManager
 from signe.types import TSetter, TGetter
 from typing import (
     Any,
+    Dict,
     TypeVar,
     Generic,
     overload,
@@ -17,6 +20,8 @@ from nicegui import ui
 
 T = TypeVar("T")
 
+_CLIENT_SCOPE_MANAGER = NgClientScopeManager()
+
 
 class ReadonlyRef(Generic[T]):
     def __init__(self, getter: TGetter[T]) -> None:
@@ -115,6 +120,43 @@ def ref(value: T):
     return cast(Ref[T], Ref(s.getValue, s.setValue, s))
 
 
+@overload
+def effect(
+    fn: None = ...,
+    *,
+    priority_level=1,
+    debug_trigger: Optional[Callable] = None,
+    debug_name: Optional[str] = None,
+) -> signe_utils._TEffect_Fn[None]:
+    ...
+
+
+@overload
+def effect(
+    fn: Callable[..., None],
+    *,
+    priority_level=1,
+    debug_trigger: Optional[Callable] = None,
+    debug_name: Optional[str] = None,
+) -> Effect[None]:
+    ...
+
+
+def effect(
+    fn: Optional[Callable[..., None]] = None,
+    *,
+    priority_level=1,
+    debug_trigger: Optional[Callable] = None,
+    debug_name: Optional[str] = None,
+) -> Union[signe_utils._TEffect_Fn[None], Effect[None]]:
+    kws = {
+        "debug_trigger": debug_trigger,
+        "priority_level": priority_level,
+        "debug_name": debug_name,
+    }
+    return signe_effect(fn, **kws, scope=_CLIENT_SCOPE_MANAGER.get_scope())
+
+
 @overload
 def ref_computed(
     fn: Callable[[], T],
@@ -122,6 +164,7 @@ def ref_computed(
     desc="",
     debug_trigger: Optional[Callable[..., None]] = None,
     priority_level: int = 1,
+    debug_name: Optional[str] = None,
 ) -> ReadonlyRef[T]:
     ...
 
@@ -133,6 +176,7 @@ def ref_computed(
     desc="",
     debug_trigger: Optional[Callable[..., None]] = None,
     priority_level: int = 1,
+    debug_name: Optional[str] = None,
 ) -> Callable[[Callable[..., T]], ReadonlyRef[T]]:
     ...
 
@@ -143,14 +187,16 @@ def ref_computed(
     desc="",
     debug_trigger: Optional[Callable[..., None]] = None,
     priority_level: int = 1,
+    debug_name: Optional[str] = None,
 ) -> Union[ReadonlyRef[T], Callable[[Callable[..., T]], ReadonlyRef[T]]]:
     kws = {
         "debug_trigger": debug_trigger,
         "priority_level": priority_level,
+        "debug_name": debug_name,
     }
 
     if fn:
-        getter = computed(fn, **kws)
+        getter = computed(fn, **kws, scope=_CLIENT_SCOPE_MANAGER.get_scope())
         return cast(DescReadonlyRef[T], DescReadonlyRef(getter, desc))
     else:
 
@@ -192,20 +238,23 @@ class effect_refreshable:
             re_func.refresh()
 
         if len(self._refs) == 0:
-            runner = effect(runner)
+            runner = signe_effect(runner)
         else:
             runner = on(self._refs)(runner)
 
         return runner
 
 
-def on(refs: Union[ReadonlyRef, Sequence[ReadonlyRef]]):
+def on(
+    refs: Union[ReadonlyRef, Sequence[ReadonlyRef]],
+    effect_kws: Optional[Dict[str, Any]] = None,
+):
     if not isinstance(refs, Sequence):
         refs = [refs]
 
     getters = [getattr(r, "_ReadonlyRef___getter") for r in refs]
 
     def wrap(fn: Callable):
-        return signe_on(getters, fn)
+        return signe_on(getters, fn, effect_kws=effect_kws)
 
     return wrap

{ex4nicegui-0.2.18.dist-info → ex4nicegui-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ex4nicegui
-Version: 0.2.18
+Version: 0.3.1
 Summary: ...
 Home-page: 
 Author: carson_jia
@@ -13,7 +13,7 @@ Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
 License-File: LICENSE
-Requires-Dist: signe (>=0.1.8)
+Requires-Dist: signe (>=0.2.4)
 Requires-Dist: nicegui (>=1.3.13)
 Requires-Dist: typing-extensions
 

{ex4nicegui-0.2.18.dist-info → ex4nicegui-0.3.1.dist-info}/RECORD

@@ -1,4 +1,23 @@
-ex4nicegui/__init__.py,sha256=_MbAAhRG7NTi391YxBHeqLpmetZrRQLlqtgHG8Nqebs,397
+ex4nicegui/__init__.py,sha256=AHJ1FEv2tIq1TO8OrKZezKp-Ce9ykXJxqrJRiqJfFy8,396
+ex4nicegui/bi/__init__.py,sha256=eu-2CuzzrcHCyKQOfoo87v6C9nSwFDdeLhjY0cRV13M,315
+ex4nicegui/bi/dataSource.py,sha256=SJyYySHZBjzQnPW8x3P3sSHaKlzB21spkbw9DM8Sfgs,6212
+ex4nicegui/bi/dataSourceFacade.py,sha256=RyglhsZVJT7qBTqER5kuQ7qKhMHrlo8oSybM6VtLR70,4786
+ex4nicegui/bi/index.py,sha256=Zuo8V_7IZnayo8vxEMFbx-BkZTkEca-QhHVrmVTHjuc,1883
+ex4nicegui/bi/protocols.py,sha256=RNEXeV30rFdM8RTxLzyPp37JcbZCqJuJoPZCyMczLOA,4736
+ex4nicegui/bi/types.py,sha256=jMaEnFZw94R8FoAaOAJGqbCa1FJm841PSbwsajZfaVQ,293
+ex4nicegui/bi/elements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ex4nicegui/bi/elements/containers.py,sha256=5a9ZkzyVNLnK7DftDYdbVRo0bQFvuMHRI9LBGR__YuI,358
+ex4nicegui/bi/elements/layouts.py,sha256=teb0Vp-fgsByBNPTiW73kXEu2JponRRj4QQanaalcA0,898
+ex4nicegui/bi/elements/models.py,sha256=l1sEeapYsub2Cgm8X6Mb3pBhim6JyV-N6MD53CuXnRQ,1436
+ex4nicegui/bi/elements/text.py,sha256=vZYD0vplZIq2Wjdhv0e2NGuSch4y0zrvflndQnCE9DQ,801
+ex4nicegui/bi/elements/ui_aggrid.py,sha256=lS01HhwdpDlt_4sI8WOiDS_FVPI5dDj8r8UuaVZR3sk,1390
+ex4nicegui/bi/elements/ui_date_picker.js,sha256=Tk6NACKVsCnqhWZtuNA6Xt2e-AWI54AnjfHPIldaM5A,852
+ex4nicegui/bi/elements/ui_date_picker.py,sha256=UfUioMmVQyZMzp_hZLQi96xbP0Hk1UGRRQUL1p8r8H0,2238
+ex4nicegui/bi/elements/ui_echarts.py,sha256=YvUmYD0LbdAOVvGS-KVzM6aGj7cQUkvyDXEsVqZfyyc,2358
+ex4nicegui/bi/elements/ui_radio.py,sha256=8qJoml1WgLETdc_SIIPsJ4Z5xNV340g-pIhSn7vga4I,1788
+ex4nicegui/bi/elements/ui_range.py,sha256=aYAl4Z78GbPSPHamjlO8mE96GCeF_IWrOm4Z2IxPPgM,3750
+ex4nicegui/bi/elements/ui_select.py,sha256=ZpFCGXag374Z78quGu7kqTRJO2CxViiUWsxy6DAPaq4,3171
+ex4nicegui/bi/elements/ui_slider.py,sha256=4nuyroQEq_FTUItyLV7h687OGNdSg78Iw-QRIq4edw8,1820
 ex4nicegui/experimental_/__init__.py,sha256=LSDd_U6eQ9g9St9kC4daau3MFGlVCRHGZJC4E0JRH34,36
 ex4nicegui/experimental_/gridLayout/__init__.py,sha256=48y_Pm0xxgC_PRnixQB5R_5rPL4FuyeoeOao_W7pm7A,49
 ex4nicegui/experimental_/gridLayout/index.py,sha256=zFXuvFroo5EC1CFjt-b4hMiEy67hGP5J1GYTKH6kpUU,4737
@@ -18,8 +37,8 @@ ex4nicegui/reactive/local_file_picker.py,sha256=DWNzm_IP02sY-nZWN6WEWJxlwpABW6tN
 ex4nicegui/reactive/q_pagination.py,sha256=ITXBrjLnI1a5bz3Rbn7j8lZs9UJaFuMHrM9_FW_V7NA,1217
 ex4nicegui/reactive/rxui.py,sha256=NZUgvItxqqgzHKrt4oGZnxxV9dlEudGiv4J3fhJdvdQ,24
 ex4nicegui/reactive/usePagination.py,sha256=IP1NeLxaH3413KTEjtbyuzq0FVdtnKQsTZqM-W7iEgY,2468
-ex4nicegui/reactive/EChartsComponent/ECharts.js,sha256=zpB_m1dxK236_qZAiM8jzMkNCVTEPgeSV6tFpdgLZoo,1581763
-ex4nicegui/reactive/EChartsComponent/ECharts.py,sha256=LhThgTo7TSjaXIaWcG6eJojuPWyhUkDkw3tJIuCkJTw,2968
+ex4nicegui/reactive/EChartsComponent/ECharts.js,sha256=qj3HUngg-pcTjNDCiz7jgz-O2Lx3aW0HhvrcsDEb0a0,1581667
+ex4nicegui/reactive/EChartsComponent/ECharts.py,sha256=J3Vl8h-u__z2iIVtHL-PYWmrqRAB9caMCI50h8nEdCo,3010
 ex4nicegui/reactive/EChartsComponent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ex4nicegui/reactive/UseDraggable/UseDraggable.js,sha256=D2_4c64qYwkqG_JzL1ZAwoNZDoz6qtHfPA_Z5RIvmIw,5235
 ex4nicegui/reactive/UseDraggable/UseDraggable.py,sha256=ii9KGchUWUb0L_PiMQ3qkBmk98IxTfUg9DU7rT9FqXY,3509
@@ -29,15 +48,15 @@ ex4nicegui/reactive/dropZone/dropZone.js,sha256=7rSpFJX-Fk_W_NGZhOTyuEw0bzR-YUc8
 ex4nicegui/reactive/dropZone/dropZone.py,sha256=hg9UKTayff8v8Ek-n38h_3wX1Qmiotvdyv1Hsqilh5Y,2590
 ex4nicegui/reactive/officials/__init__.py,sha256=8xPx079EFXpEWtEc1vCbgQJt1TRZuRf91YOaqhkyRIo,1527
 ex4nicegui/reactive/officials/aggrid.py,sha256=OArj_BTUrD4Y1hxURTJOLeao1lwZ31xc7Ezd_RpEdVY,2408
-ex4nicegui/reactive/officials/base.py,sha256=oaoZbvGePk66juwt4Es5ZKhEStK_Hx31OY_n_jLMOxk,4499
-ex4nicegui/reactive/officials/button.py,sha256=vbp_cCw8mOf9lWn-_YZJWvzuzY-zI0Gy1sGgg0qd9Pw,2250
+ex4nicegui/reactive/officials/base.py,sha256=OwJQ52nnVtCR47FZW45ZPZcamHkXtJY1QRiLrS18T6k,4786
+ex4nicegui/reactive/officials/button.py,sha256=mLbPGM7CkoryfPCtOLO1DsyuCU4UQDC9m0tgRy9H_Zc,2251
 ex4nicegui/reactive/officials/card.py,sha256=8-tBwm3xfVybolQ87i8lAYUpBV6FdaVdeSH6xu0736U,1275
 ex4nicegui/reactive/officials/checkbox.py,sha256=Dy4zCqR_uv--EWNEr3eOIpfvO7VE_v-gOdI1o60SRvw,1772
 ex4nicegui/reactive/officials/color_picker.py,sha256=s6zUBkCAqAnBnoLWS3bXFIqmCK5iLiQv8VdY_x33H7w,2744
 ex4nicegui/reactive/officials/column.py,sha256=3RLvVKNaDtOb8df4uS3xRfwJJPuH1ndXk_Y4Gry0Tjo,413
 ex4nicegui/reactive/officials/date.py,sha256=4muMUxoXwV_OYBoe-ucB5g20msT2zjbiyfGNZbKPdoU,2700
-ex4nicegui/reactive/officials/drawer.py,sha256=7XqP8UmkvgxglV1-vUwbo5Sx2Fz7CPr1UqBfriEagDE,2443
-ex4nicegui/reactive/officials/echarts.py,sha256=kVlKT1PPjD7BDvI8LmOfyhvhCt4KyHQEVYD9M0fQu2I,2159
+ex4nicegui/reactive/officials/drawer.py,sha256=8g88ppLIepYVG_0qUaZdsakvB3ag6IY_x4fAEgOiyGY,2409
+ex4nicegui/reactive/officials/echarts.py,sha256=HmQqzcvIFum6C80_b6IPmLLy-D16l_8y1IaHYFOsylk,2198
 ex4nicegui/reactive/officials/expansion.py,sha256=Z2aKsrtUpkO0Z4kO9kPwcu7piBcE_d62OAC2oVDFTGE,1528
 ex4nicegui/reactive/officials/grid.py,sha256=6brGijR9ZLqOhe5r2w4BF81R8I4kJPZxZVkbQjXwlOU,925
 ex4nicegui/reactive/officials/html.py,sha256=7CQWKu_t3MdDJX21fTC3xTMAOcg0gKZrKJsaSCpZ0e4,1687
@@ -61,10 +80,11 @@ ex4nicegui/reactive/useMouse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 ex4nicegui/tools/__init__.py,sha256=Ue6ATQC9BuQlJEcs2JnuFXZh4DYh9twKc4F7zpIPhjE,40
 ex4nicegui/tools/debug.py,sha256=HCKlVzhHx5av-983ADgwgMkScKwTreSluLA7uikGYa0,4887
 ex4nicegui/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ex4nicegui/utils/clientScope.py,sha256=plgHxcCY1y76bK31u5zfOTX8cnYC1Jlx-N3cAgCY2G4,1143
 ex4nicegui/utils/common.py,sha256=5fsaOkoj-Ild1LGsInZXra66gJLVoVcZGAIG6YOeM6E,430
-ex4nicegui/utils/signals.py,sha256=Dwvb0Anansa0N1ZH2Ko0yCX9o-QHKbXOYEtvdrtde9g,4807
-ex4nicegui-0.2.18.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
-ex4nicegui-0.2.18.dist-info/METADATA,sha256=wpiHNzH4hmeP__pwog5DyINiHtd99yQgHl48qj7DakI,515
-ex4nicegui-0.2.18.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ex4nicegui-0.2.18.dist-info/top_level.txt,sha256=VFwMiO9AFjj5rfLMJwN1ipLRASk9fJXB8tM6DNrpvPQ,11
-ex4nicegui-0.2.18.dist-info/RECORD,,
+ex4nicegui/utils/signals.py,sha256=CaQbiQtcOvLEnjImezzIJuOotCmPGr0VW0yXRIOP0XI,6121
+ex4nicegui-0.3.1.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
+ex4nicegui-0.3.1.dist-info/METADATA,sha256=1pqxdI5s9CbS4G5VZ3dz0Ym41KdAfXhRI1T7J9G1Oqg,514
+ex4nicegui-0.3.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ex4nicegui-0.3.1.dist-info/top_level.txt,sha256=VFwMiO9AFjj5rfLMJwN1ipLRASk9fJXB8tM6DNrpvPQ,11
+ex4nicegui-0.3.1.dist-info/RECORD,,