ex4nicegui 0.6.7__py3-none-any.whl → 0.6.9__py3-none-any.whl

ex4nicegui/reactive/officials/table.py

@@ -6,18 +6,19 @@ from typing import (
     Dict,
 )
 from typing_extensions import Literal
-from ex4nicegui.reactive.utils import ParameterClassifier, dataframe2col_str
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
+from ex4nicegui.reactive.services.pandas_service import dataframe2col_str
+
 import ex4nicegui.utils.common as utils_common
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
-    ReadonlyRef,
+    TReadonlyRef,
     is_ref,
     ref_computed,
     to_ref,
     _TMaybeRef as TMaybeRef,
     to_value,
     to_raw,
-    on,
     RefWrapper,
 )
 from nicegui import ui
@@ -67,7 +68,7 @@ class TableBindableUi(BindableUi[ui.table]):
 
         self._arg_selection = selection
         self._arg_row_key = row_key
-        self._selection_ref: ReadonlyRef[List[Any]] = to_ref([])  # type: ignore
+        self._selection_ref: TReadonlyRef[List[Any]] = to_ref([])  # type: ignore
 
         def on_selection(_):
             self._selection_ref.value = self.element.selected  # type: ignore
@@ -182,7 +183,7 @@ class TableBindableUi(BindableUi[ui.table]):
         return self
 
     def bind_rows(self, ref_ui: TGetterOrReadonlyRef[List[Dict]]):
-        @on(ref_ui, deep=True)
+        @self._ui_signal_on(ref_ui, deep=True)
         def _():
             ele = self.element
             ele._props["rows"] = list(to_raw(to_value(ref_ui)))
@@ -191,7 +192,7 @@ class TableBindableUi(BindableUi[ui.table]):
         return self
 
     def bind_columns(self, ref_ui: TGetterOrReadonlyRef[List[Dict]]):
-        @on(ref_ui, deep=True)
+        @self._ui_signal_on(ref_ui, deep=True)
         def _():
             ele = self.element
             ele._props["columns"] = list(to_raw(to_value(ref_ui)))

ex4nicegui/reactive/officials/tabs.py

@@ -1,5 +1,5 @@
 from typing import Any, Callable, Optional
-from ex4nicegui.reactive.utils import ParameterClassifier
+from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     TGetterOrReadonlyRef,
     to_value,

ex4nicegui/reactive/officials/textarea.py

