Skip to content

Commit

Permalink
fix(transition-group): should collect raw children with Fragment (#1046)
Browse files Browse the repository at this point in the history
fix #1045
  • Loading branch information
underfin authored Apr 30, 2020
1 parent ba240eb commit 8ed3455
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions packages/runtime-dom/src/components/TransitionGroup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,7 @@ const TransitionGroupImpl = {
const cssTransitionProps = resolveTransitionProps(rawProps)
const tag = rawProps.tag || Fragment
prevChildren = children
children = slots.default ? slots.default() : []

// handle fragment children case, e.g. v-for
if (children.length === 1 && children[0].type === Fragment) {
children = children[0].children as VNode[]
}
children = getTransitionRawChildren(slots.default ? slots.default() : [])

for (let i = 0; i < children.length; i++) {
const child = children[i]
Expand Down Expand Up @@ -136,6 +131,20 @@ const TransitionGroupImpl = {
}
}

function getTransitionRawChildren(children: VNode[]): VNode[] {
let ret: VNode[] = []
for (let i = 0; i < children.length; i++) {
const child = children[i]
// handle fragment children case, e.g. v-for
if (child.type === Fragment) {
ret = ret.concat(getTransitionRawChildren(child.children as VNode[]))
} else {
ret.push(child)
}
}
return ret
}

// remove mode props as TransitionGroup doesn't support it
delete TransitionGroupImpl.props.mode

Expand Down

0 comments on commit 8ed3455

Please sign in to comment.