Independent States

reflex/state.py

@@ -1464,18 +1464,18 @@ def _as_state_update(
         Returns:
             The valid StateUpdate containing the events and final flag.
         """
-        # get the delta from the root of the state tree
+        # Get the delta after processing the event.
+        delta = self.get_delta(include_substates=True)
         state = self
         while state.parent_state is not None:
             state = state.parent_state
+            delta.update(state.get_delta(include_substates=False))
 
         token = self.router.session.client_token
 
         # Convert valid EventHandler and EventSpec into Event
         fixed_events = fix_events(self._check_valid(handler, events), token)
 
-        # Get the delta after processing the event.
-        delta = state.get_delta()
         state._clean()
 
         return StateUpdate(
@@ -1589,9 +1589,12 @@ def _potentially_dirty_substates(cls) -> set[Type[BaseState]]:
             )
         return fetch_substates
 
-    def get_delta(self) -> Delta:
+    def get_delta(self, include_substates: bool = True) -> Delta:
         """Get the delta for the state.
 
+        Args:
+            include_substates: Whether to include substates in the delta.
+
         Returns:
             The delta for the state.
         """
@@ -1618,9 +1621,12 @@ def get_delta(self) -> Delta:
             delta[self.get_full_name()] = subdelta
 
         # Recursively find the substate deltas.
-        substates = self.substates
-        for substate in self.dirty_substates.union(self._always_dirty_substates):
-            delta.update(substates[substate].get_delta())
+        if include_substates:
+            substates = self.substates
+            for substate_name in self.dirty_substates.union(
+                self._always_dirty_substates
+            ):
+                delta.update(substates[substate_name].get_delta())
 
         # Format the delta.
         delta = format.format_state(delta)

tests/test_state.py

@@ -741,7 +741,6 @@ async def test_process_event_substate(test_state, child_state, grandchild_state)
     assert update.delta == {
         "test_state": {"sum": 3.14, "upper": ""},
         "test_state.child_state": {"value": "HI", "count": 24},
-        "test_state.child_state3.grandchild_state3": {"computed": ""},
     }
     test_state._clean()
 
@@ -757,7 +756,6 @@ async def test_process_event_substate(test_state, child_state, grandchild_state)
     assert update.delta == {
         "test_state": {"sum": 3.14, "upper": ""},
         "test_state.child_state.grandchild_state": {"value2": "new"},
-        "test_state.child_state3.grandchild_state3": {"computed": ""},
     }