@@ -5,13 +5,11 @@ from typing import (
     Dict,
     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 (
     TGetterOrReadonlyRef,
     Ref,
     _TMaybeRef as TMaybeRef,
-    effect,
     is_setter_ref,
     to_value,
 )
@@ -61,7 +59,7 @@ class TextareaBindableUi(BindableUi[ui.textarea]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_value(self, ref_ui: TGetterOrReadonlyRef[str]):
-        @ui_effect
+        @self._ui_effect
         def _():
             self.element.set_value(to_value(ref_ui))
 
@@ -95,7 +93,7 @@ class LazyTextareaBindableUi(TextareaBindableUi):
             ref = cast(Ref, org_value)
             ele = self.element
 
-            @effect
+            @self._ui_effect
             def _():
                 ele.value = ref.value
 

ex4nicegui/reactive/officials/upload.py

@@ -11,7 +11,7 @@ from ex4nicegui.utils.signals import (
 from nicegui import ui
 from nicegui.events import handle_event
 from .base import BindableUi
-from .utils import _convert_kws_ref2value
+from ex4nicegui.reactive.systems.reactive_system import convert_kws_ref2value
 
 
 class UploadResult:
@@ -57,7 +57,7 @@ class UploadBindableUi(BindableUi[ui.upload]):
             "auto_upload": auto_upload,
         }
 
-        value_kws = _convert_kws_ref2value(kws)
+        value_kws = convert_kws_ref2value(kws)
 
         self._on_upload_callbacks = []
 

ex4nicegui/reactive/q_pagination.py

@@ -1,9 +1,9 @@
 from typing import Any, Optional, Callable
-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,
+    TMaybeRef,
 )
 from nicegui import ui
 from ex4nicegui.reactive.officials.base import BindableUi

ex4nicegui/reactive/scopedStyle.js

@@ -0,0 +1,55 @@
+
+const REGEX_NEWLINE = /[\r\n]/g;
+const REGEX_START_SPACES = /^\s+/gm;
+
+function getClasses(id) {
+    return `ex4ng-scoped-style-${id}`;
+}
+
+function removeInvalidChars(str) {
+    str = str.replace(REGEX_START_SPACES, '');
+    return str.replace(REGEX_NEWLINE, '');
+}
+
+function appendCSS(styleElement, cssText) {
+    // 获取已有的 CSS 内容
+    let existingCSS = styleElement.textContent || '';
+
+    // 如果已有的 CSS 内容不为空，添加一个空行作为分隔符
+    if (existingCSS.trim() !== '') {
+        existingCSS += '\n';
+    }
+
+    // 拼接新的 CSS 内容
+    existingCSS += cssText;
+
+    // 将新的 CSS 内容设置回 style 标签
+    styleElement.textContent = existingCSS;
+}
+
+export default {
+    template: `<template></template>`,
+    methods: {
+        createStyle(id, css) {
+            css = removeInvalidChars(css);
+
+            const classes = getClasses(id);
+            const target = document.querySelector(`style.${classes}`);
+            if (target) {
+                appendCSS(target, css);
+            } else {
+                const style = document.createElement('style');
+                style.classList.add(classes);
+                style.innerHTML = css;
+                document.head.appendChild(style);
+            }
+        },
+        removeStyle(id) {
+            const classes = getClasses(id);
+            const target = document.querySelector(`style.${classes}`);
+            if (target) {
+                target.remove();
+            }
+        },
+    },
+};

ex4nicegui/reactive/scopedStyle.py

@@ -0,0 +1,25 @@
+from nicegui.element import Element
+from ex4nicegui.helper import client_instance_locker
+from nicegui import ui
+
+
+class ScopedStyle(Element, component="scopedStyle.js"):
+    pass
+
+    @staticmethod
+    def get():
+        if not ui.context.slot_stack:
+            return None
+        return _scoped_style_factory.get_object(ui.context.client)
+
+    def create_style(self, element: Element, css: str):
+        element_id = f"c{element.id}"
+
+        self.run_method("createStyle", element_id, css)
+
+    def remove_style(self, element: Element):
+        element_id = f"c{element.id}"
+        self.run_method("removeStyle", element_id)
+
+
+_scoped_style_factory = client_instance_locker.ClientInstanceLocker(ScopedStyle)

ex4nicegui/reactive/services/pandas_service.py

@@ -0,0 +1,31 @@
+try:
+    import pandas as pd
+except ImportError:
+    pass
+
+
+def dataframe2col_str(df, copy=True):
+    if isinstance(df.columns, pd.MultiIndex):
+        raise ValueError(
+            "MultiIndex columns are not supported. "
+            "You can convert them to strings using something like "
+            '`df.columns = ["_".join(col) for col in df.columns.values]`.'
+        )
+
+    date_cols = df.columns[df.dtypes == "datetime64[ns]"]
+    time_cols = df.columns[df.dtypes == "timedelta64[ns]"]
+    complex_cols = df.columns[df.dtypes == "complex128"]
+    period_cols = df.columns[df.dtypes == "period[M]"]
+    if (
+        len(date_cols) != 0
+        or len(time_cols) != 0
+        or len(complex_cols) != 0
+        or len(period_cols) != 0
+    ):
+        df = df.copy() if copy else df
+        df[date_cols] = df[date_cols].astype(str)
+        df[time_cols] = df[time_cols].astype(str)
+        df[complex_cols] = df[complex_cols].astype(str)
+        df[period_cols] = df[period_cols].astype(str)
+
+    return df

ex4nicegui/reactive/{utils.py → services/reactive_service.py}

@@ -5,36 +5,16 @@ from typing import (
     Iterable,
     List,
     Optional,
-    Protocol,
     Tuple,
     cast,
-    runtime_checkable,
-    Union,
 )
-
-from ex4nicegui.utils.signals import is_ref, to_value, is_setter_ref
+from nicegui import ui
+from ex4nicegui.utils.signals import is_ref, is_setter_ref
 from nicegui.events import handle_event
-
-try:
-    import pandas as pd
-except ImportError:
-    pass
-
-
-@runtime_checkable
-class GetItemProtocol(Protocol):
-    def __getitem__(self, key):
-        ...
-
-
-@runtime_checkable
-class SetItemProtocol(Protocol):
-    def __setitem__(self, key, value):
-        ...
-
-
-def _convert_kws_ref2value(kws: Dict) -> Dict:
-    return {key: to_value(value) for key, value in kws.items()}
+from ex4nicegui.reactive.systems.reactive_system import (
+    convert_kws_ref2value,
+    inject_method,
+)
 
 
 class ParameterClassifier:
@@ -75,7 +55,7 @@ class ParameterClassifier:
             )
 
     def get_values_kws(self) -> Dict:
