reflex 0.7.1a4__py3-none-any.whl → 0.7.2a2__py3-none-any.whl

reflex/components/core/breakpoints.py

@@ -2,13 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Dict, Tuple, TypeVar, Union
+from typing import TypeVar
 
 breakpoints_values = ["30em", "48em", "62em", "80em", "96em"]
 breakpoint_names = ["xs", "sm", "md", "lg", "xl"]
 
 
-def set_breakpoints(values: Tuple[str, str, str, str, str]):
+def set_breakpoints(values: tuple[str, str, str, str, str]):
     """Overwrite default breakpoint values.
 
     Args:
@@ -22,7 +22,7 @@ K = TypeVar("K", bound=str)
 V = TypeVar("V")
 
 
-class Breakpoints(Dict[K, V]):
+class Breakpoints(dict[K, V]):
     """A responsive styling helper."""
 
     def factorize(self):
@@ -46,7 +46,7 @@ class Breakpoints(Dict[K, V]):
     @classmethod
     def create(
         cls,
-        custom: Dict[K, V] | None = None,
+        custom: dict[K, V] | None = None,
         initial: V | None = None,
         xs: V | None = None,
         sm: V | None = None,
@@ -94,4 +94,4 @@ breakpoints = Breakpoints.create
 
 T = TypeVar("T")
 
-Responsive = Union[T, Breakpoints[str, T]]
+Responsive = T | Breakpoints[str, T]

reflex/components/core/client_side_routing.pyi

@@ -3,7 +3,7 @@
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `reflex/utils/pyi_generator.py`!
 # ------------------------------------------------------
-from typing import Any, Dict, Optional, Union, overload
+from typing import Any, Optional, overload
 
 from reflex.components.component import Component
 from reflex.event import EventType
@@ -20,12 +20,12 @@ class ClientSideRouting(Component):
     def create(  # type: ignore
         cls,
         *children,
-        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[Var, Any]]] = None,
+        style: Style | None = None,
+        key: Any | None = None,
+        id: Any | None = None,
+        class_name: Any | None = None,
+        autofocus: bool | None = None,
+        custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: Optional[EventType[()]] = None,
         on_click: Optional[EventType[()]] = None,
         on_context_menu: Optional[EventType[()]] = None,
@@ -68,13 +68,13 @@ class Default404Page(Component):
     def create(  # type: ignore
         cls,
         *children,
-        status_code: Optional[Union[Var[int], int]] = 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[Var, Any]]] = None,
+        status_code: Var[int] | int | None = None,
+        style: Style | None = None,
+        key: Any | None = None,
+        id: Any | None = None,
+        class_name: Any | None = None,
+        autofocus: bool | None = None,
+        custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: Optional[EventType[()]] = None,
         on_click: Optional[EventType[()]] = None,
         on_context_menu: Optional[EventType[()]] = None,

reflex/components/core/clipboard.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, List, Tuple, Union
+from typing import Sequence
 
 from reflex.components.base.fragment import Fragment
 from reflex.components.tags.tag import Tag
@@ -18,13 +18,13 @@ class Clipboard(Fragment):
     """Clipboard component."""
 
     # The element ids to attach the event listener to. Defaults to all child components or the document.
-    targets: Var[List[str]]
+    targets: Var[Sequence[str]]
 
     # Called when the user pastes data into the document. Data is a list of tuples of (mime_type, data). Binary types will be base64 encoded as a data uri.
-    on_paste: EventHandler[passthrough_event_spec(List[Tuple[str, str]])]
+    on_paste: EventHandler[passthrough_event_spec(list[tuple[str, str]])]
 
     # Save the original event actions for the on_paste event.
-    on_paste_event_actions: Var[Dict[str, Union[bool, int]]]
+    on_paste_event_actions: Var[dict[str, bool | int]]
 
     @classmethod
     def create(cls, *children, **props):

reflex/components/core/clipboard.pyi

@@ -3,7 +3,7 @@
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `reflex/utils/pyi_generator.py`!
 # ------------------------------------------------------
-from typing import Any, Dict, List, Optional, Union, overload
+from typing import Any, Optional, Sequence, overload
 
 from reflex.components.base.fragment import Fragment
 from reflex.event import EventType
@@ -17,16 +17,16 @@ class Clipboard(Fragment):
     def create(  # type: ignore
         cls,
         *children,
-        targets: Optional[Union[List[str], Var[List[str]]]] = None,
-        on_paste_event_actions: Optional[
-            Union[Dict[str, Union[bool, int]], Var[Dict[str, Union[bool, int]]]]
-        ] = 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[Var, Any]]] = None,
+        targets: Sequence[str] | Var[Sequence[str]] | None = None,
+        on_paste_event_actions: Var[dict[str, bool | int]]
+        | dict[str, bool | int]
+        | None = None,
+        style: Style | None = None,
+        key: Any | None = None,
+        id: Any | None = None,
+        class_name: Any | None = None,
+        autofocus: bool | None = None,
+        custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: Optional[EventType[()]] = None,
         on_click: Optional[EventType[()]] = None,
         on_context_menu: Optional[EventType[()]] = None,
@@ -40,9 +40,7 @@ class Clipboard(Fragment):
         on_mouse_out: Optional[EventType[()]] = None,
         on_mouse_over: Optional[EventType[()]] = None,
         on_mouse_up: Optional[EventType[()]] = None,
-        on_paste: Optional[
-            Union[EventType[()], EventType[list[tuple[str, str]]]]
-        ] = None,
+        on_paste: Optional[EventType[()] | EventType[list[tuple[str, str]]]] = None,
         on_scroll: Optional[EventType[()]] = None,
         on_unmount: Optional[EventType[()]] = None,
         **props,

reflex/components/core/cond.py

@@ -2,13 +2,14 @@
 
 from __future__ import annotations
 
-from typing import Any, Dict, Optional, overload
+from typing import Any, Dict, overload
 
 from reflex.components.base.fragment import Fragment
 from reflex.components.component import BaseComponent, Component, MemoizationLeaf
 from reflex.components.tags import CondTag, Tag
 from reflex.constants import Dirs
 from reflex.style import LIGHT_COLOR_MODE, resolved_color_mode
+from reflex.utils import types
 from reflex.utils.imports import ImportDict, ImportVar
 from reflex.vars import VarData
 from reflex.vars.base import LiteralVar, Var
@@ -25,17 +26,12 @@ class Cond(MemoizationLeaf):
     # The cond to determine which component to render.
     cond: Var[Any]
 
-    # The component to render if the cond is true.
-    comp1: BaseComponent | None = None
-    # The component to render if the cond is false.
-    comp2: BaseComponent | None = None
-
     @classmethod
     def create(
         cls,
         cond: Var,
         comp1: BaseComponent,
-        comp2: Optional[BaseComponent] = None,
+        comp2: BaseComponent | None = None,
     ) -> Component:
         """Create a conditional component.
 
