ex4nicegui 0.2.17__py3-none-any.whl → 0.2.18__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.2.17"
+__version__ = "0.2.18"

ex4nicegui/layout/__init__.py

@@ -1,2 +1,2 @@
-# from .gridbox import grid_box
 from .gridFlex import *
+from .rxFlex import *

ex4nicegui/layout/gridFlex/gridFlex.py

@@ -147,7 +147,7 @@ class GridFlex(Element, component="GridFlex.js"):
         break_point: Optional[TBreakpoint] = None,
         **kws,
     ):
-        if area is not None:
+        if area is not None and area.strip() != "":
             areas_list = utils.areas_str2array(area)
             area = utils.areas_array2str(areas_list)
             areas_cols_len = max(map(len, areas_list))

ex4nicegui/layout/rxFlex/__init__.py

@@ -0,0 +1 @@
+from .index import rx_column, rx_row

ex4nicegui/layout/rxFlex/index.py

@@ -0,0 +1,121 @@
+from typing import Callable, List, Optional, Union, TypeVar, Generic
+from typing_extensions import Literal
+
+from ex4nicegui.layout import grid_box, mark_area
+from nicegui import ui, app
+from .types import *
+
+_T_itemWraper_add_var = TypeVar("_T_itemWraper_add_var")
+
+
+class ItemWraper:
+    def __init__(self, fn: Callable[[ui.element], ui.element]):
+        self.fn = fn
+
+    def __radd__(self, other: _T_itemWraper_add_var) -> _T_itemWraper_add_var:
+        return self.fn(other)  # type: ignore
+
+
+class rx_flex_box(ui.element):
+    def space(self):
+        return ui.element("q-space")
+
+    def gap(self, value: Union[int, float, str]):
+        if isinstance(value, (int, float)):
+            value = f"{value}rem"
+        self._style["gap"] = str(value)
+        self.update()
+        return self
+
+    def all_items_grow(self):
+        self._props["ex4ng-rx-flex-auto-grow"] = ""
+        return self
+
+
+def _q_space():
+    return ui.element("q-space")
+
+
+class rx_column(ui.column, rx_flex_box):
+    def __init__(
+        self,
+        horizontal: TColumn_Horizontal = "left",
+        vertical: TColumn_Vertical = "top",
+    ) -> None:
+        super().__init__()
+        self.tailwind.align_items
+        self.horizontal(horizontal)
+        self.vertical(vertical)
+
+        self._props["ex4ng-rx-column"] = ""
+
+    def item_horizontal(self, value: TColumn_Item_Horizontal):
+        def fn(ele: ui.element):
+            ele._style["align-self"] = Column_Item_Horizontal_map.get(value, value)
+            # ele.update()
+            return ele
+
+        return ItemWraper(fn)
+
+    def horizontal(self, value: TColumn_Horizontal):
+        self._style["align-items"] = Column_Horizontal_map.get(value, value)
+        self.update()
+        return self
+
+    def vertical(self, value: TColumn_Vertical):
+        self._style["justify-content"] = Column_Vertical_map.get(value, value)
+        self.update()
+        return self
+
+    def space(self):
+        return _q_space()
+
+
+class rx_row(ui.row, rx_flex_box):
+    def __init__(
+        self,
+        horizontal: TRow_Horizontal = "left",
+        vertical: TRow_Vertical = "top",
+    ) -> None:
+        super().__init__()
+        self.horizontal(horizontal)
+        self.vertical(vertical)
+        self._props["ex4ng-rx-row"] = ""
+
+    def item_vertical(self, value: TRow_Item_Vertical):
+        def fn(ele: ui.element):
+            ele._style["align-self"] = Row_Vertical_map.get(value, value)
+            return ele
+
+        return ItemWraper(fn)
+
+    def horizontal(self, value: TRow_Horizontal):
+        self._style["justify-content"] = Row_Horizontal_map.get(value, value)
+        self.update()
+        return self
+
+    def vertical(self, value: TRow_Vertical):
+        self._style["align-items"] = Row_Vertical_map.get(value, value)
+        self.update()
+        return
+
+    def space(self):
+        return _q_space()
+
+
+class page_view(rx_column):
+    def __init__(
+        self,
+        horizontal: TColumn_Horizontal = "left",
+        vertical: TColumn_Vertical = "top",
+    ) -> None:
+        super().__init__(horizontal, vertical)
+        self.classes("w-full h-full no-wrap")
+        ui.query("main.q-page").classes("flex")
+        ui.query(".nicegui-content").classes("grow p-0")
+
+    def all_center(self):
+        return self.horizontal("center").vertical("center")
+
+    def full_screen(self):
+        return self.classes("fullscreen")