-        value_kws = _convert_kws_ref2value(
+        value_kws = convert_kws_ref2value(
             {k: v for k, v in self._args.items() if k not in self.events}
         )
 
@@ -105,43 +85,5 @@ class ParameterClassifier:
         }
 
 
-def get_attribute(obj: Union[object, GetItemProtocol], name: Union[str, int]) -> Any:
-    if isinstance(obj, (GetItemProtocol)):
-        return obj[name]
-    return getattr(obj, name)  # type: ignore
-
-
-def set_attribute(
-    obj: Union[object, SetItemProtocol], name: Union[str, int], value: Any
-) -> None:
-    if isinstance(obj, SetItemProtocol):
-        obj[name] = value
-    else:
-        setattr(obj, name, value)  # type: ignore
-
-
-def dataframe2col_str(df, copy=True):
-    if isinstance(df.columns, pd.MultiIndex):
-        raise ValueError(
-            "MultiIndex columns are not supported. "
-            "You can convert them to strings using something like "
-            '`df.columns = ["_".join(col) for col in df.columns.values]`.'
-        )
-
-    date_cols = df.columns[df.dtypes == "datetime64[ns]"]
-    time_cols = df.columns[df.dtypes == "timedelta64[ns]"]
-    complex_cols = df.columns[df.dtypes == "complex128"]
-    period_cols = df.columns[df.dtypes == "period[M]"]
-    if (
-        len(date_cols) != 0
-        or len(time_cols) != 0
-        or len(complex_cols) != 0
-        or len(period_cols) != 0
-    ):
-        df = df.copy() if copy else df
-        df[date_cols] = df[date_cols].astype(str)
-        df[time_cols] = df[time_cols].astype(str)
-        df[complex_cols] = df[complex_cols].astype(str)
-        df[period_cols] = df[period_cols].astype(str)
-
-    return df
+def inject_handle_delete(element: ui.element, on_delete: Callable[[], None]):
+    inject_method(element, "_handle_delete", on_delete)

ex4nicegui/reactive/systems/color_system.py

