fix(keep-alive): add test case and modify code

vuejs · Jul 18, 2024 · 12afb29 · 12afb29
1 parent 5901f25
commit 12afb29
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/packages/runtime-core/__tests__/components/KeepAlive.spec.ts b/packages/runtime-core/__tests__/components/KeepAlive.spec.ts
@@ -539,6 +539,16 @@ describe('KeepAlive', () => {
       await nextTick()
       assertHookCalls(one, [2, 2, 1, 1, 1])
       assertHookCalls(two, [1, 1, 1, 1, 0])
+
+      includeRef.value = ''
+      await nextTick()
+      assertHookCalls(one, [2, 2, 1, 1, 1])
+      assertHookCalls(two, [1, 1, 1, 1, 1])
+
+      viewRef.value = 'two'
+      await nextTick()
+      assertHookCalls(one, [2, 2, 1, 1, 2])
+      assertHookCalls(two, [2, 2, 1, 1, 1])
     })
 
     test('on exclude change', async () => {

diff --git a/packages/runtime-core/src/components/KeepAlive.ts b/packages/runtime-core/src/components/KeepAlive.ts
@@ -220,9 +220,8 @@ const KeepAliveImpl: ComponentOptions = {
     watch(
       () => [props.include, props.exclude],
       ([include, exclude]) => {
-        ;(include || typeof include === 'string') &&
-          pruneCache(name => matches(include, name))
-        exclude && pruneCache(name => !matches(exclude, name))
+        include != null && pruneCache(name => matches(include, name))
+        exclude != null && pruneCache(name => !matches(exclude, name))
       },
       // prune post-render after `current` has been updated
       { flush: 'post', deep: true },
@@ -301,9 +300,8 @@ const KeepAliveImpl: ComponentOptions = {
       const { include, exclude, max } = props
 
       if (
-        ((include || typeof include === 'string') &&
-          (!name || !matches(include, name))) ||
-        (exclude && name && matches(exclude, name))
+        (include != null && (!name || !matches(include, name))) ||
+        (exclude != null && name && matches(exclude, name))
       ) {
         current = vnode
         return rawVNode