Skip to content

fix(Transition): ensure enterHooks is fresh after clone #11066

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

Merged
merged 5 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions packages/runtime-core/src/components/BaseTransition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,13 @@ const BaseTransitionImpl: ComponentOptions = {
return emptyPlaceholder(child)
}

const enterHooks = resolveTransitionHooks(
let enterHooks = resolveTransitionHooks(
innerChild,
rawProps,
state,
instance,
// #11061, ensure enterHooks is fresh after clone
hooks => (enterHooks = hooks),
)
setTransitionHooks(innerChild, enterHooks)

Expand Down Expand Up @@ -299,6 +301,7 @@ export function resolveTransitionHooks(
props: BaseTransitionProps<any>,
state: TransitionState,
instance: ComponentInternalInstance,
postClone?: (hooks: TransitionHooks) => void,
): TransitionHooks {
const {
appear,
Expand Down Expand Up @@ -439,7 +442,15 @@ export function resolveTransitionHooks(
},

clone(vnode) {
return resolveTransitionHooks(vnode, props, state, instance)
const hooks = resolveTransitionHooks(
vnode,
props,
state,
instance,
postClone,
)
if (postClone) postClone(hooks)
return hooks
},
}

Expand Down
10 changes: 8 additions & 2 deletions packages/runtime-core/src/vnode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ import {
isSuspense,
} from './components/Suspense'
import type { DirectiveBinding } from './directives'
import type { TransitionHooks } from './components/BaseTransition'
import {
type TransitionHooks,
setTransitionHooks,
} from './components/BaseTransition'
import { warn } from './warning'
import {
type Teleport,
Expand Down Expand Up @@ -691,7 +694,10 @@ export function cloneVNode<T, U>(
// to clone the transition to ensure that the vnode referenced within
// the transition hooks is fresh.
if (transition && cloneTransition) {
cloned.transition = transition.clone(cloned as VNode)
setTransitionHooks(
cloned as VNode,
transition.clone(cloned as VNode) as TransitionHooks,
)
}

if (__COMPAT__) {
Expand Down
92 changes: 92 additions & 0 deletions packages/vue/__tests__/e2e/Transition.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1263,6 +1263,98 @@ describe('e2e: Transition', () => {
E2E_TIMEOUT,
)

// #11061
test(
'transition + fallthrough attrs (in-out mode)',
async () => {
const beforeLeaveSpy = vi.fn()
const onLeaveSpy = vi.fn()
const afterLeaveSpy = vi.fn()
const beforeEnterSpy = vi.fn()
const onEnterSpy = vi.fn()
const afterEnterSpy = vi.fn()

await page().exposeFunction('onLeaveSpy', onLeaveSpy)
await page().exposeFunction('onEnterSpy', onEnterSpy)
await page().exposeFunction('beforeLeaveSpy', beforeLeaveSpy)
await page().exposeFunction('beforeEnterSpy', beforeEnterSpy)
await page().exposeFunction('afterLeaveSpy', afterLeaveSpy)
await page().exposeFunction('afterEnterSpy', afterEnterSpy)

await page().evaluate(() => {
const { onEnterSpy, onLeaveSpy } = window as any
const { createApp, ref } = (window as any).Vue
createApp({
components: {
one: {
template: '<div>one</div>',
},
two: {
template: '<div>two</div>',
},
},
template: `
<div id="container">
<transition foo="1" name="test" mode="in-out"
@before-enter="beforeEnterSpy()"
@enter="onEnterSpy()"
@after-enter="afterEnterSpy()"
@before-leave="beforeLeaveSpy()"
@leave="onLeaveSpy()"
@after-leave="afterLeaveSpy()">
<component :is="view"></component>
</transition>
</div>
<button id="toggleBtn" @click="click">button</button>
`,
setup: () => {
const view = ref('one')
const click = () =>
(view.value = view.value === 'one' ? 'two' : 'one')
return {
view,
click,
beforeEnterSpy,
onEnterSpy,
afterEnterSpy,
beforeLeaveSpy,
onLeaveSpy,
afterLeaveSpy,
}
},
}).mount('#app')
})
expect(await html('#container')).toBe('<div foo="1">one</div>')

// toggle
await click('#toggleBtn')
await nextTick()
await transitionFinish()
expect(beforeEnterSpy).toBeCalledTimes(1)
expect(onEnterSpy).toBeCalledTimes(1)
expect(afterEnterSpy).toBeCalledTimes(1)
expect(beforeLeaveSpy).toBeCalledTimes(1)
expect(onLeaveSpy).toBeCalledTimes(1)
expect(afterLeaveSpy).toBeCalledTimes(1)

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

// toggle back
await click('#toggleBtn')
await nextTick()
await transitionFinish()
expect(beforeEnterSpy).toBeCalledTimes(2)
expect(onEnterSpy).toBeCalledTimes(2)
expect(afterEnterSpy).toBeCalledTimes(2)
expect(beforeLeaveSpy).toBeCalledTimes(2)
expect(onLeaveSpy).toBeCalledTimes(2)
expect(afterLeaveSpy).toBeCalledTimes(2)

expect(await html('#container')).toBe('<div foo="1" class="">one</div>')
},
E2E_TIMEOUT,
)

test(
'w/ KeepAlive + unmount innerChild',
async () => {
Expand Down