fix(keep-alive): handle "0" as cache key (#1622)

fix #1621
This commit is contained in:
zhangzhonghe 2020-07-20 01:31:07 +08:00 committed by GitHub
parent 8facaefcc3
commit 2deb0c7a74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 2 deletions

View File

@ -182,7 +182,8 @@ const KeepAliveImpl = {
// cache sub tree in beforeMount/Update (i.e. right after the render) // cache sub tree in beforeMount/Update (i.e. right after the render)
let pendingCacheKey: CacheKey | null = null let pendingCacheKey: CacheKey | null = null
const cacheSubtree = () => { const cacheSubtree = () => {
if (pendingCacheKey) { // fix #1621, the pendingCacheKey could be 0
if (pendingCacheKey != null) {
cache.set(pendingCacheKey, instance.subTree) cache.set(pendingCacheKey, instance.subTree)
} }
} }

View File

@ -1,4 +1,4 @@
import { createApp } from '../src' import { createApp, ref, nextTick } from '../src'
import { mockWarn } from '@vue/shared' import { mockWarn } from '@vue/shared'
describe('compiler + runtime integration', () => { describe('compiler + runtime integration', () => {
@ -18,6 +18,62 @@ describe('compiler + runtime integration', () => {
expect(container.innerHTML).toBe(`0`) expect(container.innerHTML).toBe(`0`)
}) })
it('keep-alive with compiler + runtime integration', async () => {
const container = document.createElement('div')
const one = {
name: 'one',
template: 'one',
created: jest.fn(),
mounted: jest.fn(),
activated: jest.fn(),
deactivated: jest.fn(),
destroyed: jest.fn()
}
const toggle = ref(true)
const App = {
template: `
<keep-alive>
<one v-if="toggle"></one>
</keep-alive>
`,
data() {
return {
toggle
}
},
components: {
One: one
}
}
createApp(App).mount(container)
expect(container.innerHTML).toBe(`one`)
expect(one.created).toHaveBeenCalledTimes(1)
expect(one.mounted).toHaveBeenCalledTimes(1)
expect(one.activated).toHaveBeenCalledTimes(1)
expect(one.deactivated).toHaveBeenCalledTimes(0)
expect(one.destroyed).toHaveBeenCalledTimes(0)
toggle.value = false;
await nextTick()
expect(container.innerHTML).toBe(`<!--v-if-->`)
expect(one.created).toHaveBeenCalledTimes(1)
expect(one.mounted).toHaveBeenCalledTimes(1)
expect(one.activated).toHaveBeenCalledTimes(1)
expect(one.deactivated).toHaveBeenCalledTimes(1)
expect(one.destroyed).toHaveBeenCalledTimes(0)
toggle.value = true;
await nextTick()
expect(container.innerHTML).toBe(`one`)
expect(one.created).toHaveBeenCalledTimes(1)
expect(one.mounted).toHaveBeenCalledTimes(1)
expect(one.activated).toHaveBeenCalledTimes(2)
expect(one.deactivated).toHaveBeenCalledTimes(1)
expect(one.destroyed).toHaveBeenCalledTimes(0)
})
it('should support runtime template via CSS ID selector', () => { it('should support runtime template via CSS ID selector', () => {
const container = document.createElement('div') const container = document.createElement('div')
const template = document.createElement('div') const template = document.createElement('div')