@@ -53,19 +49,17 @@ class Cond(MemoizationLeaf):
         if comp2 is None or type(comp2).__name__ != "Fragment":
             comp2 = Fragment.create(comp2) if comp2 else Fragment.create()
         return Fragment.create(
-            cls(
-                cond=cond,
-                comp1=comp1,
-                comp2=comp2,
+            cls._create(
                 children=[comp1, comp2],
+                cond=cond,
             )
         )
 
     def _render(self) -> Tag:
         return CondTag(
             cond=self.cond,
-            true_value=self.comp1.render(),  # pyright: ignore [reportOptionalMemberAccess]
-            false_value=self.comp2.render(),  # pyright: ignore [reportOptionalMemberAccess]
+            true_value=self.children[0].render(),
+            false_value=self.children[1].render(),
         )
 
     def render(self) -> Dict:
@@ -85,7 +79,7 @@ class Cond(MemoizationLeaf):
             ).set(
                 props=tag.format_props(),
             ),
-            cond_state=f"isTrue({self.cond!s})",
+            cond_state=str(self.cond),
         )
 
     def add_imports(self) -> ImportDict:
@@ -136,7 +130,7 @@ def cond(condition: Any, c1: Any, c2: Any = None) -> Component | Var:
     if isinstance(c1, BaseComponent):
         if c2 is not None and not isinstance(c2, BaseComponent):
             raise ValueError("Both arguments must be components.")
-        return Cond.create(cond_var, c1, c2)
+        return Cond.create(cond_var.bool(), c1, c2)
 
     # Otherwise, create a conditional Var.
     # Check that the second argument is valid.
@@ -145,20 +139,18 @@ def cond(condition: Any, c1: Any, c2: Any = None) -> Component | Var:
     if c2 is None:
         raise ValueError("For conditional vars, the second argument must be set.")
 
-    def create_var(cond_part: Any) -> Var[Any]:
-        return LiteralVar.create(cond_part)
-
     # convert the truth and false cond parts into vars so the _var_data can be obtained.
-    c1 = create_var(c1)
-    c2 = create_var(c2)
+    c1_var = Var.create(c1)
+    c2_var = Var.create(c2)
+
+    if condition is c1_var:
+        c1_var = c1_var.to(types.value_inside_optional(c1_var._var_type))
 
     # Create the conditional var.
     return ternary_operation(
-        cond_var.bool()._replace(
-            merge_var_data=VarData(imports=_IS_TRUE_IMPORT),
-        ),
-        c1,
-        c2,
+        cond_var.bool(),
+        c1_var,
+        c2_var,
     )
 
 

