ex4nicegui 0.1.7__tar.gz → 0.1.9__tar.gz

{ex4nicegui-0.1.7 → ex4nicegui-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ex4nicegui
-Version: 0.1.7
+Version: 0.1.9
 Summary: ...
 Home-page: 
 Author: carson_jia

{ex4nicegui-0.1.7 → ex4nicegui-0.1.9}/ex4nicegui/__init__.py

@@ -15,4 +15,4 @@ from ex4nicegui import tools
 from signe import batch
 
 
-__version__ = "0.1.7"
+__version__ = "0.1.9"

{ex4nicegui-0.1.7/ex4nicegui/reactive/echarts → ex4nicegui-0.1.9/ex4nicegui/reactive/ECharts}/ECharts.py

@@ -2,12 +2,9 @@ from typing import Any, Callable, Optional
 from dataclasses import dataclass
 from nicegui.helpers import KWONLY_SLOTS
 from nicegui.events import handle_event, EventArguments
-from nicegui.dependencies import register_component
 from nicegui.element import Element
 
 
-register_component("ECharts", __file__, "ECharts.js")
-
 _Chart_Click_Args = [
     "componentType",
     "seriesType",
@@ -36,9 +33,9 @@ class EChartsClickEventArguments(EventArguments):
     color: str
 
 
-class echarts(Element):
+class echarts(Element, component="ECharts.js"):
     def __init__(self, options: dict) -> None:
-        super().__init__("ECharts")
+        super().__init__()
         self._props["options"] = options
 
     def update_options(self, options: dict, opts: Optional[dict] = None):
@@ -65,9 +62,8 @@ class echarts(Element):
     def on_chart_click(
         self, handler: Optional[Callable[[EChartsClickEventArguments], Any]]
     ):
-        def inner_handler(args: dict):
-            args = args["args"]
-            print(args)
+        def inner_handler(e):
+            args = e.args
             handle_event(
                 handler,
                 EChartsClickEventArguments(

{ex4nicegui-0.1.7/ex4nicegui/reactive/draggable → ex4nicegui-0.1.9/ex4nicegui/reactive/UseDraggable}/UseDraggable.js

@@ -139,7 +139,7 @@ const pe = /* @__PURE__ */ H({
   setup(e, { emit: r }) {
     const t = e;
     return q(() => {
-      const o = document.getElementById(t.elementId), { x: a, y: c, style: g, isDragging: _ } = le(o, t.options);
+      const o = document.getElementById(`c${t.elementId}`), { x: a, y: c, style: g, isDragging: _ } = le(o, t.options);
       h([a, c, g], ([l, f, i]) => {
         r("update", { x: l, y: f, style: i });
       }), h(_, (l) => {

{ex4nicegui-0.1.7/ex4nicegui/reactive/draggable → ex4nicegui-0.1.9/ex4nicegui/reactive/UseDraggable}/UseDraggable.py

@@ -1,15 +1,11 @@
 from typing import Any, Callable, Optional
 from dataclasses import dataclass
-from nicegui import ui
 from nicegui.helpers import KWONLY_SLOTS
 from nicegui.events import handle_event, EventArguments
-from nicegui.dependencies import register_component
 from nicegui.element import Element
 from signe import createSignal, effect, batch
 from ex4nicegui.utils.signals import ref_from_signal
 
-register_component("UseDraggable", __file__, "UseDraggable.js")
-
 _Update_Args = [
     "x",
     "y",
@@ -33,9 +29,9 @@ def use_draggable(element: Element, init_x=0.0, init_y=0.0, auto_bind_style=True
     return ud
 
 
-class UseDraggable(Element):
+class UseDraggable(Element, component="UseDraggable.js"):
     def __init__(self, element: Element, init_x=0.0, init_y=0.0) -> None:
-        super().__init__("UseDraggable")
+        super().__init__()
         self._props["elementId"] = str(element.id)
         self._props["options"] = {"initialValue": {"x": init_x, "y": init_y}}
 
@@ -53,8 +49,8 @@ class UseDraggable(Element):
 
         self.on_update(update)
 
-        def on_isDraggingUpdate(args):
-            self.__isDragging_setter(args["args"]["isDragging"])
+        def on_isDraggingUpdate(e):
+            self.__isDragging_setter(e.args["isDragging"])
             # print(args['args']['isDragging'])
 
         self.on("isDraggingUpdate", on_isDraggingUpdate)
@@ -82,8 +78,8 @@ class UseDraggable(Element):
             element.update()
 
     def on_update(self, handler: Optional[Callable[..., Any]]):
-        def inner_handler(args: dict):
-            args = args["args"]
+        def inner_handler(e):
+            args = e.args
             handle_event(
                 handler,
                 UseDraggableUpdateEventArguments(

{ex4nicegui-0.1.7 → ex4nicegui-0.1.9}/ex4nicegui/reactive/__index.py

@@ -22,12 +22,15 @@ from .officials import (
     SliderBindableUi as slider,
     LazySliderBindableUi as lazy_slider,
     HtmlBindableUi as html,
+    ImageBindableUi as image,
+    UploadBindableUi as upload,
+    UploadResult,
 )
 from .q_pagination import QPagination as q_pagination
 from .local_file_picker import local_file_picker
 from ex4nicegui.utils.signals import ref_computed
 from signe import effect
-from .draggable.UseDraggable import use_draggable
+from .UseDraggable.UseDraggable import use_draggable
 from .useMouse.UseMouse import use_mouse
 from .drawer import drawer
 from .usePagination import PaginationRef as use_pagination

{ex4nicegui-0.1.7 → ex4nicegui-0.1.9}/ex4nicegui/reactive/drawer.py

@@ -49,8 +49,8 @@ def drawer(
         value = "true" if r.value else "false"
         ele.props(f":model-value={value}")
 
-    def on_update(args):
-        r.value = args["args"]
+    def on_update(e):
+        r.value = e.args
 
     ele.on("update:modelValue", on_update)
 

{ex4nicegui-0.1.7 → ex4nicegui-0.1.9}/ex4nicegui/reactive/local_file_picker.py

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Optional, cast,List
+from typing import Any, Callable, Optional, cast, List
 from typing_extensions import Literal
 from signe import createSignal, effect, computed
 from nicegui import ui, Tailwind
@@ -155,8 +155,8 @@ def local_file_picker(
             grid.style("width:50vw")
             # grid.tailwind("w-96")
 
-            def dblClicked(msg):
-                path = cur_dir() / Path(msg["args"]["data"]["名称"])
+            def dblClicked(e):
+                path = cur_dir() / Path(e.args["data"]["名称"])
 
                 if path.is_dir():
                     set_cur_dir(path)
@@ -166,8 +166,8 @@ def local_file_picker(
                     set_result(str(path.absolute()))
                     dia.close()
 
-            def clicked(msg):
-                path = cur_dir() / Path(msg["args"]["data"]["名称"])
+            def clicked(e):
+                path = cur_dir() / Path(e.args["data"]["名称"])
 
                 if mode == "file" and path.is_dir():
                     return

{ex4nicegui-0.1.7 → ex4nicegui-0.1.9}/ex4nicegui/reactive/officials.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 import asyncio
+from pathlib import Path
 
 from typing import (
     Any,
@@ -11,9 +12,8 @@ from typing import (
     cast,
     Dict,
     Union,
-    overload,
 )
-from typing_extensions import Literal, Self
+from typing_extensions import Literal
 from signe import effect
 from ex4nicegui.utils.signals import (
     ReadonlyRef,
@@ -26,6 +26,7 @@ from ex4nicegui.utils.signals import (
 )
 import ex4nicegui.utils.common as utils_common
 from nicegui import ui
+from nicegui import events as ng_events
 from nicegui.elements.mixins.text_element import TextElement
 from nicegui.elements.mixins.value_element import ValueElement
 from nicegui.elements.mixins.color_elements import (
@@ -34,7 +35,7 @@ from nicegui.elements.mixins.color_elements import (
     TAILWIND_COLORS,
 )
 from nicegui.page_layout import Drawer
-from ex4nicegui.reactive.echarts.ECharts import echarts
+from ex4nicegui.reactive.ECharts.ECharts import echarts
 
 T = TypeVar("T")
 
@@ -172,8 +173,8 @@ def _convert_kws_ref2value(kws: Dict):
 class SelectBindableUi(SingleValueBindableUi[T, ui.select]):
     @staticmethod
     def _setup_(binder: "SelectBindableUi"):
-        def onValueChanged(args):
-            binder._ref.value = args["args"]["label"]  # type: ignore
+        def onValueChanged(e):
+            binder._ref.value = e.args["label"]  # type: ignore
 
         @effect
         def _():
@@ -243,8 +244,8 @@ class SelectBindableUi(SingleValueBindableUi[T, ui.select]):
 class RadioBindableUi(SingleValueBindableUi[bool, ui.radio]):
     @staticmethod
     def _setup_(binder: "RadioBindableUi"):
-        def onValueChanged(args):
-            binder._ref.value = binder.element.options[args["args"]]  # type: ignore
+        def onValueChanged(e):
+            binder._ref.value = binder.element.options[e.args]  # type: ignore
 
         @effect
         def _():
@@ -301,8 +302,8 @@ class RadioBindableUi(SingleValueBindableUi[bool, ui.radio]):
 class SwitchBindableUi(SingleValueBindableUi[bool, ui.switch]):
     @staticmethod
     def _setup_(binder: "SwitchBindableUi"):
-        def onValueChanged(args):
-            binder._ref.value = args["args"]  # type: ignore
+        def onValueChanged(e):
+            binder._ref.value = e.args  # type: ignore
 
         ele = cast(ValueElement, binder.element)
 
@@ -350,8 +351,8 @@ class SwitchBindableUi(SingleValueBindableUi[bool, ui.switch]):
 class CheckboxBindableUi(SingleValueBindableUi[bool, ui.checkbox]):
     @staticmethod
     def _setup_(binder: "CheckboxBindableUi"):
-        def onValueChanged(args):
-            binder._ref.value = args["args"]  # type: ignore
+        def onValueChanged(e):
+            binder._ref.value = e.args  # type: ignore
 
         ele = cast(ValueElement, binder.element)
 
@@ -439,8 +440,8 @@ class InputBindableUi(SingleValueBindableUi[str, ui.input]):
         def _():
             ele.value = self.value
 
-        def onModelValueChanged(args):
-            self._ref.value = args["args"] or ""  # type: ignore
+        def onModelValueChanged(e):
+            self._ref.value = e.args or ""  # type: ignore
 
         ele.on("update:modelValue", handler=onModelValueChanged)
 
@@ -496,7 +497,7 @@ class LazyInputBindableUi(InputBindableUi):
         ele.on("keyup.enter", onValueChanged)
 
 
-_TSliderValue = TypeVar("_TSliderValue", float, int)
+_TSliderValue = TypeVar("_TSliderValue", float, int, None)
 
 
 class SliderBindableUi(SingleValueBindableUi[Optional[_TSliderValue], ui.slider]):
@@ -535,8 +536,8 @@ class SliderBindableUi(SingleValueBindableUi[Optional[_TSliderValue], ui.slider]
         def _():
             ele.value = self.value
 
-        def onModelValueChanged(args):
-            self._ref.value = args["args"]  # type: ignore
+        def onModelValueChanged(e):
+            self._ref.value = e.args  # type: ignore
 
         ele.on("update:modelValue", handler=onModelValueChanged)
 
@@ -557,10 +558,10 @@ class SliderBindableUi(SingleValueBindableUi[Optional[_TSliderValue], ui.slider]
 class LazySliderBindableUi(SliderBindableUi):
     def __init__(
         self,
-        min: TMaybeRef[float],
-        max: TMaybeRef[float],
-        step: TMaybeRef[float] = 1,
-        value: TMaybeRef[float | None] = None,
+        min: TMaybeRef[_TSliderValue],
+        max: TMaybeRef[_TSliderValue],
+        step: TMaybeRef[_TSliderValue] = 1,
+        value: TMaybeRef[_TSliderValue | None] = None,
         on_change: Callable[..., Any] | None = None,
     ) -> None:
         super().__init__(min, max, step, value, on_change)
@@ -575,7 +576,7 @@ class LazySliderBindableUi(SliderBindableUi):
         def onValueChanged():
             self._ref.value = ele.value
 
-        ele.on("change ", onValueChanged)
+        ele.on("change", onValueChanged)
 
 
 class TextareaBindableUi(SingleValueBindableUi[str, ui.textarea]):
@@ -615,8 +616,8 @@ class TextareaBindableUi(SingleValueBindableUi[str, ui.textarea]):
         def _():
             ele.value = self.value
 
-        def onModelValueChanged(args):
-            self._ref.value = args["args"]  # type: ignore
+        def onModelValueChanged(e):
+            self._ref.value = e.args  # type: ignore
 
         ele.on("update:modelValue", handler=onModelValueChanged)
 
@@ -669,8 +670,8 @@ class LazyTextareaBindableUi(TextareaBindableUi):
 class LabelBindableUi(SingleValueBindableUi[str, ui.label]):
     @staticmethod
     def _setup_(binder: "LabelBindableUi"):
-        def onValueChanged(args):
-            binder._ref.value = args["args"]["label"]  # type: ignore
+        def onValueChanged(e):
+            binder._ref.value = e.args["label"]  # type: ignore
 
         @effect
         def _():
@@ -865,8 +866,8 @@ class ColorPickerBindableUi(SingleValueBindableUi[str, ui.color_picker]):
         def _():
             ele._props["modelValue"] = self.value
 
-        def onModelValueChanged(args):
-            self._ref.value = args["args"]  # type: ignore
+        def onModelValueChanged(e):
+            self._ref.value = e.args  # type: ignore
 
         ele.on("update:modelValue", handler=onModelValueChanged)
 
@@ -908,8 +909,8 @@ class ColorPickerLazyBindableUi(ColorPickerBindableUi):
         # def _():
         #     ele._props["modelValue"] = self.value
 
-        def onModelValueChanged(args):
-            self._ref.value = args["args"]  # type: ignore
+        def onModelValueChanged(e):
+            self._ref.value = e.args  # type: ignore
 
         ele.on("change", handler=onModelValueChanged)
 
@@ -1301,3 +1302,109 @@ class HtmlBindableUi(SingleValueBindableUi[str, ui.html]):
             color = ref_ui.value
             ele._style["color"] = color
             ele.update()
+
+
+class ImageBindableUi(SingleValueBindableUi[Union[str, Path], ui.image]):
+    @staticmethod
+    def _setup_(binder: "ImageBindableUi"):
+        @effect
+        def _():
+            binder.element.on_source_change(binder.value)
+
+    def __init__(
+        self,
+        source: Union[TMaybeRef[str], TMaybeRef[Path]] = "",
+    ) -> None:
+        kws = {
+            "source": source,
+        }
+
+        value_kws = _convert_kws_ref2value(kws)
+
+        element = ui.image(**value_kws)
+
+        super().__init__(source, element)  # type: ignore
+
+        for key, value in kws.items():
+            if is_ref(value):
+                self.bind_prop(key, value)  # type: ignore
+
+        # ImageBindableUi._setup_(self)
+
+    def bind_prop(self, prop: str, ref_ui: ReadonlyRef):
+        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]]):
+        @effect
+        def _():
+            ele = self.element
+            source = ref_ui.value
+            ele.on_source_change(source)
+
+
+class UploadResult:
+    def __init__(self, content: bytes = bytes(), name="", type=""):
+        self.content = content
+        self.name = name
+        self.type = type
+
+    def get_bytes(self):
+        return self.content
+
+    @property
+    def ready(self):
+        return len(self.content) > 0
+
+
+class UploadBindableUi(SingleValueBindableUi[UploadResult, ui.upload]):
+    @staticmethod
+    def _setup_(binder: "UploadBindableUi"):
+        def on_upload(e: ng_events.UploadEventArguments):
+            binder._ref.value = UploadResult(e.content.read(), e.name, e.type)
+
+        binder._on_upload_callbacks.append(on_upload)
+
+    def __init__(
+        self,
+        multiple: TMaybeRef[bool] = False,
+        max_file_size: Optional[TMaybeRef[int]] = None,
+        max_total_size: Optional[TMaybeRef[int]] = None,
+        max_files: Optional[TMaybeRef[int]] = None,
+        on_upload: Optional[Callable[..., Any]] = None,
+        on_rejected: Optional[Callable[..., Any]] = None,
+        label: TMaybeRef[str] = "",
+        auto_upload: TMaybeRef[bool] = False,
+    ) -> None:
+        kws = {
+            "multiple": multiple,
+            "max_file_size": max_file_size,
+            "max_total_size": max_total_size,
+            "max_files": max_files,
+            "on_rejected": on_rejected,
+            "label": label,
+            "auto_upload": auto_upload,
+        }
+
+        value_kws = _convert_kws_ref2value(kws)
+
+        self._on_upload_callbacks = []
+
+        def _on_upload(e: ng_events.UploadEventArguments):
+            for fn in self._on_upload_callbacks:
+                fn(e)
+
+        if on_upload:
+            self._on_upload_callbacks.append(on_upload)
+
+        element = ui.upload(**value_kws, on_upload=_on_upload)
+
+        super().__init__(UploadResult(), element)  # type: ignore
+
+        for key, value in kws.items():
+            if is_ref(value):
+                self.bind_prop(key, value)  # type: ignore
+
+        UploadBindableUi._setup_(self)

{ex4nicegui-0.1.7 → ex4nicegui-0.1.9}/ex4nicegui/reactive/q_pagination.py

@@ -27,8 +27,8 @@ class QPagination(Element):
         self.__min = min
         self.__max = max
 
-        def onchange(arg):
-            arg_value = cast(int, arg["args"])
+        def onchange(e):
+            arg_value = cast(int, e.args)
 
             self._props["model-value"] = arg_value
             if isinstance(self.__value, Ref):

{ex4nicegui-0.1.7 → ex4nicegui-0.1.9}/ex4nicegui/reactive/useMouse/UseMouse.py

@@ -1,13 +1,16 @@
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Optional, cast
 from dataclasses import dataclass
 from nicegui.helpers import KWONLY_SLOTS
 from nicegui.events import handle_event, EventArguments
-from nicegui.dependencies import register_component
 from nicegui.element import Element
 from signe import createSignal, effect, batch
+from ex4nicegui.utils.signals import ref_from_signal
 
+# from nicegui.dependencies import register_library
+# from pathlib import Path
 
-register_component("UseMouse", __file__, "UseMouse.js")
+
+# register_library(Path(__file__).parent / "index-6543384e.js")
 
 _Update_Args = [
     "x",
@@ -23,16 +26,21 @@ class UseMouseUpdateEventArguments(EventArguments):
     sourceType: str
 
 
-class UseMouse(Element):
+class UseMouse(Element, component="UseMouse.js"):
     def __init__(self, options: Optional[dict] = None) -> None:
-        super().__init__("UseMouse")
+        super().__init__()
 
         if options:
             self._props["options"] = options
 
         self.__x_getter, self.__x_setter = createSignal(0.0)
+        self.__x_readonly_ref = ref_from_signal(self.__x_getter)
+
         self.__y_getter, self.__y_setter = createSignal(0.0)
+        self.__y_readonly_ref = ref_from_signal(self.__y_getter)
+
         self.__sourceType_getter, self.__sourceType_setter = createSignal("sourceType")
+        self.__sourceType_readonly_ref = ref_from_signal(self.__sourceType_getter)
 
         def update(args: UseMouseUpdateEventArguments):
             @batch
@@ -45,19 +53,19 @@ class UseMouse(Element):
 
     @property
     def x(self):
-        return self.__x_getter()
+        return self.__x_readonly_ref
 
     @property
     def y(self):
-        return self.__y_getter()
+        return self.__y_readonly_ref
 
     @property
     def sourceType(self):
-        return self.__sourceType_getter()
+        return self.__sourceType_readonly_ref
 
     def on_update(self, handler: Optional[Callable[..., Any]]):
-        def inner_handler(args: dict):
-            args = args["args"]
+        def inner_handler(e):
+            args = e.args
             handle_event(
                 handler,
                 UseMouseUpdateEventArguments(
@@ -72,12 +80,12 @@ class UseMouse(Element):
         self.on("update", inner_handler, args=_Update_Args)
 
 
-_Use_Mouse_Ins = UseMouse()
+_Use_Mouse_Ins = None
 
 
 def use_mouse(options: Optional[dict] = None):
     global _Use_Mouse_Ins
-    # if _Use_Mouse_Ins is None:
-    #     _Use_Mouse_Ins = UseMouse(options)
+    if _Use_Mouse_Ins is None:
+        _Use_Mouse_Ins = UseMouse(options)
 
-    return _Use_Mouse_Ins
+    return cast(UseMouse, _Use_Mouse_Ins)

{ex4nicegui-0.1.7 → ex4nicegui-0.1.9}/ex4nicegui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ex4nicegui
-Version: 0.1.7
+Version: 0.1.9
 Summary: ...
 Home-page: 
 Author: carson_jia

{ex4nicegui-0.1.7 → ex4nicegui-0.1.9}/ex4nicegui.egg-info/SOURCES.txt

@@ -18,12 +18,12 @@ ex4nicegui/reactive/officials.py
 ex4nicegui/reactive/q_pagination.py
 ex4nicegui/reactive/rxui.py
 ex4nicegui/reactive/usePagination.py
-ex4nicegui/reactive/draggable/UseDraggable.js
-ex4nicegui/reactive/draggable/UseDraggable.py
-ex4nicegui/reactive/draggable/__init__.py
-ex4nicegui/reactive/echarts/ECharts.js
-ex4nicegui/reactive/echarts/ECharts.py
-ex4nicegui/reactive/echarts/__init__.py
+ex4nicegui/reactive/ECharts/ECharts.js
+ex4nicegui/reactive/ECharts/ECharts.py
+ex4nicegui/reactive/ECharts/__init__.py
+ex4nicegui/reactive/UseDraggable/UseDraggable.js
+ex4nicegui/reactive/UseDraggable/UseDraggable.py
+ex4nicegui/reactive/UseDraggable/__init__.py
 ex4nicegui/reactive/useMouse/UseMouse.js
 ex4nicegui/reactive/useMouse/UseMouse.py
 ex4nicegui/reactive/useMouse/__init__.py

{ex4nicegui-0.1.7 → ex4nicegui-0.1.9}/ex4nicegui.egg-info/requires.txt

@@ -1,3 +1,3 @@
 signe>=0.1.8
-nicegui>=1.2.24
+nicegui>=1.3.3
 typing_extensions

{ex4nicegui-0.1.7 → ex4nicegui-0.1.9}/setup.py

@@ -21,7 +21,7 @@ def get_data_files(base):
 with open("README.md", encoding="utf8") as readme_file:
     readme = readme_file.read()
 
-requirements = ["signe>=0.1.8", "nicegui>=1.2.24", "typing_extensions"]
+requirements = ["signe>=0.1.8", "nicegui>=1.3.3", "typing_extensions"]
 
 test_requirements = ["pytest>=3"]
 
@@ -37,11 +37,7 @@ setup(
         "Programming Language :: Python :: 3.8",
     ],
     description="...",
-    entry_points={
-        # 'console_scripts': [
-        #     'test_prj=test_prj.cli:main',
-        # ],
-    },
+    entry_points={},
     install_requires=requirements,
     license="MIT license",
     # long_description=readme,
@@ -50,26 +46,6 @@ setup(
     name="ex4nicegui",
     packages=find_packages(include=["ex4nicegui", "ex4nicegui.*"]),
     data_files=get_data_files("ex4nicegui/reactive"),
-    # data_files=[
-    #     (
-    #         "echarts",
-    #         [
-    #             "ex4nicegui/reactive/echarts/ECharts.js",
-    #         ],
-    #     ),
-    #     (
-    #         "draggable",
-    #         [
-    #             "ex4nicegui/reactive/draggable/UseDraggable.js",
-    #         ],
-    #     ),
-    #     (
-    #         "useMouse",
-    #         [
-    #             "ex4nicegui/reactive/useMouse/UseMouse.js",
-    #         ],
-    #     ),
-    # ],
     test_suite="__tests",
     tests_require=test_requirements,
     url="",