Fixed an issue with actors deep in the tree failing to rehydrate (#4491)

statelyai · Nov 23, 2023 · c0025c3 · c0025c3
1 parent 1008cee
commit c0025c3
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 4 deletions.
diff --git a/.changeset/deep-actor-rehydration.md b/.changeset/deep-actor-rehydration.md
@@ -0,0 +1,5 @@
+---
+'xstate': patch
+---
+
+Fixed an issue with actors deep in the tree failing to rehydrate.
diff --git a/packages/core/src/StateMachine.ts b/packages/core/src/StateMachine.ts
@@ -560,13 +560,11 @@ export class StateMachine<
         return;
       }
 
-      const actorState = logic.restoreState?.(childState, _actorScope);
-
       const actorRef = createActor(logic, {
         id: actorId,
         parent: _actorScope?.self,
         syncSnapshot: actorData.syncSnapshot,
-        state: actorState,
+        state: childState,
         src,
         systemId: actorData.systemId
       });

diff --git a/packages/core/test/rehydration.test.ts b/packages/core/test/rehydration.test.ts
@@ -3,7 +3,9 @@ import {
   createMachine,
   createActor,
   fromPromise,
-  fromObservable
+  fromObservable,
+  assign,
+  sendTo
 } from '../src/index.ts';
 
 describe('rehydration', () => {
@@ -364,4 +366,72 @@ describe('rehydration', () => {
 
     expect(spy.mock.calls).toEqual([[42], [100]]);
   });
+
+  it('should be able to rehydrate an actor deep in the tree', () => {
+    const grandchild = createMachine({
+      context: {
+        count: 0
+      },
+      on: {
+        INC: {
+          actions: assign({
+            count: ({ context }) => context.count + 1
+          })
+        }
+      }
+    });
+    const child = createMachine(
+      {
+        invoke: {
+          src: 'grandchild',
+          id: 'grandchild'
+        },
+        on: {
+          INC: {
+            actions: sendTo('grandchild', {
+              type: 'INC'
+            })
+          }
+        }
+      },
+      {
+        actors: {
+          grandchild
+        }
+      }
+    );
+    const machine = createMachine(
+      {
+        invoke: {
+          src: 'child',
+          id: 'child'
+        },
+        on: {
+          INC: {
+            actions: sendTo('child', {
+              type: 'INC'
+            })
+          }
+        }
+      },
+      {
+        actors: {
+          child
+        }
+      }
+    );
+
+    const actorRef = createActor(machine).start();
+    actorRef.send({ type: 'INC' });
+
+    const persistedState = actorRef.getPersistedState();
+    const actorRef2 = createActor(machine, { state: persistedState });
+
+    expect(
+      actorRef2
+        .getSnapshot()
+        .children.child.getSnapshot()
+        .children.grandchild.getSnapshot().context.count
+    ).toBe(1);
+  });
 });