reflex/components/core/debounce.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Union
+from typing import Any, Type
 
 from reflex.components.component import Component
 from reflex.constants import EventTriggers
@@ -37,7 +37,7 @@ class DebounceInput(Component):
     force_notify_on_blur: Var[bool]
 
     # If provided, create a fully-controlled input
-    value: Var[Union[str, int, float]]
+    value: Var[str | int | float]
 
     # The ref to attach to the created input
     input_ref: Var[str]
@@ -127,7 +127,7 @@ class DebounceInput(Component):
         component._get_style = child._get_style
         component.event_triggers.update(child.event_triggers)
         component.children = child.children
-        component._rename_props = child._rename_props
+        component._rename_props = child._rename_props  # pyright: ignore[reportAttributeAccessIssue]
         outer_get_all_custom_code = component._get_all_custom_code
         component._get_all_custom_code = lambda: outer_get_all_custom_code().union(
             child._get_all_custom_code()

reflex/components/core/debounce.pyi

@@ -3,7 +3,7 @@
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `reflex/utils/pyi_generator.py`!
 # ------------------------------------------------------
-from typing import Any, Dict, Optional, Type, Union, overload
+from typing import Any, Optional, Type, overload
 
 from reflex.components.component import Component
 from reflex.event import EventType
@@ -18,19 +18,19 @@ class DebounceInput(Component):
     def create(  # type: ignore
         cls,
         *children,
-        min_length: Optional[Union[Var[int], int]] = None,
-        debounce_timeout: Optional[Union[Var[int], int]] = None,
-        force_notify_by_enter: Optional[Union[Var[bool], bool]] = None,
-        force_notify_on_blur: Optional[Union[Var[bool], bool]] = None,
-        value: Optional[Union[Var[Union[float, int, str]], float, int, str]] = None,
-        input_ref: Optional[Union[Var[str], str]] = None,
-        element: Optional[Union[Type[Component], Var[Type[Component]]]] = 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[Var, Any]]] = None,
+        min_length: Var[int] | int | None = None,
+        debounce_timeout: Var[int] | int | None = None,
+        force_notify_by_enter: Var[bool] | bool | None = None,
+        force_notify_on_blur: Var[bool] | bool | None = None,
+        value: Var[float | int | str] | float | int | str | None = None,
+        input_ref: Var[str] | str | None = None,
+        element: Type[Component] | Var[Type[Component]] | None = None,
+        style: Style | None = None,
+        key: Any | None = None,
+        id: Any | None = None,
+        class_name: Any | None = None,
+        autofocus: bool | None = None,
+        custom_attrs: dict[str, Var | Any] | None = None,
         on_blur: Optional[EventType[()]] = None,
         on_change: Optional[EventType[()]] = None,
         on_click: Optional[EventType[()]] = None,

reflex/components/core/foreach.py

@@ -8,9 +8,11 @@ from typing import Any, Callable, Iterable
 
 from reflex.components.base.fragment import Fragment
 from reflex.components.component import Component
+from reflex.components.core.cond import cond
 from reflex.components.tags import IterTag
 from reflex.constants import MemoizationMode
 from reflex.state import ComponentState
+from reflex.utils import types
 from reflex.utils.exceptions import UntypedVarError
 from reflex.vars.base import LiteralVar, Var
 
@@ -85,7 +87,11 @@ class Foreach(Component):
                 "See https://reflex.dev/docs/library/dynamic-rendering/foreach/"
             )
 
-        component = cls(
+        if types.is_optional(iterable._var_type):
+            iterable = cond(iterable, iterable, [])
+
+        component = cls._create(
+            children=[],
             iterable=iterable,
             render_fn=render_fn,
         )
@@ -164,7 +170,6 @@ class Foreach(Component):
             iterable_state=str(tag.iterable),
             arg_name=tag.arg_var_name,
             arg_index=tag.get_index_var_arg(),
-            iterable_type=tag.iterable._var_type.mro()[0].__name__,
         )
 
 

reflex/components/core/html.py

@@ -1,7 +1,5 @@
 """A html component."""
 
-from typing import Dict
-
 from reflex.components.el.elements.typography import Div
 from reflex.vars.base import Var
 
@@ -14,7 +12,7 @@ class Html(Div):
     """
 
     # The HTML to render.
-    dangerouslySetInnerHTML: Var[Dict[str, str]]  # noqa: N815
+    dangerouslySetInnerHTML: Var[dict[str, str]]  # noqa: N815
 
     @classmethod
     def create(cls, *children, **props):