ex4nicegui/layout/rxFlex/types.py

@@ -0,0 +1,80 @@
+# region type
+
+from typing_extensions import Literal
+
+
+Space_map = {
+    "between": "space-between",
+    "around": "space-around",
+    "evenly": "space-evenly",
+}
+
+TColumn_Item_Horizontal = Literal[
+    "auto",
+    "left",
+    "right",
+    "center",
+    "stretch",
+    "baseline",
+]
+Column_Item_Horizontal_map = {"left": "flex-start", "right": "flex-end"}
+
+
+TColumn_Horizontal = Literal[
+    "left",
+    "right",
+    "center",
+    "baseline",
+    "stretch",
+]
+
+Column_Horizontal_map = {"left": "flex-start", "right": "flex-end"}
+
+TColumn_Vertical = Literal[
+    "normal",
+    "top",
+    "bottom",
+    "center",
+    "between",
+    "around",
+    "evenly",
+    "stretch",
+]
+
+Column_Vertical_map = {"top": "flex-start", "bottom": "flex-end", **Space_map}
+
+
+TRow_Horizontal = Literal[
+    "normal",
+    "left",
+    "right",
+    "center",
+    "between",
+    "around",
+    "evenly",
+    "stretch",
+]
+
+Row_Horizontal_map = {"left": "flex-start", "right": "flex-end", **Space_map}
+
+TRow_Vertical = Literal[
+    "top",
+    "bottom",
+    "center",
+    "baseline",
+    "stretch",
+]
+
+Row_Vertical_map = {"top": "flex-start", "bottom": "flex-end"}
+
+
+TRow_Item_Vertical = Literal[
+    "auto",
+    "top",
+    "bottom",
+    "center",
+    "stretch",
+    "baseline",
+]
+TRow_Item_Vertical_map = {"top": "flex-start", "bottom": "flex-end"}
+# endregion

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

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

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

@@ -1,13 +1,15 @@
-ex4nicegui/__init__.py,sha256=9OkkZEITcLZ-h7lqMk4OHrHynnfSjlsBc2EeIexno34,397
+ex4nicegui/__init__.py,sha256=_MbAAhRG7NTi391YxBHeqLpmetZrRQLlqtgHG8Nqebs,397
 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
-ex4nicegui/layout/__init__.py,sha256=j7Yb_p3YT69QHKVcn4dCjQ43JwVUzV5hDJ7cVTh_ZGA,58
-ex4nicegui/layout/_gridbox.py,sha256=CcupbaDVbKl2g2KVWvpaSPO73tuuRvfSNuyzH2koe4U,2454
+ex4nicegui/layout/__init__.py,sha256=yYkdH0bC1nxIDr_OtvyTqR_yXkwnY5DmelaQOIwwjas,48
 ex4nicegui/layout/gridFlex/GridFlex.js,sha256=ljkxGFucBUIPksMAT5w_35sxGogC7OzxzXnOw21Z3_k,4468
 ex4nicegui/layout/gridFlex/__init__.py,sha256=98dcrOEROibl5fnzIj644CnELbUvYTid702IjhLdpfs,79
-ex4nicegui/layout/gridFlex/gridFlex.py,sha256=bAGpnLp-cjHK6p-SK8nrRQNTOylZ1HwmeGlSeWokoRs,7438
+ex4nicegui/layout/gridFlex/gridFlex.py,sha256=8zMHKgh23wVr3TXVcvv8_KzyIZLk5zPUdgf7BWgy38k,7461
 ex4nicegui/layout/gridFlex/utils.py,sha256=hBuusveBRaHSubIr2q38AP033-VtXDFE_fDzZtg4h44,1236
