Skip to content

Commit

Permalink
fix(transition): ensure flattened transition group children inherit p…
Browse files Browse the repository at this point in the history
…arent keys

close #4718
close #5360
close #5392
  • Loading branch information
yyx990803 committed Apr 12, 2022
1 parent 68bb8f2 commit 4311ddd
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions packages/runtime-core/src/components/BaseTransition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,9 @@ const BaseTransitionImpl: ComponentOptions = {
if (
__DEV__ &&
mode &&
mode !== 'in-out' && mode !== 'out-in' && mode !== 'default'
mode !== 'in-out' &&
mode !== 'out-in' &&
mode !== 'default'
) {
warn(`invalid <transition> mode: ${mode}`)
}
Expand Down Expand Up @@ -460,22 +462,28 @@ export function setTransitionHooks(vnode: VNode, hooks: TransitionHooks) {

export function getTransitionRawChildren(
children: VNode[],
keepComment: boolean = false
keepComment: boolean = false,
parentKey?: VNode['key']
): VNode[] {
let ret: VNode[] = []
let keyedFragmentCount = 0
for (let i = 0; i < children.length; i++) {
const child = children[i]
let child = children[i]
// #5360 inherit parent key in case of <template v-for>
const key =
parentKey == null
? child.key
: String(parentKey) + String(child.key != null ? child.key : i)
// handle fragment children case, e.g. v-for
if (child.type === Fragment) {
if (child.patchFlag & PatchFlags.KEYED_FRAGMENT) keyedFragmentCount++
ret = ret.concat(
getTransitionRawChildren(child.children as VNode[], keepComment)
getTransitionRawChildren(child.children as VNode[], keepComment, key)
)
}
// comment placeholders should be skipped, e.g. v-if
else if (keepComment || child.type !== Comment) {
ret.push(child)
ret.push(key != null ? cloneVNode(child, { key }) : child)
}
}
// #1126 if a transition children list contains multiple sub fragments, these
Expand Down

0 comments on commit 4311ddd

Please sign in to comment.