Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Suspense): avoid unmount activeBranch twice if wrapped in transition #9392

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
10 changes: 9 additions & 1 deletion packages/runtime-core/src/components/Suspense.ts
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ export interface SuspenseBoundary {
container: RendererElement
hiddenContainer: RendererElement
activeBranch: VNode | null
initialContent: VNode | null
pendingBranch: VNode | null
deps: number
pendingId: number
Expand Down Expand Up @@ -502,6 +503,7 @@ function createSuspenseBoundary(
pendingId: suspenseId++,
timeout: typeof timeout === 'number' ? timeout : -1,
activeBranch: null,
initialContent: null,
pendingBranch: null,
isInFallback: !isHydrating,
isHydrating,
Expand Down Expand Up @@ -554,7 +556,11 @@ function createSuspenseBoundary(
}
}
// unmount current active tree
if (activeBranch) {
// #7966 when Suspense is wrapped in Transition, the fallback node will be mounted
// in the afterLeave of Transition. This means that when Suspense is resolved,
// the activeBranch is not the fallback node but the initialContent.
// so avoid unmounting the activeBranch again.
if (activeBranch && activeBranch !== suspense.initialContent) {
// if the fallback tree was mounted, it may have been moved
// as part of a parent suspense. get the latest anchor for insertion
// #8105 if `delayEnter` is true, it means that the mounting of
Expand Down Expand Up @@ -631,6 +637,7 @@ function createSuspenseBoundary(

const anchor = next(activeBranch!)
const mountFallback = () => {
suspense.initialContent = null
if (!suspense.isInFallback) {
return
}
Expand All @@ -652,6 +659,7 @@ function createSuspenseBoundary(
const delayEnter =
fallbackVNode.transition && fallbackVNode.transition.mode === 'out-in'
if (delayEnter) {
suspense.initialContent = activeBranch!
activeBranch!.transition!.afterLeave = mountFallback
}
suspense.isInFallback = true
Expand Down
68 changes: 68 additions & 0 deletions packages/vue/__tests__/e2e/Transition.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1769,6 +1769,74 @@ describe('e2e: Transition', () => {
E2E_TIMEOUT,
)

test(
'avoid unmount activeBranch twice with Suspense (out-in mode + timeout="0")',
async () => {
const unmountSpy = vi.fn()
await page().exposeFunction('unmountSpy', unmountSpy)
await page().evaluate(() => {
const { createApp, shallowRef, h } = (window as any).Vue
const One = {
setup() {
return () =>
h(
'div',
{
onVnodeBeforeUnmount: () => unmountSpy(),
},
'one',
)
},
}
const Two = {
async setup() {
return () => h('div', null, 'two')
},
}
createApp({
template: `
<div id="container">
<transition mode="out-in">
<suspense timeout="0">
<template #default>
<component :is="view"></component>
</template>
<template #fallback>
<div>Loading...</div>
</template>
</suspense>
</transition>
</div>
<button id="toggleBtn" @click="click">button</button>
`,
setup: () => {
const view = shallowRef(One)
const click = () => {
view.value = view.value === One ? Two : One
}
return { view, click }
},
}).mount('#app')
})

expect(await html('#container')).toBe('<div>one</div>')

// leave
await classWhenTransitionStart()
await nextFrame()
expect(await html('#container')).toBe(
'<div class="v-enter-from v-enter-active">two</div>',
)

await transitionFinish()
expect(await html('#container')).toBe('<div class="">two</div>')

// should only call unmount once
expect(unmountSpy).toBeCalledTimes(1)
},
E2E_TIMEOUT,
)

// #5844
test('children mount should be called after html changes', async () => {
const fooMountSpy = vi.fn()
Expand Down