root
/
vue3-core
mirror of https://github.com/vuejs/core.git
1
0
Fork 0
Code Issues Actions 5 Packages Projects Releases Wiki Activity

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

This commit is contained in:
Evan You 2020-09-17 23:49:06 -04:00
parent 49bb44756f
commit 5bfcad155b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/runtime-core/__tests__/components/Suspense.spec.ts
View File

@ -380,8 +380,8 @@ describe('Suspense', () => {
await Promise.all(deps) await Promise.all(deps)
await nextTick() await nextTick()
expect(serializeInner(root)).toBe(`<!---->`) expect(serializeInner(root)).toBe(`<!---->`)
// should discard effects (except for unmount) // should discard effects
expect(calls).toEqual(['unmounted']) expect(calls).toEqual([])
}) })
test('unmount suspense after resolve', async () => { test('unmount suspense after resolve', async () => {

3
packages/runtime-core/src/components/Suspense.ts
View File

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