mirror of https://github.com/vuejs/core.git
fix(hmr/transition): fix kept-alive component inside transition disappearing after hmr (#7126)
fix #7121
This commit is contained in:
parent
40f4b77bb5
commit
d11e978fc9
|
@ -218,6 +218,75 @@ describe('hot module replacement', () => {
|
||||||
expect(deactiveSpy).toHaveBeenCalledTimes(1)
|
expect(deactiveSpy).toHaveBeenCalledTimes(1)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// #7121
|
||||||
|
test('reload KeepAlive slot in Transition', async () => {
|
||||||
|
const root = nodeOps.createElement('div')
|
||||||
|
const childId = 'test-transition-keep-alive-reload'
|
||||||
|
const unmountSpy = vi.fn()
|
||||||
|
const mountSpy = vi.fn()
|
||||||
|
const activeSpy = vi.fn()
|
||||||
|
const deactiveSpy = vi.fn()
|
||||||
|
|
||||||
|
const Child: ComponentOptions = {
|
||||||
|
__hmrId: childId,
|
||||||
|
data() {
|
||||||
|
return { count: 0 }
|
||||||
|
},
|
||||||
|
unmounted: unmountSpy,
|
||||||
|
render: compileToFunction(`<div>{{ count }}</div>`)
|
||||||
|
}
|
||||||
|
createRecord(childId, Child)
|
||||||
|
|
||||||
|
const Parent: ComponentOptions = {
|
||||||
|
components: { Child },
|
||||||
|
data() {
|
||||||
|
return { toggle: true }
|
||||||
|
},
|
||||||
|
render: compileToFunction(
|
||||||
|
`<button @click="toggle = !toggle"></button><BaseTransition mode="out-in"><KeepAlive><Child v-if="toggle" /></KeepAlive></BaseTransition>`
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
render(h(Parent), root)
|
||||||
|
expect(serializeInner(root)).toBe(`<button></button><div>0</div>`)
|
||||||
|
|
||||||
|
reload(childId, {
|
||||||
|
__hmrId: childId,
|
||||||
|
data() {
|
||||||
|
return { count: 1 }
|
||||||
|
},
|
||||||
|
mounted: mountSpy,
|
||||||
|
unmounted: unmountSpy,
|
||||||
|
activated: activeSpy,
|
||||||
|
deactivated: deactiveSpy,
|
||||||
|
render: compileToFunction(`<div>{{ count }}</div>`)
|
||||||
|
})
|
||||||
|
await nextTick()
|
||||||
|
expect(serializeInner(root)).toBe(`<button></button><div>1</div>`)
|
||||||
|
expect(unmountSpy).toHaveBeenCalledTimes(1)
|
||||||
|
expect(mountSpy).toHaveBeenCalledTimes(1)
|
||||||
|
expect(activeSpy).toHaveBeenCalledTimes(1)
|
||||||
|
expect(deactiveSpy).toHaveBeenCalledTimes(0)
|
||||||
|
|
||||||
|
// should not unmount when toggling
|
||||||
|
triggerEvent(root.children[1] as TestElement, 'click')
|
||||||
|
await nextTick()
|
||||||
|
expect(serializeInner(root)).toBe(`<button></button><!---->`)
|
||||||
|
expect(unmountSpy).toHaveBeenCalledTimes(1)
|
||||||
|
expect(mountSpy).toHaveBeenCalledTimes(1)
|
||||||
|
expect(activeSpy).toHaveBeenCalledTimes(1)
|
||||||
|
expect(deactiveSpy).toHaveBeenCalledTimes(1)
|
||||||
|
|
||||||
|
// should not mount when toggling
|
||||||
|
triggerEvent(root.children[1] as TestElement, 'click')
|
||||||
|
await nextTick()
|
||||||
|
expect(serializeInner(root)).toBe(`<button></button><div>1</div>`)
|
||||||
|
expect(unmountSpy).toHaveBeenCalledTimes(1)
|
||||||
|
expect(mountSpy).toHaveBeenCalledTimes(1)
|
||||||
|
expect(activeSpy).toHaveBeenCalledTimes(2)
|
||||||
|
expect(deactiveSpy).toHaveBeenCalledTimes(1)
|
||||||
|
})
|
||||||
|
|
||||||
test('reload class component', async () => {
|
test('reload class component', async () => {
|
||||||
const root = nodeOps.createElement('div')
|
const root = nodeOps.createElement('div')
|
||||||
const childId = 'test4-child'
|
const childId = 'test4-child'
|
||||||
|
|
|
@ -473,7 +473,11 @@ function emptyPlaceholder(vnode: VNode): VNode | undefined {
|
||||||
|
|
||||||
function getKeepAliveChild(vnode: VNode): VNode | undefined {
|
function getKeepAliveChild(vnode: VNode): VNode | undefined {
|
||||||
return isKeepAlive(vnode)
|
return isKeepAlive(vnode)
|
||||||
? vnode.children
|
? // #7121 ensure get the child component subtree in case
|
||||||
|
// it's been replaced during HMR
|
||||||
|
__DEV__ && vnode.component
|
||||||
|
? vnode.component.subTree
|
||||||
|
: vnode.children
|
||||||
? ((vnode.children as VNodeArrayChildren)[0] as VNode)
|
? ((vnode.children as VNodeArrayChildren)[0] as VNode)
|
||||||
: undefined
|
: undefined
|
||||||
: vnode
|
: vnode
|
||||||
|
|
Loading…
Reference in New Issue