fix(Transition): fix transition memory leak edge case (#12182)
close #12181
This commit is contained in:
parent
4aeff318bd
commit
660132df6c
|
@ -198,8 +198,7 @@ const BaseTransitionImpl: ComponentOptions = {
|
||||||
setTransitionHooks(innerChild, enterHooks)
|
setTransitionHooks(innerChild, enterHooks)
|
||||||
}
|
}
|
||||||
|
|
||||||
const oldChild = instance.subTree
|
let oldInnerChild = instance.subTree && getInnerChild(instance.subTree)
|
||||||
const oldInnerChild = oldChild && getInnerChild(oldChild)
|
|
||||||
|
|
||||||
// handle mode
|
// handle mode
|
||||||
if (
|
if (
|
||||||
|
@ -208,7 +207,7 @@ const BaseTransitionImpl: ComponentOptions = {
|
||||||
!isSameVNodeType(innerChild, oldInnerChild) &&
|
!isSameVNodeType(innerChild, oldInnerChild) &&
|
||||||
recursiveGetSubtree(instance).type !== Comment
|
recursiveGetSubtree(instance).type !== Comment
|
||||||
) {
|
) {
|
||||||
const leavingHooks = resolveTransitionHooks(
|
let leavingHooks = resolveTransitionHooks(
|
||||||
oldInnerChild,
|
oldInnerChild,
|
||||||
rawProps,
|
rawProps,
|
||||||
state,
|
state,
|
||||||
|
@ -228,6 +227,7 @@ const BaseTransitionImpl: ComponentOptions = {
|
||||||
instance.update()
|
instance.update()
|
||||||
}
|
}
|
||||||
delete leavingHooks.afterLeave
|
delete leavingHooks.afterLeave
|
||||||
|
oldInnerChild = undefined
|
||||||
}
|
}
|
||||||
return emptyPlaceholder(child)
|
return emptyPlaceholder(child)
|
||||||
} else if (mode === 'in-out' && innerChild.type !== Comment) {
|
} else if (mode === 'in-out' && innerChild.type !== Comment) {
|
||||||
|
@ -238,18 +238,27 @@ const BaseTransitionImpl: ComponentOptions = {
|
||||||
) => {
|
) => {
|
||||||
const leavingVNodesCache = getLeavingNodesForType(
|
const leavingVNodesCache = getLeavingNodesForType(
|
||||||
state,
|
state,
|
||||||
oldInnerChild,
|
oldInnerChild!,
|
||||||
)
|
)
|
||||||
leavingVNodesCache[String(oldInnerChild.key)] = oldInnerChild
|
leavingVNodesCache[String(oldInnerChild!.key)] = oldInnerChild!
|
||||||
// early removal callback
|
// early removal callback
|
||||||
el[leaveCbKey] = () => {
|
el[leaveCbKey] = () => {
|
||||||
earlyRemove()
|
earlyRemove()
|
||||||
el[leaveCbKey] = undefined
|
el[leaveCbKey] = undefined
|
||||||
delete enterHooks.delayedLeave
|
delete enterHooks.delayedLeave
|
||||||
|
oldInnerChild = undefined
|
||||||
}
|
}
|
||||||
enterHooks.delayedLeave = delayedLeave
|
enterHooks.delayedLeave = () => {
|
||||||
|
delayedLeave()
|
||||||
|
delete enterHooks.delayedLeave
|
||||||
|
oldInnerChild = undefined
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
oldInnerChild = undefined
|
||||||
|
}
|
||||||
|
} else if (oldInnerChild) {
|
||||||
|
oldInnerChild = undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
return child
|
return child
|
||||||
|
|
Loading…
Reference in New Issue