Add/tweak changesets and apply the same fix for Vue and Svelte libs

statelyai · Aug 27, 2021 · fe3e859 · fe3e859
1 parent 49abc07
commit fe3e859
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 6 deletions.
diff --git a/.changeset/little-teachers-sing.md b/.changeset/little-teachers-sing.md
@@ -2,4 +2,15 @@
 'xstate': patch
 ---
 
-Allow for lazy context in machine.withConfig
+author: @farskid
+author: @Andarist
+
+Adjusted TS type definitions of the `withContext` and `withConfig` methods so that they accept "lazy context" now.
+
+Example:
+
+```js
+const copy = machine.withContext(() => ({
+  ref: spawn(() => {})
+}));
+```
diff --git a/.changeset/sixty-shoes-develop.md b/.changeset/sixty-shoes-develop.md
@@ -0,0 +1,19 @@
+---
+'@xstate/react': patch
+'@xstate/vue': patch
+'@xstate/svelte': patch
+---
+
+author: @farskid
+author: @Andarist
+
+Fixed an issue with actors not being spawned correctly by `useMachine` and `useInterpret` when they were defined a lazily evaluated context, like for example here:
+
+```js
+createMachine({
+  // lazy context
+  context: () => ({
+    ref: spawn(() => {})
+  })
+});
+```
diff --git a/packages/xstate-react/test/useMachine.test.tsx b/packages/xstate-react/test/useMachine.test.tsx
@@ -544,7 +544,7 @@ describe('useMachine hook', () => {
   it('should successfully spawn actors from the lazily declared context', () => {
     let childSpawned = false;
 
-    const machine = createMachine({
+    createMachine({
       context: () => ({
         ref: spawn(() => {
           childSpawned = true;

diff --git a/packages/xstate-svelte/src/index.ts b/packages/xstate-svelte/src/index.ts
@@ -55,10 +55,10 @@ export function useMachine<
     delays
   };
 
-  const resolvedMachine = machine.withConfig(machineConfig, {
+  const resolvedMachine = machine.withConfig(machineConfig, () => ({
     ...machine.context,
     ...context
-  } as TContext);
+  }));
 
   const service = interpret(resolvedMachine, interpreterOptions).start(
     rehydratedState ? new State(rehydratedState) : undefined

diff --git a/packages/xstate-vue/src/useInterpret.ts b/packages/xstate-vue/src/useInterpret.ts
@@ -67,10 +67,10 @@ export function useInterpret<
     delays
   };
 
-  const machineWithConfig = machine.withConfig(machineConfig, {
+  const machineWithConfig = machine.withConfig(machineConfig, () => ({
     ...machine.context,
     ...context
-  } as TContext);
+  }));
 
   const service = interpret(machineWithConfig, interpreterOptions).start(
     rehydratedState ? (State.create(rehydratedState) as any) : undefined