@@ -0,0 +1,157 @@
+from __future__ import annotations
+
+from typing import Literal
+
+from nicegui import ui
+from nicegui.elements.mixins.color_elements import (
+    QUASAR_COLORS,
+    TAILWIND_COLORS,
+)
+
+from functools import lru_cache
+
+
+_color_system_type = Literal["QUASAR", "TAILWIND", "STYLE"]
+
+
+def get_text_color_info(name: str):
+    system_type: _color_system_type = "STYLE"
+
+    if name in QUASAR_COLORS:
+        system_type = "QUASAR"
+    elif name in TAILWIND_COLORS:
+        system_type = "TAILWIND"
+        name = f"text-{name}"
+    else:
+        pass
+
+    return system_type, name
+
+
+def get_bg_color_info(color: str):
+    system_type: _color_system_type = "STYLE"
+
+    if color in QUASAR_COLORS:
+        system_type = "QUASAR"
+    elif color in TAILWIND_COLORS:
+        system_type = "TAILWIND"
+        color = f"bg-{color}"
+    else:
+        pass
+
+    return system_type, color
+
+
+def _remove_text_color_from_quasar(element: ui.element, color: str):
+    color_prop = getattr(element, "TEXT_COLOR_PROP", None)
+    if color_prop:
+        element._props.pop(color_prop, None)
+
+
+def _remove_text_color_from_tailwind(element: ui.element, color: str):
+    color = f"text-{color}"
+    element._classes.remove(color)
+
+
+def _remove_text_color(element: ui.element, color: str):
+    element._style.pop("color", None)
+
+
+def _add_text_color_from_quasar(element: ui.element, color: str):
+    color_prop = getattr(element, "TEXT_COLOR_PROP", None)
+    if color_prop:
+        element._props[color_prop] = color
+
+
+def _add_text_color_from_tailwind(element: ui.element, color: str):
+    color = f"text-{color}"
+    element.classes(color)
+
+
+def _add_text_color(element: ui.element, color: str):
+    element._style["color"] = f"{color} !important"
+
+
+@lru_cache(maxsize=10)
+def _query_text_color(color: str, add_handler=True):
+    if color in QUASAR_COLORS:
+        return (
+            _add_text_color_from_quasar
+            if add_handler
+            else _remove_text_color_from_quasar
+        )
+    elif color in TAILWIND_COLORS:
+        return (
+            _add_text_color_from_tailwind
+            if add_handler
+            else _remove_text_color_from_tailwind
+        )
+    elif color is not None:
+        return _add_text_color if add_handler else _remove_text_color
+
+
+def remove_text_color(element: ui.element, color: str):
+    handler = _query_text_color(color, add_handler=False)
+    if handler:
+        handler(element, color)
+
+
+def add_text_color(element: ui.element, color: str):
+    handler = _query_text_color(color)
+    if handler:
+        handler(element, color)
+
+
+# background color handlers
+
+
+def _remove_bg_from_quasar(element: ui.element, color: str):
+    color_prop = getattr(element, "BACKGROUND_COLOR_PROP", None)
+    if color_prop:
+        element._props.pop(color_prop, None)
+
+
+def _remove_bg_from_tailwind(element: ui.element, color: str):
+    color = f"bg-{color}"
+    element._classes.remove(color)
+
+
+def _remove_background_color(element: ui.element, color: str):
+    element._style.pop("background-color", None)
+
+
+def _add_bg_from_quasar(element: ui.element, color: str):
+    color_prop = getattr(element, "BACKGROUND_COLOR_PROP", None)
+    if color_prop:
+        element._props[color_prop] = color
+
+
+def _add_bg_from_tailwind(element: ui.element, color: str):
+    color = f"bg-{color}"
+    element.classes(color)
+
+
+def _add_background_color(element: ui.element, color: str):
+    element._style["background-color"] = f"{color} !important"
+
+
+@lru_cache(maxsize=10)
+def _query_background_color(color: str, add_handler=True):
+    if color in QUASAR_COLORS:
+        return _add_bg_from_quasar if add_handler else _remove_bg_from_quasar
+    elif color in TAILWIND_COLORS:
+        return _add_bg_from_tailwind if add_handler else _remove_bg_from_tailwind
+    elif color is not None:
+        return _add_background_color if add_handler else _remove_background_color
+
+
+def remove_background_color(element: ui.element, color: str):
+    handler = _query_background_color(color, add_handler=False)
+    if handler:
+        handler(element, color)
+
+
+def add_background_color(element: ui.element, color: str):
+    handler = _query_background_color(color)
+    if handler:
+        handler(element, color)

ex4nicegui/reactive/systems/object_system.py

@@ -0,0 +1,33 @@
+from typing import (
+    Any,
+    Protocol,
+    runtime_checkable,
+    Union,
+)
+
+
+@runtime_checkable
+class GetItemProtocol(Protocol):
+    def __getitem__(self, key):
+        ...
+
+
+@runtime_checkable
+class SetItemProtocol(Protocol):
+    def __setitem__(self, key, value):
+        ...
+
+
+def get_attribute(obj: Union[object, GetItemProtocol], name: Union[str, int]) -> Any:
+    if isinstance(obj, (GetItemProtocol)):
+        return obj[name]
+    return getattr(obj, name)  # type: ignore
+
+
+def set_attribute(
+    obj: Union[object, SetItemProtocol], name: Union[str, int], value: Any
+) -> None:
+    if isinstance(obj, SetItemProtocol):
+        obj[name] = value
+    else:
+        setattr(obj, name, value)  # type: ignore

ex4nicegui/reactive/systems/reactive_system.py

