reflex 0.5.4a3__py3-none-any.whl → 0.5.5__py3-none-any.whl

reflex/components/core/upload.py

@@ -4,9 +4,8 @@ from __future__ import annotations
 
 import os
 from pathlib import Path
-from typing import Any, Callable, ClassVar, Dict, List, Optional, Union
+from typing import Callable, ClassVar, Dict, List, Optional
 
-from reflex import constants
 from reflex.components.component import Component, ComponentNamespace, MemoizationLeaf
 from reflex.components.el.elements.forms import Input
 from reflex.components.radix.themes.layout.box import Box
@@ -14,22 +13,21 @@ from reflex.constants import Dirs
 from reflex.event import (
     CallableEventSpec,
     EventChain,
+    EventHandler,
     EventSpec,
     call_event_fn,
     call_script,
     parse_args_spec,
 )
-from reflex.utils import imports
+from reflex.utils.imports import ImportVar
 from reflex.vars import BaseVar, CallableVar, Var, VarData
 
 DEFAULT_UPLOAD_ID: str = "default"
 
 upload_files_context_var_data: VarData = VarData(
     imports={
-        "react": [imports.ImportVar(tag="useContext")],
-        f"/{Dirs.CONTEXTS_PATH}": [
-            imports.ImportVar(tag="UploadFilesContext"),
-        ],
+        "react": "useContext",
+        f"/{Dirs.CONTEXTS_PATH}": "UploadFilesContext",
     },
     hooks={
         "const [filesById, setFilesById] = useContext(UploadFilesContext);": None,
@@ -50,10 +48,18 @@ def upload_file(id_: str = DEFAULT_UPLOAD_ID) -> BaseVar:
     Returns:
         A var referencing the file upload drop trigger.
     """
+    id_var = Var.create_safe(id_, _var_is_string=True)
+    var_name = f"""e => setFilesById(filesById => {{
+    const updatedFilesById = Object.assign({{}}, filesById);
+    updatedFilesById[{id_var._var_name_unwrapped}] = e;
+    return updatedFilesById;
+  }})
+    """
+
     return BaseVar(
-        _var_name=f"e => setFilesById(filesById => ({{...filesById, {id_}: e}}))",
+        _var_name=var_name,
         _var_type=EventChain,
-        _var_data=upload_files_context_var_data,
+        _var_data=VarData.merge(upload_files_context_var_data, id_var._var_data),
     )
 
 
@@ -67,10 +73,11 @@ def selected_files(id_: str = DEFAULT_UPLOAD_ID) -> BaseVar:
     Returns:
         A var referencing the list of selected file paths.
     """
+    id_var = Var.create_safe(id_, _var_is_string=True)
     return BaseVar(
-        _var_name=f"(filesById.{id_} ? filesById.{id_}.map((f) => (f.path || f.name)) : [])",
+        _var_name=f"(filesById[{id_var._var_name_unwrapped}] ? filesById[{id_var._var_name_unwrapped}].map((f) => (f.path || f.name)) : [])",
         _var_type=List[str],
-        _var_data=upload_files_context_var_data,
+        _var_data=VarData.merge(upload_files_context_var_data, id_var._var_data),
     )
 
 
@@ -99,7 +106,9 @@ def cancel_upload(upload_id: str) -> EventSpec:
     Returns:
         An event spec that cancels the upload when triggered.
     """
-    return call_script(f"upload_controllers[{upload_id!r}]?.abort()")
+    return call_script(
+        f"upload_controllers[{Var.create_safe(upload_id, _var_is_string=True)._var_name_unwrapped!r}]?.abort()"
+    )
 
 
 def get_upload_dir() -> Path:
@@ -122,8 +131,8 @@ uploaded_files_url_prefix: Var = Var.create_safe(
     _var_is_string=False,
     _var_data=VarData(
         imports={
-            f"/{Dirs.STATE_PATH}": [imports.ImportVar(tag="getBackendURL")],
-            "/env.json": [imports.ImportVar(tag="env", is_default=True)],
+            f"/{Dirs.STATE_PATH}": "getBackendURL",
+            "/env.json": ImportVar(tag="env", is_default=True),
         }
     ),
 )
@@ -205,6 +214,9 @@ class Upload(MemoizationLeaf):
     # Marked True when any Upload component is created.
     is_used: ClassVar[bool] = False
 
+    # Fired when files are dropped.
+    on_drop: EventHandler[_on_drop_spec]
+
     @classmethod
     def create(cls, *children, **props) -> Component:
         """Create an upload component.
@@ -269,17 +281,6 @@ class Upload(MemoizationLeaf):
             **upload_props,
         )
 
-    def get_event_triggers(self) -> dict[str, Union[Var, Any]]:
-        """Get the event triggers that pass the component's value to the handler.
-
-        Returns:
-            A dict mapping the event trigger to the var that is passed to the handler.
-        """
-        return {
-            **super().get_event_triggers(),
-            constants.EventTriggers.ON_DROP: _on_drop_spec,
-        }
-
     @classmethod
     def _update_arg_tuple_for_on_drop(cls, arg_value: tuple[Var, Var]):
         """Helper to update caller-provided EventSpec args for direct use with on_drop.

reflex/components/core/upload.pyi

@@ -9,8 +9,7 @@ from reflex.event import EventChain, EventHandler, EventSpec
 from reflex.style import Style
 import os
 from pathlib import Path
-from typing import Any, Callable, ClassVar, Dict, List, Optional, Union
-from reflex import constants
+from typing import Callable, ClassVar, Dict, List, Optional
 from reflex.components.component import Component, ComponentNamespace, MemoizationLeaf
 from reflex.components.el.elements.forms import Input
 from reflex.components.radix.themes.layout.box import Box
@@ -18,12 +17,13 @@ from reflex.constants import Dirs
 from reflex.event import (
     CallableEventSpec,
     EventChain,
+    EventHandler,
     EventSpec,
     call_event_fn,
     call_script,
     parse_args_spec,
 )
-from reflex.utils import imports
+from reflex.utils.imports import ImportVar
 from reflex.vars import BaseVar, CallableVar, Var, VarData
 
 DEFAULT_UPLOAD_ID: str
@@ -218,7 +218,6 @@ class Upload(MemoizationLeaf):
             The upload component.
         """
         ...
-    def get_event_triggers(self) -> dict[str, Union[Var, Any]]: ...
 
 class StyledUpload(Upload):
     @overload

reflex/components/datadisplay/__init__.py

@@ -1,4 +1,5 @@
 """Data grid components."""
+
 from __future__ import annotations
 
 from reflex.utils import lazy_loader

reflex/components/datadisplay/code.py

@@ -1,4 +1,5 @@
 """A code component."""
+
 from __future__ import annotations
 
 import re
@@ -12,8 +13,8 @@ from reflex.components.core.cond import color_mode_cond
 from reflex.constants.colors import Color
 from reflex.event import set_clipboard
 from reflex.style import Style
-from reflex.utils import format, imports
-from reflex.utils.imports import ImportVar
+from reflex.utils import format
+from reflex.utils.imports import ImportDict, ImportVar
 from reflex.vars import Var
 
 LiteralCodeBlockTheme = Literal[
@@ -381,42 +382,45 @@ class CodeBlock(Component):
     # Props passed down to the code tag.
     code_tag_props: Var[Dict[str, str]]
 
-    def _get_imports(self) -> imports.ImportDict:
-        merged_imports = super()._get_imports()
-        # Get all themes from a cond literal
+    def add_imports(self) -> ImportDict:
+        """Add imports for the CodeBlock component.
+
+        Returns:
+            The import dict.
+        """
+        imports_: ImportDict = {}
         themes = re.findall(r"`(.*?)`", self.theme._var_name)
         if not themes:
             themes = [self.theme._var_name]
-        merged_imports = imports.merge_imports(
-            merged_imports,
+
+        imports_.update(
             {
-                f"react-syntax-highlighter/dist/cjs/styles/prism/{self.convert_theme_name(theme)}": {
+                f"react-syntax-highlighter/dist/cjs/styles/prism/{self.convert_theme_name(theme)}": [
                     ImportVar(
                         tag=format.to_camel_case(self.convert_theme_name(theme)),
                         is_default=True,
                         install=False,
                     )
-                }
+                ]
                 for theme in themes
-            },
+            }
         )
+
         if (
             self.language is not None
             and self.language._var_name in LiteralCodeLanguage.__args__  # type: ignore
         ):
-            merged_imports = imports.merge_imports(
-                merged_imports,
-                {
-                    f"react-syntax-highlighter/dist/cjs/languages/prism/{self.language._var_name}": {
-                        ImportVar(
-                            tag=format.to_camel_case(self.language._var_name),
-                            is_default=True,
-                            install=False,
-                        )
-                    }
-                },
-            )
-        return merged_imports
+            imports_[
+                f"react-syntax-highlighter/dist/cjs/languages/prism/{self.language._var_name}"
+            ] = [
+                ImportVar(
+                    tag=format.to_camel_case(self.language._var_name),
+                    is_default=True,
+                    install=False,
+                )
+            ]
+
+        return imports_
 
     def _get_custom_code(self) -> Optional[str]:
         if (

reflex/components/datadisplay/code.pyi

@@ -17,8 +17,8 @@ from reflex.components.core.cond import color_mode_cond
 from reflex.constants.colors import Color
 from reflex.event import set_clipboard
 from reflex.style import Style
-from reflex.utils import format, imports
-from reflex.utils.imports import ImportVar
+from reflex.utils import format
+from reflex.utils.imports import ImportDict, ImportVar
 from reflex.vars import Var
 
 LiteralCodeBlockTheme = Literal[
@@ -351,6 +351,7 @@ LiteralCodeLanguage = Literal[
 ]
 
 class CodeBlock(Component):
+    def add_imports(self) -> ImportDict: ...
     @overload
     @classmethod
     def create(  # type: ignore
@@ -1111,6 +1112,7 @@ class CodeBlock(Component):
             The text component.
         """
         ...
+
     def add_style(self): ...
     @staticmethod
     def convert_theme_name(theme) -> str: ...

reflex/components/datadisplay/dataeditor.py

@@ -1,14 +1,16 @@
 """Data Editor component from glide-data-grid."""
+
 from __future__ import annotations
 
 from enum import Enum
-from typing import Any, Callable, Dict, List, Literal, Optional, Union
+from typing import Any, Dict, List, Literal, Optional, Union
 
 from reflex.base import Base
 from reflex.components.component import Component, NoSSRComponent
 from reflex.components.literals import LiteralRowMarker
-from reflex.utils import console, format, imports, types
-from reflex.utils.imports import ImportVar
+from reflex.event import EventHandler
+from reflex.utils import console, format, types
+from reflex.utils.imports import ImportDict, ImportVar
 from reflex.utils.serializers import serializer
 from reflex.vars import Var, get_unique_variable_name
 
@@ -103,6 +105,19 @@ class DataEditorTheme(Base):
     text_medium: Optional[str] = None
 
 
+def on_edit_spec(pos, data: dict[str, Any]):
+    """The on edit spec function.
+
+    Args:
+        pos: The position of the edit event.
+        data: The data of the edit event.
+
+    Returns:
+        The position and data.
+    """
+    return [pos, data]
+
+
 class DataEditor(NoSSRComponent):
     """The DataEditor Component."""
 
@@ -205,51 +220,66 @@ class DataEditor(NoSSRComponent):
     # global theme
     theme: Var[Union[DataEditorTheme, Dict]]
 
-    def _get_imports(self):
-        return imports.merge_imports(
-            super()._get_imports(),
-            {
-                "": {
-                    ImportVar(
-                        tag=f"{format.format_library_name(self.library)}/dist/index.css"
-                    )
-                },
-                self.library: {ImportVar(tag="GridCellKind")},
-                "/utils/helpers/dataeditor.js": {
-                    ImportVar(
-                        tag=f"formatDataEditorCells", is_default=False, install=False
-                    ),
-                },
-            },
-        )
+    # Fired when a cell is activated.
+    on_cell_activated: EventHandler[lambda pos: [pos]]
 
-    def get_event_triggers(self) -> Dict[str, Callable]:
-        """The event triggers of the component.
+    # Fired when a cell is clicked.
+    on_cell_clicked: EventHandler[lambda pos: [pos]]
 
-        Returns:
-            The dict describing the event triggers.
-        """
+    # Fired when a cell is right-clicked.
+    on_cell_context_menu: EventHandler[lambda pos: [pos]]
+
+    # Fired when a cell is edited.
+    on_cell_edited: EventHandler[on_edit_spec]
+
+    # Fired when a group header is clicked.
+    on_group_header_clicked: EventHandler[on_edit_spec]
+
+    # Fired when a group header is right-clicked.
+    on_group_header_context_menu: EventHandler[lambda grp_idx, data: [grp_idx, data]]
+
+    # Fired when a group header is renamed.
+    on_group_header_renamed: EventHandler[lambda idx, val: [idx, val]]
+
+    # Fired when a header is clicked.
+    on_header_clicked: EventHandler[lambda pos: [pos]]
+
+    # Fired when a header is right-clicked.
+    on_header_context_menu: EventHandler[lambda pos: [pos]]
+
+    # Fired when a header menu item is clicked.
+    on_header_menu_click: EventHandler[lambda col, pos: [col, pos]]
 
-        def edit_sig(pos, data: dict[str, Any]):
-            return [pos, data]
+    # Fired when an item is hovered.
+    on_item_hovered: EventHandler[lambda pos: [pos]]
 
+    # Fired when a selection is deleted.
+    on_delete: EventHandler[lambda selection: [selection]]
+
+    # Fired when editing is finished.
+    on_finished_editing: EventHandler[lambda new_value, movement: [new_value, movement]]
+
+    # Fired when a row is appended.
+    on_row_appended: EventHandler[lambda: []]
+
+    # Fired when the selection is cleared.
+    on_selection_cleared: EventHandler[lambda: []]
+
+    # Fired when a column is resized.
+    on_column_resize: EventHandler[lambda col, width: [col, width]]
+
+    def add_imports(self) -> ImportDict:
+        """Add imports for the component.
+
+        Returns:
+            The import dict.
+        """
         return {
-            "on_cell_activated": lambda pos: [pos],
-            "on_cell_clicked": lambda pos: [pos],
-            "on_cell_context_menu": lambda pos: [pos],
-            "on_cell_edited": edit_sig,
-            "on_group_header_clicked": edit_sig,
-            "on_group_header_context_menu": lambda grp_idx, data: [grp_idx, data],
-            "on_group_header_renamed": lambda idx, val: [idx, val],
-            "on_header_clicked": lambda pos: [pos],
-            "on_header_context_menu": lambda pos: [pos],
-            "on_header_menu_click": lambda col, pos: [col, pos],
-            "on_item_hovered": lambda pos: [pos],
-            "on_delete": lambda selection: [selection],
-            "on_finished_editing": lambda new_value, movement: [new_value, movement],
-            "on_row_appended": lambda: [],
-            "on_selection_cleared": lambda: [],
-            "on_column_resize": lambda col, width: [col, width],
+            "": f"{format.format_library_name(self.library)}/dist/index.css",
+            self.library: "GridCellKind",
+            "/utils/helpers/dataeditor.js": ImportVar(
+                tag="formatDataEditorCells", is_default=False, install=False
+            ),
         }
 
     def add_hooks(self) -> list[str]:
@@ -363,43 +393,6 @@ class DataEditor(NoSSRComponent):
         }
 
 
-# try:
-#     pass
-
-#     # def format_dataframe_values(df: DataFrame) -> list[list[Any]]:
-#     #     """Format dataframe values to a list of lists.
-
-#     #     Args:
-#     #         df: The dataframe to format.
-
-#     #     Returns:
-#     #         The dataframe as a list of lists.
-#     #     """
-#     # return [
-#     #     [str(d) if isinstance(d, (list, tuple)) else d for d in data]
-#     #     for data in list(df.values.tolist())
-#     # ]
-#     # ...
-
-#     # @serializer
-#     # def serialize_dataframe(df: DataFrame) -> dict:
-#     #     """Serialize a pandas dataframe.
-
-#     #     Args:
-#     #         df: The dataframe to serialize.
-
-#     #     Returns:
-#     #         The serialized dataframe.
-#     #     """
-#     # return {
-#     #     "columns": df.columns.tolist(),
-#     #     "data": format_dataframe_values(df),
-#     # }
-
-# except ImportError:
-#     pass
-
-
 @serializer
 def serialize_dataeditortheme(theme: DataEditorTheme):
     """The serializer for the data editor theme.

reflex/components/datadisplay/dataeditor.pyi

@@ -8,12 +8,13 @@ from reflex.vars import Var, BaseVar, ComputedVar
 from reflex.event import EventChain, EventHandler, EventSpec
 from reflex.style import Style
 from enum import Enum
-from typing import Any, Callable, Dict, List, Literal, Optional, Union
+from typing import Any, Dict, List, Literal, Optional, Union
 from reflex.base import Base
 from reflex.components.component import Component, NoSSRComponent
 from reflex.components.literals import LiteralRowMarker
-from reflex.utils import console, format, imports, types
-from reflex.utils.imports import ImportVar
+from reflex.event import EventHandler
+from reflex.utils import console, format, types
+from reflex.utils.imports import ImportDict, ImportVar
 from reflex.utils.serializers import serializer
 from reflex.vars import Var, get_unique_variable_name
 
@@ -79,8 +80,10 @@ class DataEditorTheme(Base):
     text_light: Optional[str]
     text_medium: Optional[str]
 
+def on_edit_spec(pos, data: dict[str, Any]): ...
+
 class DataEditor(NoSSRComponent):
-    def get_event_triggers(self) -> Dict[str, Callable]: ...
+    def add_imports(self) -> ImportDict: ...
     def add_hooks(self) -> list[str]: ...
     @overload
     @classmethod
@@ -136,6 +139,9 @@ class DataEditor(NoSSRComponent):
         class_name: Optional[Any] = None,
         autofocus: Optional[bool] = None,
         custom_attrs: Optional[Dict[str, Union[Var, str]]] = None,
+        on_blur: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
         on_cell_activated: Optional[
             Union[EventHandler, EventSpec, list, function, BaseVar]
         ] = None,
@@ -148,15 +154,27 @@ class DataEditor(NoSSRComponent):
         on_cell_edited: Optional[
             Union[EventHandler, EventSpec, list, function, BaseVar]
         ] = None,
+        on_click: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
         on_column_resize: Optional[
             Union[EventHandler, EventSpec, list, function, BaseVar]
         ] = None,
+        on_context_menu: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
         on_delete: Optional[
             Union[EventHandler, EventSpec, list, function, BaseVar]
         ] = None,
+        on_double_click: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
         on_finished_editing: Optional[
             Union[EventHandler, EventSpec, list, function, BaseVar]
         ] = None,
+        on_focus: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
         on_group_header_clicked: Optional[
             Union[EventHandler, EventSpec, list, function, BaseVar]
         ] = None,
@@ -178,12 +196,42 @@ class DataEditor(NoSSRComponent):
         on_item_hovered: Optional[
             Union[EventHandler, EventSpec, list, function, BaseVar]
         ] = None,
+        on_mount: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
+        on_mouse_down: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
+        on_mouse_enter: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
+        on_mouse_leave: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
+        on_mouse_move: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
+        on_mouse_out: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
+        on_mouse_over: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
+        on_mouse_up: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
         on_row_appended: Optional[
             Union[EventHandler, EventSpec, list, function, BaseVar]
         ] = None,
+        on_scroll: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
         on_selection_cleared: Optional[
             Union[EventHandler, EventSpec, list, function, BaseVar]
         ] = None,
+        on_unmount: Optional[
+            Union[EventHandler, EventSpec, list, function, BaseVar]
+        ] = None,
         **props
     ) -> "DataEditor":
         """Create the DataEditor component.

reflex/components/datadisplay/logo.py

@@ -1,4 +1,5 @@
 """A Reflex logo component."""
+
 import reflex as rx
 
 

reflex/components/el/__init__.py

@@ -1,4 +1,5 @@
 """The el package exports raw HTML elements."""
+
 from __future__ import annotations
 
 from reflex.utils import lazy_loader

reflex/components/el/__init__.pyi

@@ -101,6 +101,9 @@ from .elements.media import picture as picture
 from .elements.media import portal as portal
 from .elements.media import source as source
 from .elements.media import svg as svg
+from .elements.media import defs as defs
+from .elements.media import lineargradient as lineargradient
+from .elements.media import stop as stop
 from .elements.media import path as path
 from .elements.media import Area as Area
 from .elements.media import Audio as Audio
@@ -115,17 +118,22 @@ from .elements.media import Picture as Picture
 from .elements.media import Portal as Portal
 from .elements.media import Source as Source
 from .elements.media import Svg as Svg
+from .elements.media import Defs as Defs
+from .elements.media import Lineargradient as Lineargradient
+from .elements.media import Stop as Stop
 from .elements.media import Path as Path
 from .elements.metadata import base as base
 from .elements.metadata import head as head
 from .elements.metadata import link as link
 from .elements.metadata import meta as meta
 from .elements.metadata import title as title
+from .elements.metadata import style as style
 from .elements.metadata import Base as Base
 from .elements.metadata import Head as Head
 from .elements.metadata import Link as Link
 from .elements.metadata import Meta as Meta
 from .elements.metadata import Title as Title
+from .elements.metadata import Style as Style
 from .elements.other import details as details
 from .elements.other import dialog as dialog
 from .elements.other import summary as summary

reflex/components/el/element.py

@@ -1,6 +1,5 @@
 """Base class definition for raw HTML elements."""
 
-
 from reflex.components.component import Component
 
 

reflex/components/el/elements/__init__.py

@@ -1,4 +1,5 @@
 """Element classes."""
+
 from __future__ import annotations
 
 from reflex.utils import lazy_loader
@@ -64,6 +65,9 @@ _MAPPING = {
         "portal",
         "source",
         "svg",
+        "defs",
+        "lineargradient",
+        "stop",
         "path",
     ],
     "metadata": [
@@ -72,6 +76,7 @@ _MAPPING = {
         "link",
         "meta",
         "title",
+        "style",
     ],
     "other": ["details", "dialog", "summary", "slot", "template", "math", "html"],
     "scripts": ["canvas", "noscript", "script"],