theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(KeepAlive): when exclude prop change, it should prune cache that not matched (#2111)

Browse Source
This commit is contained in:
HuangYi 2020-09-15 22:33:50 +08:00 committed by GitHub
parent d4bf9bcbb4
commit 98cc1f9d84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
packages/runtime-core/__tests__/components/KeepAlive.spec.ts
View File

@ -494,7 +494,25 @@ describe('KeepAlive', () => {
return { viewRef, includeRef }
}
test('on include/exclude change', async () => {
function setupExclude() {
const viewRef = ref('one')
const excludeRef = ref('')
const App = {
render() {
return h(
KeepAlive,
{
exclude: excludeRef.value
},
() => h(views[viewRef.value])
)
}
}
render(h(App), root)
return { viewRef, excludeRef }
}
test('on include change', async () => {
const { viewRef, includeRef } = setup()
viewRef.value = 'two'
@ -513,7 +531,26 @@ describe('KeepAlive', () => {
assertHookCalls(two, [1, 1, 1, 1, 0])
})
test('on include/exclude change + view switch', async () => {
test('on exclude change', async () => {
const { viewRef, excludeRef } = setupExclude()
viewRef.value = 'two'
await nextTick()
assertHookCalls(one, [1, 1, 1, 1, 0])
assertHookCalls(two, [1, 1, 1, 0, 0])
excludeRef.value = 'one'
await nextTick()
assertHookCalls(one, [1, 1, 1, 1, 1])
assertHookCalls(two, [1, 1, 1, 0, 0])
viewRef.value = 'one'
await nextTick()
assertHookCalls(one, [2, 2, 1, 1, 1])
assertHookCalls(two, [1, 1, 1, 1, 0])
})
test('on include change + view switch', async () => {
const { viewRef, includeRef } = setup()
viewRef.value = 'two'
@ -529,6 +566,22 @@ describe('KeepAlive', () => {
assertHookCalls(two, [1, 1, 1, 1, 1])
})
test('on exclude change + view switch', async () => {
const { viewRef, excludeRef } = setupExclude()
viewRef.value = 'two'
await nextTick()
assertHookCalls(one, [1, 1, 1, 1, 0])
assertHookCalls(two, [1, 1, 1, 0, 0])
excludeRef.value = 'two'
viewRef.value = 'one'
await nextTick()
assertHookCalls(one, [1, 1, 2, 1, 0])
// two should be pruned
assertHookCalls(two, [1, 1, 1, 1, 1])
})
test('should not prune current active instance', async () => {
const { viewRef, includeRef } = setup()

2
packages/runtime-core/src/components/KeepAlive.ts
View File

@ -175,7 +175,7 @@ const KeepAliveImpl = {
() => [props.include, props.exclude],
([include, exclude]) => {
include && pruneCache(name => matches(include, name))
exclude && pruneCache(name => matches(exclude, name))
exclude && pruneCache(name => !matches(exclude, name))
}
)