vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disentangle keyed and unkeyed diff

Browse source
This commit is contained in:
Pierre-Yves Gérardy 2018-04-15 23:08:12 +02:00 • committed by Pierre-Yves Gérardy
parent 898d0aec82
commit c6693aa361
1 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

45
render/render.js
View file

@ -256,40 +256,47 @@ module.exports = function($window) {
else if (old == null) createNodes(parent, vnodes, 0, vnodes.length, hooks, nextSibling, ns) else if (old == null) createNodes(parent, vnodes, 0, vnodes.length, hooks, nextSibling, ns)
else if (vnodes == null) removeNodes(old, 0, old.length) else if (vnodes == null) removeNodes(old, 0, old.length)
else { else {
var start = 0, commonLength = Math.min(old.length, vnodes.length), isUnkeyed = false var start = 0, oldStart = 0, isUnkeyed = false, isOldUnkeyed = false
for(; start < commonLength; start++) { for(; oldStart < old.length; oldStart++) {
if (old[start] != null && vnodes[start] != null) { if (old[oldStart] != null) {
if (old[start].key == null && vnodes[start].key == null) isUnkeyed = true isOldUnkeyed = old[oldStart].key == null
break break
} }
} }
if (isUnkeyed && old.length === vnodes.length) { for(; start < vnodes.length; start++) {
for (start = 0; start < vnodes.length; start++) { if (vnodes[start] != null) {
isUnkeyed = vnodes[start].key == null
break
}
}
if (isOldUnkeyed !== isUnkeyed) {
removeNodes(old, oldStart, old.length)
createNodes(parent, vnodes, start, vnodes.length, hooks, nextSibling, ns)
return
}
if (isUnkeyed) {
var commonLength = old.length < vnodes.length ? old.length : vnodes.length
start = start < oldStart ? start : oldStart
for (; start < commonLength; start++) {
if (old[start] === vnodes[start] || old[start] == null && vnodes[start] == null) continue if (old[start] === vnodes[start] || old[start] == null && vnodes[start] == null) continue
else if (old[start] == null) createNode(parent, vnodes[start], hooks, ns, getNextSibling(old, start + 1, nextSibling)) else if (old[start] == null) createNode(parent, vnodes[start], hooks, ns, getNextSibling(old, start + 1, nextSibling))
else if (vnodes[start] == null) removeNodes(old, start, start + 1) else if (vnodes[start] == null) removeNodes(old, start, start + 1)
else updateNode(parent, old[start], vnodes[start], hooks, getNextSibling(old, start + 1, nextSibling), ns) else updateNode(parent, old[start], vnodes[start], hooks, getNextSibling(old, start + 1, nextSibling), ns)
} }
if (old.length > commonLength) removeNodes(old, start, old.length)
if (vnodes.length > commonLength) createNodes(parent, vnodes, start, vnodes.length, hooks, nextSibling, ns)
return return
} }
var oldStart = start = 0, oldEnd = old.length - 1, end = vnodes.length - 1, map, o, v // keyed diff
var oldEnd = old.length - 1, end = vnodes.length - 1, map, o, v
while (oldEnd >= oldStart && end >= start) { while (oldEnd >= oldStart && end >= start) {
o = old[oldStart] o = old[oldStart]
v = vnodes[start] v = vnodes[start]
if (o === v || o == null && v == null) oldStart++, start++ if (o === v || o == null && v == null) oldStart++, start++
else if (o == null) { else if (o == null) oldStart++
if (isUnkeyed || v.key == null) { else if (v == null) start++
createNode(parent, vnodes[start], hooks, ns, getNextSibling(old, ++start, nextSibling)) else if (o.key === v.key) {
}
oldStart++
} else if (v == null) {
if (isUnkeyed || o.key == null) {
removeNodes(old, start, start + 1)
oldStart++
}
start++
} else if (o.key === v.key) {
oldStart++, start++ oldStart++, start++
updateNode(parent, o, v, hooks, getNextSibling(old, oldStart, nextSibling), ns) updateNode(parent, o, v, hooks, getNextSibling(old, oldStart, nextSibling), ns)
} else { } else {