Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix(runtime-core): fix keep-alive cache prune logic on vnodes with sa…
…me type but different keys (#7510)

fix #7355
  • Loading branch information
GRPdream committed Feb 1, 2023
1 parent f19f803 commit 1fde49c
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions packages/runtime-core/src/components/KeepAlive.ts
Expand Up @@ -12,7 +12,8 @@ import {
cloneVNode,
isVNode,
VNodeProps,
invokeVNodeHook
invokeVNodeHook,
isSameVNodeType
} from '../vnode'
import { warn } from '../warning'
import {
Expand Down Expand Up @@ -193,7 +194,7 @@ const KeepAliveImpl: ComponentOptions = {

function pruneCacheEntry(key: CacheKey) {
const cached = cache.get(key) as VNode
if (!current || cached.type !== current.type) {
if (!current || !isSameVNodeType(cached, current)) {
unmount(cached)
} else if (current) {
// current active instance should no longer be kept-alive.
Expand Down Expand Up @@ -230,7 +231,7 @@ const KeepAliveImpl: ComponentOptions = {
cache.forEach(cached => {
const { subTree, suspense } = instance
const vnode = getInnerChild(subTree)
if (cached.type === vnode.type) {
if (cached.type === vnode.type && cached.key === vnode.key) {
// current instance will be unmounted as part of keep-alive's unmount
resetShapeFlag(vnode)
// but invoke its deactivated hook here
Expand Down

0 comments on commit 1fde49c

Please sign in to comment.