reflex 0.6.0a1__py3-none-any.whl → 0.6.0a2__py3-none-any.whl

reflex/components/radix/themes/layout/grid.pyi

@@ -8,9 +8,8 @@ from typing import Any, Callable, Dict, Literal, Optional, Union, overload
 from reflex.components.core.breakpoints import Breakpoints
 from reflex.components.el import elements
 from reflex.event import EventHandler, EventSpec
-from reflex.ivars.base import ImmutableVar
 from reflex.style import Style
-from reflex.vars import Var
+from reflex.vars.base import Var
 
 from ..base import RadixThemesComponent
 
@@ -24,61 +23,65 @@ class Grid(elements.Div, RadixThemesComponent):
         *children,
         as_child: Optional[Union[Var[bool], bool]] = None,
         columns: Optional[
-            Union[Var[Union[Breakpoints[str, str], str]], str, Breakpoints[str, str]]
+            Union[Breakpoints[str, str], Var[Union[Breakpoints[str, str], str]], str]
         ] = None,
         rows: Optional[
-            Union[Var[Union[Breakpoints[str, str], str]], str, Breakpoints[str, str]]
+            Union[Breakpoints[str, str], Var[Union[Breakpoints[str, str], str]], str]
         ] = None,
         flow: Optional[
             Union[
+                Breakpoints[
+                    str, Literal["column", "column-dense", "dense", "row", "row-dense"]
+                ],
+                Literal["column", "column-dense", "dense", "row", "row-dense"],
                 Var[
                     Union[
                         Breakpoints[
                             str,
                             Literal[
-                                "row", "column", "dense", "row-dense", "column-dense"
+                                "column", "column-dense", "dense", "row", "row-dense"
                             ],
                         ],
-                        Literal["row", "column", "dense", "row-dense", "column-dense"],
+                        Literal["column", "column-dense", "dense", "row", "row-dense"],
                     ]
                 ],
-                Literal["row", "column", "dense", "row-dense", "column-dense"],
-                Breakpoints[
-                    str, Literal["row", "column", "dense", "row-dense", "column-dense"]
-                ],
             ]
         ] = None,
         align: Optional[
             Union[
+                Breakpoints[
+                    str, Literal["baseline", "center", "end", "start", "stretch"]
+                ],
+                Literal["baseline", "center", "end", "start", "stretch"],
                 Var[
                     Union[
                         Breakpoints[
                             str,
-                            Literal["start", "center", "end", "baseline", "stretch"],
+                            Literal["baseline", "center", "end", "start", "stretch"],
                         ],
-                        Literal["start", "center", "end", "baseline", "stretch"],
+                        Literal["baseline", "center", "end", "start", "stretch"],
                     ]
                 ],
-                Literal["start", "center", "end", "baseline", "stretch"],
-                Breakpoints[
-                    str, Literal["start", "center", "end", "baseline", "stretch"]
-                ],
             ]
         ] = None,
         justify: Optional[
             Union[
+                Breakpoints[str, Literal["between", "center", "end", "start"]],
+                Literal["between", "center", "end", "start"],
                 Var[
                     Union[
-                        Breakpoints[str, Literal["start", "center", "end", "between"]],
-                        Literal["start", "center", "end", "between"],
+                        Breakpoints[str, Literal["between", "center", "end", "start"]],
+                        Literal["between", "center", "end", "start"],
                     ]
                 ],
-                Literal["start", "center", "end", "between"],
-                Breakpoints[str, Literal["start", "center", "end", "between"]],
             ]
         ] = None,
         spacing: Optional[
             Union[
+                Breakpoints[
+                    str, Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
+                ],
+                Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
                 Var[
                     Union[
                         Breakpoints[
@@ -88,14 +91,14 @@ class Grid(elements.Div, RadixThemesComponent):
                         Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
                     ]
                 ],
-                Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
-                Breakpoints[
-                    str, Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
-                ],
             ]
         ] = None,
         spacing_x: Optional[
             Union[
+                Breakpoints[
+                    str, Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
+                ],
+                Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
                 Var[
                     Union[
                         Breakpoints[
@@ -105,14 +108,14 @@ class Grid(elements.Div, RadixThemesComponent):
                         Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
                     ]
                 ],
-                Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
-                Breakpoints[
-                    str, Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
-                ],
             ]
         ] = None,
         spacing_y: Optional[
             Union[
+                Breakpoints[
+                    str, Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
+                ],
+                Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
                 Var[
                     Union[
                         Breakpoints[
@@ -122,86 +125,72 @@ class Grid(elements.Div, RadixThemesComponent):
                         Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
                     ]
                 ],
-                Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
-                Breakpoints[
-                    str, Literal["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
-                ],
             ]
         ] = None,
-        access_key: Optional[Union[Var[Union[bool, int, str]], str, int, bool]] = None,
+        access_key: Optional[Union[Var[Union[bool, int, str]], bool, int, str]] = None,
         auto_capitalize: Optional[
-            Union[Var[Union[bool, int, str]], str, int, bool]
+            Union[Var[Union[bool, int, str]], bool, int, str]
         ] = None,
         content_editable: Optional[
-            Union[Var[Union[bool, int, str]], str, int, bool]
+            Union[Var[Union[bool, int, str]], bool, int, str]
         ] = None,
         context_menu: Optional[
-            Union[Var[Union[bool, int, str]], str, int, bool]
+            Union[Var[Union[bool, int, str]], bool, int, str]
         ] = None,
-        dir: Optional[Union[Var[Union[bool, int, str]], str, int, bool]] = None,
-        draggable: Optional[Union[Var[Union[bool, int, str]], str, int, bool]] = None,
+        dir: Optional[Union[Var[Union[bool, int, str]], bool, int, str]] = None,
+        draggable: Optional[Union[Var[Union[bool, int, str]], bool, int, str]] = None,
         enter_key_hint: Optional[
-            Union[Var[Union[bool, int, str]], str, int, bool]
-        ] = None,
-        hidden: Optional[Union[Var[Union[bool, int, str]], str, int, bool]] = None,
-        input_mode: Optional[Union[Var[Union[bool, int, str]], str, int, bool]] = None,
-        item_prop: Optional[Union[Var[Union[bool, int, str]], str, int, bool]] = None,
-        lang: Optional[Union[Var[Union[bool, int, str]], str, int, bool]] = None,
-        role: Optional[Union[Var[Union[bool, int, str]], str, int, bool]] = None,
-        slot: Optional[Union[Var[Union[bool, int, str]], str, int, bool]] = None,
-        spell_check: Optional[Union[Var[Union[bool, int, str]], str, int, bool]] = None,
-        tab_index: Optional[Union[Var[Union[bool, int, str]], str, int, bool]] = None,
-        title: Optional[Union[Var[Union[bool, int, str]], str, int, bool]] = None,
+            Union[Var[Union[bool, int, str]], bool, int, str]
+        ] = None,
+        hidden: Optional[Union[Var[Union[bool, int, str]], bool, int, str]] = None,
+        input_mode: Optional[Union[Var[Union[bool, int, str]], bool, int, str]] = None,
+        item_prop: Optional[Union[Var[Union[bool, int, str]], bool, int, str]] = None,
+        lang: Optional[Union[Var[Union[bool, int, str]], bool, int, str]] = None,
+        role: Optional[Union[Var[Union[bool, int, str]], bool, int, str]] = None,
+        slot: Optional[Union[Var[Union[bool, int, str]], bool, int, str]] = None,
+        spell_check: Optional[Union[Var[Union[bool, int, str]], bool, int, str]] = None,
+        tab_index: Optional[Union[Var[Union[bool, int, str]], bool, int, str]] = None,
+        title: Optional[Union[Var[Union[bool, int, str]], bool, int, str]] = None,
         style: Optional[Style] = None,
         key: Optional[Any] = None,
         id: Optional[Any] = None,
         class_name: Optional[Any] = None,
         autofocus: Optional[bool] = None,
-        custom_attrs: Optional[Dict[str, Union[ImmutableVar, str]]] = None,
-        on_blur: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
-        ] = None,
-        on_click: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
-        ] = None,
+        custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
+        on_blur: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+        on_click: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
         on_context_menu: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
+            Union[EventHandler, EventSpec, list, Callable, Var]
         ] = None,
         on_double_click: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
