Merge remote-tracking branch 'origin/main' into release/reflex-0.8.27

Author: adhami3310

pyi_hashes.json

@@ -23,7 +23,7 @@
   "reflex/components/core/window_events.pyi": "af33ccec866b9540ee7fbec6dbfbd151",
   "reflex/components/datadisplay/__init__.pyi": "52755871369acbfd3a96b46b9a11d32e",
   "reflex/components/datadisplay/code.pyi": "b86769987ef4d1cbdddb461be88539fd",
-  "reflex/components/datadisplay/dataeditor.pyi": "fb26f3e702fcb885539d1cf82a854be3",
+  "reflex/components/datadisplay/dataeditor.pyi": "f8c1e816c9f22f4a7429f812214407f2",
   "reflex/components/datadisplay/shiki_code_block.pyi": "1d53e75b6be0d3385a342e7b3011babd",
   "reflex/components/el/__init__.pyi": "0adfd001a926a2a40aee94f6fa725ecc",
   "reflex/components/el/element.pyi": "c5974a92fbc310e42d0f6cfdd13472f4",

pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
   "click >=8.2",
   "granian[reload] >=2.5.5",
   "httpx >=0.23.3,<1.0",
-  "packaging >=24.2,<26",
+  "packaging >=24.2,<27",
   "platformdirs >=4.3.7,<5.0",
   "psutil >=7.0.0,<8.0; sys_platform == 'win32'",
   "pydantic >=1.10.21,<3.0",

reflex/.templates/web/utils/state.js

@@ -446,6 +446,16 @@ export const applyRestEvent = async (event, socket, navigate, params) => {
   return eventSent;
 };
 
