Skip to content

Commit

Permalink
fix(runtime-core): do not use bail patchFlag on cloned vnodes
Browse files Browse the repository at this point in the history
fix #1665

- cloned vnodes with extra props will receive only the full props flag
- this commit affects `cloneVNode` behavior when used in manual render
  functions.
  - ok for normal elements since elements only use patchFlags for own
    props optimization
  - full props flag is skipped for fragments because fragments use
    patchFlags only for children optimization
  - this also affects `shouldUpdateComponent` where it should now only
    respect patchFlags in optimized mode, since component vnodes use
    the patchFlag for both props and slots optimization checks.
  • Loading branch information
yyx990803 committed Jul 21, 2020
1 parent 324167d commit 6390ddf
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 17 deletions.
4 changes: 2 additions & 2 deletions packages/runtime-core/src/componentRenderUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export function shouldUpdateComponent(
return true
}

if (patchFlag > 0) {
if (optimized && patchFlag > 0) {
if (patchFlag & PatchFlags.DYNAMIC_SLOTS) {
// slot content that references values that might have changed,
// e.g. in a v-for
Expand All @@ -300,7 +300,7 @@ export function shouldUpdateComponent(
}
}
}
} else if (!optimized) {
} else {
// this path is only taken by manually written render functions
// so presence of any children leads to a forced update
if (prevChildren || nextChildren) {
Expand Down
26 changes: 11 additions & 15 deletions packages/runtime-core/src/vnode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,11 @@ function _createVNode(
}

if (isVNode(type)) {
return cloneVNode(type, props, children)
const cloned = cloneVNode(type, props)
if (children) {
normalizeChildren(cloned, children)
}
return cloned
}

// class component normalization.
Expand Down Expand Up @@ -420,8 +424,7 @@ function _createVNode(

export function cloneVNode<T, U>(
vnode: VNode<T, U>,
extraProps?: Data & VNodeProps | null,
children?: unknown
extraProps?: Data & VNodeProps | null
): VNode<T, U> {
const props = extraProps
? vnode.props
Expand All @@ -430,7 +433,7 @@ export function cloneVNode<T, U>(
: vnode.props
// This is intentionally NOT using spread or extend to avoid the runtime
// key enumeration cost.
const cloned: VNode<T, U> = {
return {
__v_isVNode: true,
__v_skip: true,
type: vnode.type,
Expand All @@ -444,14 +447,11 @@ export function cloneVNode<T, U>(
staticCount: vnode.staticCount,
shapeFlag: vnode.shapeFlag,
// if the vnode is cloned with extra props, we can no longer assume its
// existing patch flag to be reliable and need to bail out of optimized mode.
// however we don't want block nodes to de-opt their children, so if the
// vnode is a block node, we only add the FULL_PROPS flag to it.
patchFlag: extraProps
? vnode.dynamicChildren
// existing patch flag to be reliable and need to add the FULL_PROPS flag.
patchFlag:
extraProps && vnode.type !== Fragment
? vnode.patchFlag | PatchFlags.FULL_PROPS
: PatchFlags.BAIL
: vnode.patchFlag,
: vnode.patchFlag,
dynamicProps: vnode.dynamicProps,
dynamicChildren: vnode.dynamicChildren,
appContext: vnode.appContext,
Expand All @@ -467,10 +467,6 @@ export function cloneVNode<T, U>(
el: vnode.el,
anchor: vnode.anchor
}
if (children) {
normalizeChildren(cloned, children)
}
return cloned
}

/**
Expand Down

0 comments on commit 6390ddf

Please sign in to comment.