fix(suspense): should discard unmount effects of invalidated pending …

…branch
vuejs · Sep 18, 2020 · 5bfcad1 · 5bfcad1
1 parent 49bb447
commit 5bfcad1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/runtime-core/__tests__/components/Suspense.spec.ts b/packages/runtime-core/__tests__/components/Suspense.spec.ts
@@ -380,8 +380,8 @@ describe('Suspense', () => {
     await Promise.all(deps)
     await nextTick()
     expect(serializeInner(root)).toBe(`<!---->`)
-    // should discard effects (except for unmount)
-    expect(calls).toEqual(['unmounted'])
+    // should discard effects
+    expect(calls).toEqual([])
   })
 
   test('unmount suspense after resolve', async () => {

diff --git a/packages/runtime-core/src/components/Suspense.ts b/packages/runtime-core/src/components/Suspense.ts
@@ -201,11 +201,12 @@ function patchSuspense(
         suspense.isHydrating = false
         suspense.activeBranch = pendingBranch
       } else {
-        unmount(pendingBranch, parentComponent, null)
+        unmount(pendingBranch, parentComponent, suspense)
       }
       // increment pending ID. this is used to invalidate async callbacks
       // reset suspense state
       suspense.deps = 0
+      // discard effects from pending branch
       suspense.effects.length = 0
       // discard previous container
       suspense.hiddenContainer = createElement('div')