refactor: bring back clone for reused nodes

This commit is contained in:
Evan You 2018-11-12 22:21:56 -05:00
parent 65c1ea8930
commit 6e424397d1

View File

@ -20,6 +20,7 @@ import {
MountedVNode, MountedVNode,
RenderNode, RenderNode,
createTextVNode, createTextVNode,
cloneVNode,
VNodeChildren VNodeChildren
} from './vdom' } from './vdom'
import { ComponentInstance } from './component' import { ComponentInstance } from './component'
@ -148,6 +149,10 @@ export function createRenderer(options: RendererOptions) {
endNode: RenderNode | null endNode: RenderNode | null
) { ) {
for (let i = 0; i < children.length; i++) { for (let i = 0; i < children.length; i++) {
let child = children[i]
if (child.el) {
children[i] = child = cloneVNode(child)
}
mount(children[i], container, contextVNode, isSVG, endNode) mount(children[i], container, contextVNode, isSVG, endNode)
} }
} }
@ -447,11 +452,6 @@ export function createRenderer(options: RendererOptions) {
contextVNode: MountedVNode | null, contextVNode: MountedVNode | null,
isSVG: boolean isSVG: boolean
) { ) {
if (prevVNode === nextVNode) {
nextVNode.el = prevVNode.el
return
}
const nextFlags = nextVNode.flags const nextFlags = nextVNode.flags
const prevFlags = prevVNode.flags const prevFlags = prevVNode.flags
@ -871,12 +871,19 @@ export function createRenderer(options: RendererOptions) {
for (i; i < commonLength; i++) { for (i; i < commonLength; i++) {
nextChild = nextChildren[i] nextChild = nextChildren[i]
prevChild = prevChildren[i] prevChild = prevChildren[i]
if (nextChild.el) {
nextChildren[i] = nextChild = cloneVNode(nextChild)
}
patch(prevChild, nextChild, container, contextVNode, isSVG) patch(prevChild, nextChild, container, contextVNode, isSVG)
prevChildren[i] = nextChild as MountedVNode prevChildren[i] = nextChild as MountedVNode
} }
if (prevLength < nextLength) { if (prevLength < nextLength) {
for (i = commonLength; i < nextLength; i++) { for (i = commonLength; i < nextLength; i++) {
mount(nextChildren[i], container, contextVNode, isSVG, endNode) nextChild = nextChildren[i]
if (nextChild.el) {
nextChildren[i] = nextChild = cloneVNode(nextChild)
}
mount(nextChild, container, contextVNode, isSVG, endNode)
} }
} else if (prevLength > nextLength) { } else if (prevLength > nextLength) {
for (i = commonLength; i < prevLength; i++) { for (i = commonLength; i < prevLength; i++) {
@ -906,6 +913,9 @@ export function createRenderer(options: RendererOptions) {
outer: { outer: {
// Sync nodes with the same key at the beginning. // Sync nodes with the same key at the beginning.
while (prevVNode.key === nextVNode.key) { while (prevVNode.key === nextVNode.key) {
if (nextVNode.el) {
nextChildren[j] = nextVNode = cloneVNode(nextVNode)
}
patch(prevVNode, nextVNode, container, contextVNode, isSVG) patch(prevVNode, nextVNode, container, contextVNode, isSVG)
prevChildren[j] = nextVNode as MountedVNode prevChildren[j] = nextVNode as MountedVNode
j++ j++
@ -921,6 +931,9 @@ export function createRenderer(options: RendererOptions) {
// Sync nodes with the same key at the end. // Sync nodes with the same key at the end.
while (prevVNode.key === nextVNode.key) { while (prevVNode.key === nextVNode.key) {
if (nextVNode.el) {
nextChildren[nextEnd] = nextVNode = cloneVNode(nextVNode)
}
patch(prevVNode, nextVNode, container, contextVNode, isSVG) patch(prevVNode, nextVNode, container, contextVNode, isSVG)
prevChildren[prevEnd] = nextVNode as MountedVNode prevChildren[prevEnd] = nextVNode as MountedVNode
prevEnd-- prevEnd--
@ -939,7 +952,11 @@ export function createRenderer(options: RendererOptions) {
const nextNode = const nextNode =
nextPos < nextLength ? nextChildren[nextPos].el : endNode nextPos < nextLength ? nextChildren[nextPos].el : endNode
while (j <= nextEnd) { while (j <= nextEnd) {
nextVNode = nextChildren[j++] nextVNode = nextChildren[j]
if (nextVNode.el) {
nextChildren[j] = nextVNode = cloneVNode(nextVNode)
}
j++
mount(nextVNode, container, contextVNode, isSVG, nextNode) mount(nextVNode, container, contextVNode, isSVG, nextNode)
} }
} }
@ -982,6 +999,9 @@ export function createRenderer(options: RendererOptions) {
} else { } else {
pos = j pos = j
} }
if (nextVNode.el) {
nextChildren[j] = nextVNode = cloneVNode(nextVNode)
}
patch(prevVNode, nextVNode, container, contextVNode, isSVG) patch(prevVNode, nextVNode, container, contextVNode, isSVG)
patched++ patched++
break break
@ -1023,6 +1043,9 @@ export function createRenderer(options: RendererOptions) {
} else { } else {
pos = j pos = j
} }
if (nextVNode.el) {
nextChildren[j] = nextVNode = cloneVNode(nextVNode)
}
patch(prevVNode, nextVNode, container, contextVNode, isSVG) patch(prevVNode, nextVNode, container, contextVNode, isSVG)
patched++ patched++
} else if (!canRemoveWholeContent) { } else if (!canRemoveWholeContent) {
@ -1051,6 +1074,9 @@ export function createRenderer(options: RendererOptions) {
if (sources[i] === 0) { if (sources[i] === 0) {
pos = i + nextStart pos = i + nextStart
nextVNode = nextChildren[pos] nextVNode = nextChildren[pos]
if (nextVNode.el) {
nextChildren[pos] = nextVNode = cloneVNode(nextVNode)
}
nextPos = pos + 1 nextPos = pos + 1
mount( mount(
nextVNode, nextVNode,
@ -1079,6 +1105,9 @@ export function createRenderer(options: RendererOptions) {
if (sources[i] === 0) { if (sources[i] === 0) {
pos = i + nextStart pos = i + nextStart
nextVNode = nextChildren[pos] nextVNode = nextChildren[pos]
if (nextVNode.el) {
nextChildren[pos] = nextVNode = cloneVNode(nextVNode)
}
nextPos = pos + 1 nextPos = pos + 1
mount( mount(
nextVNode, nextVNode,
@ -1199,8 +1228,8 @@ export function createRenderer(options: RendererOptions) {
} else { } else {
platformRemoveChild(container, el) platformRemoveChild(container, el)
} }
;(vnode as any).el = null
} }
;(vnode as any).el = null
} }
function queueRemoveChildren( function queueRemoveChildren(
@ -1516,6 +1545,9 @@ export function createRenderer(options: RendererOptions) {
function render(vnode: VNode | null, container: any) { function render(vnode: VNode | null, container: any) {
const prevVNode = container.vnode const prevVNode = container.vnode
if (vnode && vnode.el) {
vnode = cloneVNode(vnode)
}
if (prevVNode == null) { if (prevVNode == null) {
if (vnode) { if (vnode) {
mount(vnode, container, null, false, null) mount(vnode, container, null, false, null)