Merge remote-tracking branch 'origin/main' into hybrid-properties

Author: masenf

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "mcr.microsoft.com/devcontainers/python:1-3.11-bookworm",
+  "image": "mcr.microsoft.com/devcontainers/python:3.14-trixie",
   "postCreateCommand": "/bin/bash -c 'python -m pip install uv && python -m uv sync & git clone https://github.com/reflex-dev/reflex-examples; wait'",
   "forwardPorts": [3000, 8000],
   "portsAttributes": {

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",
@@ -39,7 +39,7 @@
   "reflex/components/el/elements/tables.pyi": "686eb70ea7d8c4dafb0cc5c284e76184",
   "reflex/components/el/elements/typography.pyi": "684e83dde887dba12badd0fb75c87c04",
   "reflex/components/gridjs/datatable.pyi": "98a7e1b3f3b60cafcdfcd8879750ee42",
-  "reflex/components/lucide/icon.pyi": "9cdd1107295f5c4b6d5d6516f487f237",
+  "reflex/components/lucide/icon.pyi": "dcb8773ef162f3ec5759efe11374cf5e",
   "reflex/components/markdown/markdown.pyi": "dd74e8e9665b2a813ff799a7aa190b44",
   "reflex/components/moment/moment.pyi": "e1952f1c2c82cef85d91e970d1be64ab",
   "reflex/components/plotly/plotly.pyi": "4311a0aae2abcc9226abb6a273f96372",
@@ -113,10 +113,10 @@
   "reflex/components/react_player/video.pyi": "998671c06103d797c554d9278eb3b2a0",
   "reflex/components/react_router/dom.pyi": "3042fa630b7e26a7378fe045d7fbf4af",
   "reflex/components/recharts/__init__.pyi": "6ee7f1ca2c0912f389ba6f3251a74d99",
-  "reflex/components/recharts/cartesian.pyi": "cfca4f880239ffaecdf9fb4c7c8caed5",
+  "reflex/components/recharts/cartesian.pyi": "d138261ab8259d5208c2f028b9f708bd",
   "reflex/components/recharts/charts.pyi": "013036b9c00ad85a570efdb813c1bc40",
   "reflex/components/recharts/general.pyi": "d87ff9b85b2a204be01753690df4fb11",
-  "reflex/components/recharts/polar.pyi": "ad24bd37c6acc0bc9bd4ac01af3ffe49",
-  "reflex/components/recharts/recharts.pyi": "c41d19ab67972246c574098929bea7ea",
+  "reflex/components/recharts/polar.pyi": "b8b1a3e996e066facdf4f8c9eb363137",
+  "reflex/components/recharts/recharts.pyi": "d5c9fc57a03b419748f0408c23319eee",
   "reflex/components/sonner/toast.pyi": "3c27bad1aaeb5183eaa6a41e77e8d7f0"
 }

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "reflex"
-version = "0.8.27dev1"
+version = "0.8.28dev1"
 description = "Web apps in pure Python."
 license.text = "Apache-2.0"
 authors = [
@@ -244,7 +244,7 @@ fail_fast = true
 
 [[tool.pre-commit.repos]]
 repo = "https://github.com/astral-sh/ruff-pre-commit"
-rev = "v0.14.13"
+rev = "v0.15.1"
 hooks = [
   { id = "ruff-format", args = [
     "reflex",

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/assets.py

@@ -92,6 +92,11 @@ def asset(
         if not dst_file.exists() and (
             not dst_file.is_symlink() or dst_file.resolve() != src_file_shared.resolve()
         ):
-            dst_file.symlink_to(src_file_shared)
+            try:
+                dst_file.symlink_to(src_file_shared)
+            except FileExistsError:
+                # This happens when Simon builds the app on a bind mount in a docker container.
+                dst_file.unlink()
+                dst_file.symlink_to(src_file_shared)
 
     return f"/{external}/{subfolder}/{path}"

reflex/compiler/templates.py

@@ -502,6 +502,7 @@ def vite_config_template(
     force_full_reload: bool,
     experimental_hmr: bool,
     sourcemap: bool | Literal["inline", "hidden"],
+    allowed_hosts: bool | list[str] = False,
 ):
     """Template for vite.config.js.
 
@@ -511,10 +512,17 @@ def vite_config_template(
         force_full_reload: Whether to force a full reload on changes.
         experimental_hmr: Whether to enable experimental HMR features.
         sourcemap: The sourcemap configuration.
+        allowed_hosts: Allow all hosts (True), specific hosts (list of strings), or only localhost (False).
 
     Returns:
         Rendered vite.config.js content as string.
     """
+    if allowed_hosts is True:
+        allowed_hosts_line = "\n    allowedHosts: true,"
+    elif isinstance(allowed_hosts, list) and allowed_hosts:
+        allowed_hosts_line = f"\n    allowedHosts: {json.dumps(allowed_hosts)},"
+    else:
+        allowed_hosts_line = ""
     return rf"""import {{ fileURLToPath, URL }} from "url";
 import {{ reactRouter }} from "@react-router/dev/vite";
 import {{ defineConfig }} from "vite";
@@ -586,7 +594,7 @@ def vite_config_template(
     hmr: {"true" if experimental_hmr else "false"},
   }},
   server: {{
-    port: process.env.PORT,
+    port: process.env.PORT,{allowed_hosts_line}
     hmr: {"true" if hmr else "false"},
     watch: {{
       ignored: [

reflex/components/base/error_boundary.py

@@ -36,7 +36,7 @@ def on_error_spec(
 class ErrorBoundary(Component):
     """A React Error Boundary component that catches unhandled frontend exceptions."""
 
-    library = "react-error-boundary@6.1.0"
+    library = "react-error-boundary@6.1.1"
     tag = "ErrorBoundary"
 
     # Fired when the boundary catches an error.

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/core/upload.py

@@ -221,7 +221,7 @@ class GhostUpload(Fragment):
 class Upload(MemoizationLeaf):
     """A file upload component."""
 
-    library = "react-dropzone@14.3.8"
+    library = "react-dropzone@15.0.0"
 
     tag = ""