+/**
+ * Resolve a socket reference to the actual socket object.
+ * Handles both ref objects ({ current: Socket }) and raw sockets.
+ * @param socket Either a ref object or raw socket.
+ * @returns The actual socket object.
+ */
+const resolveSocket = (socket) => {
+  return socket?.current ?? socket;
+};
+
 /**
  * Queue events to be processed and trigger processing of queue.
  * @param events Array of events to queue.
@@ -471,7 +481,7 @@ export const queueEvents = async (
     ];
   }
   event_queue.push(...events.filter((e) => e !== undefined && e !== null));
-  await processEvent(socket.current, navigate, params);
+  await processEvent(resolveSocket(socket), navigate, params);
 };
 
 /**

reflex/app.py

@@ -77,13 +77,13 @@
 from reflex.event import (
     _EVENT_FIELDS,
     Event,
-    EventHandler,
     EventSpec,
     EventType,
     IndividualEventType,
     get_hydrate_event,
     noop,
 )
+from reflex.istate.proxy import StateProxy
 from reflex.page import DECORATED_PAGES
 from reflex.route import (
     get_route_args,
@@ -1619,6 +1619,8 @@ def _process_background(
         if not handler.is_background:
             return None
 
+        substate = StateProxy(substate)
+
         async def _coro():
             """Coroutine to process the event and emit updates inside an asyncio.Task.
 
@@ -1934,21 +1936,14 @@ async def upload_file(request: Request):
         substate_token = _substate_key(token, handler.rpartition(".")[0])
         state = await app.state_manager.get_state(substate_token)
 
-        # get the current session ID
-        # get the current state(parent state/substate)
-        path = handler.split(".")[:-1]
-        current_state = state.get_substate(path)
         handler_upload_param = ()
 
-        # get handler function
-        func = getattr(type(current_state), handler.split(".")[-1])
+        _current_state, event_handler = state._get_event_handler(handler)
 
-        # check if there exists any handler args with annotation, list[UploadFile]
-        if isinstance(func, EventHandler):
-            if func.is_background:
-                msg = f"@rx.event(background=True) is not supported for upload handler `{handler}`."
-                raise UploadTypeError(msg)
-            func = func.fn
+        if event_handler.is_background:
+            msg = f"@rx.event(background=True) is not supported for upload handler `{handler}`."
+            raise UploadTypeError(msg)
+        func = event_handler.fn
         if isinstance(func, functools.partial):
             func = func.func
         for k, v in get_type_hints(func).items():

reflex/components/core/debounce.py

@@ -111,6 +111,7 @@ def create(cls, *children: Component, **props: Any) -> Component:
         child_ref = child.get_ref()
         if props.get("input_ref") is None and child_ref:
             props["input_ref"] = Var(_js_expr=child_ref, _var_type=str)
+        if child.id is not None:
             props["id"] = child.id
 
         # Set the child element to wrap, including any imports/hooks from the child.

reflex/components/datadisplay/dataeditor.py

@@ -240,7 +240,7 @@ class DataEditor(NoSSRComponent):
     # Determines the height of each row.
     row_height: Var[int]
 
-    # Kind of row markers.
+    # Kind of row markers. Options are: "none", "number", "checkbox", "both", "checkbox-visible", "clickable-number".
     row_markers: Var[LiteralRowMarker]
 
     # Changes the starting index for row markers.
@@ -291,6 +291,9 @@ class DataEditor(NoSSRComponent):
     # Controls which types of row selections can exist at the same time. ("exclusive", "mixed").
     row_selection_blending: Var[Literal["exclusive", "mixed"]]
 
+    # Controls row marker selection behavior. "auto" adapts to touch/mouse, "multi" acts as if Ctrl is pressed. ("auto", "multi").
+    row_selection_mode: Var[Literal["auto", "multi"]]
+
     # Controls how spans are handled in selections. ("default", "allowPartial").
     span_range_behavior: Var[Literal["default", "allowPartial"]]
 
@@ -357,6 +360,12 @@ class DataEditor(NoSSRComponent):
     # Fired when a column is resized.
     on_column_resize: EventHandler[passthrough_event_spec(GridColumn, int)]
 
+    # Shows search bar.
+    show_search: Var[bool]
+
+    # Fired when the search close button is clicked.
+    on_search_close: EventHandler[no_args_event_spec]
+
     def add_imports(self) -> ImportDict:
         """Add imports for the component.
 

reflex/components/field.py

@@ -67,7 +67,9 @@ class FieldBasedMeta(type):
     PropsBaseMeta and BaseComponentMeta.
     """
 
-    def __new__(cls, name: str, bases: tuple[type], namespace: dict[str, Any]) -> type:
+    def __new__(
+        cls, name: str, bases: tuple[type, ...], namespace: dict[str, Any]
+    ) -> type:
         """Create a new field-based class.
 
         Args:
@@ -100,7 +102,7 @@ def __new__(cls, name: str, bases: tuple[type], namespace: dict[str, Any]) -> ty
         return super().__new__(cls, name, bases, namespace)
 
     @classmethod
-    def _collect_inherited_fields(cls, bases: tuple[type]) -> dict[str, Any]:
+    def _collect_inherited_fields(cls, bases: tuple[type, ...]) -> dict[str, Any]:
         inherited_fields: dict[str, Any] = {}
 
         # Collect inherited fields from base classes

reflex/components/literals.py

@@ -29,4 +29,6 @@
 ]
 
 
-LiteralRowMarker = Literal["none", "number", "checkbox", "both", "clickable-number"]
+LiteralRowMarker = Literal[
+    "none", "number", "checkbox", "both", "checkbox-visible", "clickable-number"
+]

reflex/event.py

@@ -89,6 +89,7 @@ def substate_token(self) -> str:
 _EVENT_FIELDS: set[str] = {f.name for f in dataclasses.fields(Event)}
 
 BACKGROUND_TASK_MARKER = "_reflex_background_task"
+EVENT_ACTIONS_MARKER = "_rx_event_actions"
 
 
 @dataclasses.dataclass(
@@ -2311,6 +2312,7 @@ class EventNamespace:
 
     # Constants
     BACKGROUND_TASK_MARKER = BACKGROUND_TASK_MARKER
+    EVENT_ACTIONS_MARKER = EVENT_ACTIONS_MARKER
     _EVENT_FIELDS = _EVENT_FIELDS
     FORM_DATA = FORM_DATA
     upload_files = upload_files
@@ -2461,7 +2463,7 @@ def wrapper(
             # Store decorator event actions on the function for later processing
             event_actions = _build_event_actions()
             if event_actions:
-                func._rx_event_actions = event_actions  # pyright: ignore [reportFunctionMemberAccess]
+                setattr(func, EVENT_ACTIONS_MARKER, event_actions)
             return func  # pyright: ignore [reportReturnType]
 
         if func is not None:

reflex/istate/proxy.py

@@ -26,6 +26,7 @@
     from reflex.state import BaseState, StateUpdate
 
 T_STATE = TypeVar("T_STATE", bound="BaseState")
+T = TypeVar("T")
 
 
 class StateProxy(wrapt.ObjectProxy):
@@ -671,19 +672,23 @@ def __deepcopy__(self, memo: dict[int, Any] | None = None) -> Any:
         return copy.deepcopy(self.__wrapped__, memo=memo)
 
     def __reduce_ex__(self, protocol_version: SupportsIndex):
-        """Get the state for redis serialization.
+        """Serialize the wrapped object for pickle, stripping off the proxy.
 
-        This method is called by cloudpickle to serialize the object.
-
-        It explicitly serializes the wrapped object, stripping off the mutable proxy.
+        Returns a function that reconstructs to the wrapped object directly,
+        ensuring pickle's memo system correctly tracks object identity.
 
         Args:
             protocol_version: The protocol version.
 
         Returns:
-            Tuple of (wrapped class, empty args, class __getstate__)
+            Tuple that reconstructs to the wrapped object.
         """
-        return self.__wrapped__.__reduce_ex__(protocol_version)
+        return (_unwrap_for_pickle, (self.__wrapped__,))
+
+
+def _unwrap_for_pickle(obj: T) -> T:
+    """Return the object unchanged. Used by MutableProxy.__reduce_ex__."""
+    return obj
 
 
 @serializer