+ex4nicegui/layout/rxFlex/__init__.py,sha256=dllXV6cri1oOZkOCGJpI9AlUjIZ3oB99ckLIYRW8faM,38
+ex4nicegui/layout/rxFlex/index.py,sha256=XeAsxfy35RJBE2g2WGzKgskf43K4We0d2mBzWb0kbB8,3509
+ex4nicegui/layout/rxFlex/types.py,sha256=OQBo3kkmtXhMo3BDI0GjX36HPJLDV1Cm67hPZGb1k2Q,1411
 ex4nicegui/reactive/__index.py,sha256=OaN_mD2TJORxqTzh2JeKAqaOhIBqM5cBnm21RqKt7PQ,451
 ex4nicegui/reactive/__init__.py,sha256=NZUgvItxqqgzHKrt4oGZnxxV9dlEudGiv4J3fhJdvdQ,24
 ex4nicegui/reactive/drawer.py,sha256=NWMq2gnalpYAU8tT0DwGN5l8n7fuMxTIWxOfr2QvFIA,1356
@@ -61,8 +63,8 @@ ex4nicegui/tools/debug.py,sha256=HCKlVzhHx5av-983ADgwgMkScKwTreSluLA7uikGYa0,488
 ex4nicegui/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ex4nicegui/utils/common.py,sha256=5fsaOkoj-Ild1LGsInZXra66gJLVoVcZGAIG6YOeM6E,430
 ex4nicegui/utils/signals.py,sha256=Dwvb0Anansa0N1ZH2Ko0yCX9o-QHKbXOYEtvdrtde9g,4807
-ex4nicegui-0.2.17.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
-ex4nicegui-0.2.17.dist-info/METADATA,sha256=2PpOH1p1Ob0TY1r4xePjfy5lwtWuIpxPIMiPuXfsfYM,515
-ex4nicegui-0.2.17.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ex4nicegui-0.2.17.dist-info/top_level.txt,sha256=VFwMiO9AFjj5rfLMJwN1ipLRASk9fJXB8tM6DNrpvPQ,11
-ex4nicegui-0.2.17.dist-info/RECORD,,
+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/layout/_gridbox.py

@@ -1,87 +0,0 @@
-from typing import List, Optional, Union, cast
-from nicegui.client import Client
-from nicegui.element import Element
-from ex4nicegui.reactive.officials.base import BindableUi
-
-
-def _areas_str2array(areas: str) -> List[List[str]]:
-    """
-    >>> input='''
-        sc1 sc2
-        sc3
-        table table table table
-    '''
-    >>> areas_str2array(input)
-    >>> [
-        ["sc1", "sc2"],
-        ["sc3"],
-        ["table", "table", "table", "table"]
-    ]
-    """
-    pass
-
-    lines = (line.strip() for line in areas.splitlines())
-    remove_empty_rows = (line for line in lines if len(line) > 0)
-    splie_space = (line.split() for line in remove_empty_rows)
-    return list(splie_space)
-
-
-def _areas_array2str(areas_array: List[List[str]]):
-    """
-    >>> input = [
-        ["sc1", "sc2"],
-        ["sc3"],
-        ["table"] * 4
-    ]
-    >>> areas_array2str(input)
-    >>> '"sc1 sc2 . ." "sc3 . . ." "table table table table"'
-    """
-    max_len = max(map(len, areas_array))
-
-    fix_empty = (
-        [*line, *(["."] * (max_len - len(line)))] if len(line) < max_len else line
-        for line in areas_array
-    )
-
-    line2str = (f'"{" ".join(line)}"' for line in fix_empty)
-    return " ".join(line2str)
-
-
-class grid_box(Element):
-    def __init__(
-        self,
-        areas_text: str,
-        template_columns: Optional[str] = None,
-        template_rows: Optional[str] = None,
-        *,
-        _client: Optional[Client] = None,
-    ) -> None:
-        super().__init__("div", _client=_client)
-
-        areas_list = _areas_str2array(areas_text)
-
-        areas = _areas_array2str(areas_list)
-
-        areas_cols_len = max(map(len, areas_list))
-        areas_rows_len = len(areas_list)
-
-        template_columns = template_columns or f"repeat({areas_cols_len}, 1fr)"
-        template_rows = template_rows or f"repeat({areas_rows_len}, 1fr)"
-
-        self.style(
-            f"""
-grid-template-areas: {areas};
-display: grid;
-grid-template-columns: {template_columns};
-grid-template-rows:{template_rows};"""
-        )
-
-    def areas_mark(self, element: Union[Element, BindableUi], mark: str):
-        if isinstance(element, BindableUi):
-            element = element.element
-        element = cast(Element, element)
-        element.style(self.mark_style(mark))
-        return element
-
-    def mark_style(self, mark: str):
-        return f"grid-area:{mark}"