@@ -0,0 +1,21 @@
+from typing import Callable, Dict
+from ex4nicegui.utils.signals import to_value
+
+
+def convert_kws_ref2value(kws: Dict) -> Dict:
+    return {key: to_value(value) for key, value in kws.items()}
+
+
+def inject_method(obj, method_name: str, new_handle: Callable):
+    if hasattr(obj, method_name):
+        original_method = getattr(obj, method_name)
+
+        def injected_method(*args, **kwargs):
+            new_handle(*args, **kwargs)
+            return original_method(*args, **kwargs)
+
+        setattr(obj, method_name, injected_method)
+    else:
+        raise AttributeError(
+            f"'{type(obj).__name__}' object has no attribute '{method_name}'."
+        )

ex4nicegui/reactive/useMouse/UseMouse.py

@@ -4,7 +4,7 @@ from nicegui.dataclasses import KWONLY_SLOTS
 from nicegui.events import handle_event, UiEventArguments
 from nicegui.element import Element
 
-from ex4nicegui.utils.signals import ReadonlyRef, batch, to_ref
+from ex4nicegui.utils.signals import TReadonlyRef, batch, to_ref
 
 _Update_Args = [
     "x",
@@ -42,15 +42,15 @@ class UseMouse(Element, component="UseMouse.js"):
 
     @property
     def x(self):
-        return cast(ReadonlyRef[float], self.__x)
+        return cast(TReadonlyRef[float], self.__x)
 
     @property
     def y(self):
-        return cast(ReadonlyRef[float], self.__y)
+        return cast(TReadonlyRef[float], self.__y)
 
     @property
     def sourceType(self):
-        return cast(ReadonlyRef[float], self.__sourceType)
+        return cast(TReadonlyRef[float], self.__sourceType)
 
     def on_update(self, handler: Optional[Callable[..., Any]]):
         def inner_handler(e):

ex4nicegui/reactive/usePagination.py

@@ -4,7 +4,7 @@ from ex4nicegui.utils.signals import (
     to_ref,
     to_value,
     effect,
-    _TMaybeRef as TMaybeRef,
+    TMaybeRef,
 )
 from typing import Any
 from typing_extensions import Protocol

ex4nicegui/reactive/vfor.py

@@ -26,9 +26,8 @@ from typing import (
 from functools import partial
 from dataclasses import dataclass
 from signe.core.scope import Scope
-from .utils import get_attribute
+from ex4nicegui.reactive.systems.object_system import get_attribute
 from ex4nicegui.reactive.empty import Empty
-# from .transitionGroup import TransitionGroup
 
 _T = TypeVar("_T")
 _T_data = Union[List[Any], TGetterOrReadonlyRef[List[Any]], RefWrapper]

ex4nicegui/reactive/vmodel.py

@@ -25,7 +25,7 @@ import tokenize
 import executing
 import ast
 import warnings
-from .utils import get_attribute, set_attribute
+from ex4nicegui.reactive.systems.object_system import get_attribute, set_attribute
 
 _T = TypeVar("_T")
 

ex4nicegui/utils/apiEffect.py

@@ -1,5 +1,6 @@
 import signe
 from signe.core.scope import Scope
+from signe.core.consts import EffectState
 from typing import (
     TypeVar,
     overload,
@@ -88,7 +89,10 @@ def ui_effect(
             **kws,
             scope=scope or _CLIENT_SCOPE_MANAGER.get_current_scope(),
         )
-        res.update()
+
+        res.trigger(EffectState.NEED_UPDATE)
+        scheduler.run()
+        # res.update()
 
         return res
 

ex4nicegui/utils/effect.py

@@ -1,4 +1,5 @@
 import signe
+from signe.core.consts import EffectState
 from typing import (
     TypeVar,
     overload,
@@ -6,7 +7,6 @@ from typing import (
     Callable,
     Union,
 )
-
 from .scheduler import get_uiScheduler
 from .clientScope import _CLIENT_SCOPE_MANAGER
 
@@ -81,7 +81,8 @@ def effect(
             scope=_CLIENT_SCOPE_MANAGER.get_current_scope(),
         )
 
-        res.update()
+        res.trigger(EffectState.NEED_UPDATE)
+        scheduler.run()
 
         return res