Skip to content
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

fix(keep-alive): only prune cache if include/exclude not null #11369

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
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
6 changes: 4 additions & 2 deletions packages/runtime-core/src/components/KeepAlive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ const KeepAliveImpl: ComponentOptions = {
watch(
() => [props.include, props.exclude],
([include, exclude]) => {
include && pruneCache(name => matches(include, name))
;(include || typeof include === 'string') &&
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can just be include != null

pruneCache(name => matches(include, name))
exclude && pruneCache(name => !matches(exclude, name))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For consistency, also check for exclude != null

},
// prune post-render after `current` has been updated
Expand Down Expand Up @@ -300,7 +301,8 @@ const KeepAliveImpl: ComponentOptions = {
const { include, exclude, max } = props

if (
(include && (!name || !matches(include, name))) ||
((include || typeof include === 'string') &&
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

(!name || !matches(include, name))) ||
(exclude && name && matches(exclude, name))
) {
current = vnode
Expand Down