ex4nicegui 0.3.2__py3-none-any.whl → 0.4.0__py3-none-any.whl

ex4nicegui/__init__.py

@@ -16,4 +16,4 @@ from signe import batch
 from ex4nicegui.experimental_ import gridLayout as exp_ui
 
 
-__version__ = "0.3.2"
+__version__ = "0.4.0"

ex4nicegui/bi/dataSource.py

@@ -1,6 +1,6 @@
 from typing import Callable, Dict, List, Optional, Set, cast
 from ex4nicegui import to_ref, ref_computed, on
-from nicegui import globals as ng_globals, Client, ui
+from nicegui import context as ng_context, Client, ui
 
 from dataclasses import dataclass, field
 from . import types
@@ -123,7 +123,7 @@ class DataSource:
         return self.__id
 
     def get_component_info_key(self, element_id: types._TElementID):
-        client_id = ng_globals.get_client().id
+        client_id = ng_context.get_client().id
         return ComponentInfoKey(client_id, element_id)
 
     def get_filtered_data(self, element: ui.element):
@@ -148,7 +148,7 @@ class DataSource:
         element_id: types._TElementID,
         update_callback: Optional[_TComponentUpdateCallback] = None,
     ):
-        ng_client = ng_globals.get_client()
+        ng_client = ng_context.get_client()
         client_id = ng_client.id
 
         if not self._component_map.has_client_record(client_id):
@@ -164,7 +164,7 @@ class DataSource:
         return info
 
     def send_filter(self, element_id: types._TElementID, filter: Filter):
-        client_id = ng_globals.get_client().id
+        client_id = ng_context.get_client().id
         key = ComponentInfoKey(client_id, element_id)
 
         if not self._component_map.has_record(key):

ex4nicegui/bi/elements/ui_aggrid.py

@@ -1,12 +1,6 @@
 from __future__ import annotations
-from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, Union, cast
+from typing import TYPE_CHECKING, Callable, Union
 from nicegui import ui
-from nicegui.events import UiEventArguments
-from ex4nicegui.reactive import rxui
-from ex4nicegui.reactive.EChartsComponent.ECharts import (
-    EChartsClickEventArguments,
-    echarts,
-)
 from ex4nicegui.bi.dataSource import DataSource
 from .models import UiResult
 

ex4nicegui/bi/elements/ui_echarts.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, Union, cast
 from nicegui.events import UiEventArguments
 from ex4nicegui.reactive import rxui
 from ex4nicegui.reactive.EChartsComponent.ECharts import (
-    EChartsClickEventArguments,
+    EChartsMouseEventArguments,
     echarts,
 )
 from nicegui import ui
@@ -21,15 +21,11 @@ class EChartsResult(UiResult[echarts]):
         super().__init__(element, dataSource)
         self.chart_update = chart_update
 
-    def on_chart_click(
-        self, handler: Optional[Callable[[EChartsClickEventArguments], Any]]
-    ):
-        return self.element.on_chart_click(handler)
+    def on_chart_click(self, handler: Callable[[EChartsMouseEventArguments], Any]):
+        return self.element.echarts_on("click", handler)
 
-    def on_chart_click_blank(
-        self, handler: Optional[Callable[[UiEventArguments], Any]]
-    ):
-        return self.element.on_chart_click_blank(handler)
+    def on_chart_click_blank(self, handler: Callable[[UiEventArguments], Any]):
+        return self.element.on_click_blank(handler)
 
     def cancel_linkage(self, *source: Union[ui.element, "UiResult"]):
         super().cancel_linkage(*source)