-        ] = None,
-        on_focus: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
-        ] = None,
-        on_mount: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
+            Union[EventHandler, EventSpec, list, Callable, Var]
         ] = None,
+        on_focus: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
+        on_mount: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
         on_mouse_down: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
+            Union[EventHandler, EventSpec, list, Callable, Var]
         ] = None,
         on_mouse_enter: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
+            Union[EventHandler, EventSpec, list, Callable, Var]
         ] = None,
         on_mouse_leave: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
+            Union[EventHandler, EventSpec, list, Callable, Var]
         ] = None,
         on_mouse_move: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
+            Union[EventHandler, EventSpec, list, Callable, Var]
         ] = None,
         on_mouse_out: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
+            Union[EventHandler, EventSpec, list, Callable, Var]
         ] = None,
         on_mouse_over: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
+            Union[EventHandler, EventSpec, list, Callable, Var]
         ] = None,
         on_mouse_up: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
-        ] = None,
-        on_scroll: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
+            Union[EventHandler, EventSpec, list, Callable, Var]
         ] = None,
+        on_scroll: Optional[Union[EventHandler, EventSpec, list, Callable, Var]] = None,
         on_unmount: Optional[
-            Union[EventHandler, EventSpec, list, Callable, ImmutableVar]
+            Union[EventHandler, EventSpec, list, Callable, Var]
         ] = None,
         **props,
     ) -> "Grid":

reflex/components/radix/themes/layout/list.py

@@ -9,8 +9,7 @@ from reflex.components.core.foreach import Foreach
 from reflex.components.el.elements.typography import Li, Ol, Ul
 from reflex.components.lucide.icon import Icon
 from reflex.components.radix.themes.typography.text import Text
-from reflex.ivars.base import ImmutableVar
-from reflex.vars import Var
+from reflex.vars.base import Var
 
 LiteralListStyleTypeUnordered = Literal[
     "none",
@@ -51,7 +50,7 @@ class BaseList(Component):
     def create(
         cls,
         *children,
-        items: Optional[ImmutableVar[Iterable]] = None,
+        items: Optional[Var[Iterable]] = None,
         **props,
     ):
         """Create a list component.
@@ -67,7 +66,7 @@ class BaseList(Component):
         """
         list_style_type = props.pop("list_style_type", "none")
         if not children and items is not None:
-            if isinstance(items, ImmutableVar):
+            if isinstance(items, Var):
                 children = [Foreach.create(items, ListItem.create)]
             else:
                 children = [ListItem.create(item) for item in items]  # type: ignore
@@ -98,7 +97,7 @@ class UnorderedList(BaseList, Ul):
     def create(
         cls,
         *children,
-        items: Optional[ImmutableVar[Iterable]] = None,
+        items: Optional[Var[Iterable]] = None,
         list_style_type: LiteralListStyleTypeUnordered = "disc",
         **props,
     ):
@@ -129,7 +128,7 @@ class OrderedList(BaseList, Ol):
     def create(
         cls,
         *children,
-        items: Optional[ImmutableVar[Iterable]] = None,
+        items: Optional[Var[Iterable]] = None,
         list_style_type: LiteralListStyleTypeOrdered = "decimal",
         **props,
     ):