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

render/updateNodes: Don't fetch the next sibling from the pool

Browse source
This commit is contained in:
Pierre-Yves Gérardy 2017-11-21 21:08:42 +01:00 • committed by Pierre-Yves Gérardy
parent eaa9f589af
commit e839c9e80a
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
render/render.js
View file

@ -178,9 +178,9 @@ module.exports = function($window) {
if (isUnkeyed) { if (isUnkeyed) {
for (var i = 0; i < originalOldLength; i++) { for (var i = 0; i < originalOldLength; i++) {
if (old[i] === vnodes[i] && !recyclingParent || old[i] == null && vnodes[i] == null) continue if (old[i] === vnodes[i] && !recyclingParent || old[i] == null && vnodes[i] == null) continue
else if (old[i] == null && vnodes[i] != null) createNode(parent, vnodes[i], hooks, ns, getNextSibling(old, i + 1, nextSibling)) else if (old[i] == null && vnodes[i] != null) createNode(parent, vnodes[i], hooks, ns, getNextSibling(old, i + 1, originalOldLength, nextSibling))
else if (vnodes[i] == null) removeNodes(old, i, i + 1, vnodes) else if (vnodes[i] == null) removeNodes(old, i, i + 1, vnodes)
else updateNode(parent, old[i], vnodes[i], hooks, getNextSibling(old, i + 1, nextSibling), recyclingParent, ns) else updateNode(parent, old[i], vnodes[i], hooks, getNextSibling(old, i + 1, originalOldLength, nextSibling), recyclingParent, ns)
} }
return return
} }
@ -200,7 +200,7 @@ module.exports = function($window) {
else if (v == null) start++ else if (v == null) start++
else if (o.key === v.key) { else if (o.key === v.key) {
oldStart++, start++ oldStart++, start++
updateNode(parent, o, v, hooks, getNextSibling(old, oldStart, nextSibling), oFromPool || recyclingParent, ns) updateNode(parent, o, v, hooks, getNextSibling(old, oldStart, originalOldLength, nextSibling), oFromPool || recyclingParent, ns)
if (oFromPool && o.tag === v.tag) insertNode(parent, toFragment(o), nextSibling) if (oFromPool && o.tag === v.tag) insertNode(parent, toFragment(o), nextSibling)
} }
else { else {
@ -210,8 +210,8 @@ module.exports = function($window) {
else if (o == null) oldEnd-- else if (o == null) oldEnd--
else if (v == null) start++ else if (v == null) start++
else if (o.key === v.key) { else if (o.key === v.key) {
updateNode(parent, o, v, hooks, getNextSibling(old, oldEnd + 1, nextSibling), oFromPool || recyclingParent, ns) updateNode(parent, o, v, hooks, getNextSibling(old, oldEnd + 1, originalOldLength, nextSibling), oFromPool || recyclingParent, ns)
if (oFromPool && o.tag === v.tag || start < end) insertNode(parent, toFragment(o), getNextSibling(old, oldStart, nextSibling)) if (oFromPool && o.tag === v.tag || start < end) insertNode(parent, toFragment(o), getNextSibling(old, oldStart, originalOldLength, nextSibling))
oldEnd--, start++ oldEnd--, start++
} }
else break else break
@ -225,7 +225,7 @@ module.exports = function($window) {
else if (o == null) oldEnd-- else if (o == null) oldEnd--
else if (v == null) end-- else if (v == null) end--
else if (o.key === v.key) { else if (o.key === v.key) {
updateNode(parent, o, v, hooks, getNextSibling(old, oldEnd + 1, nextSibling), oFromPool || recyclingParent, ns) updateNode(parent, o, v, hooks, getNextSibling(old, oldEnd + 1, originalOldLength, nextSibling), oFromPool || recyclingParent, ns)
if (oFromPool && o.tag === v.tag) insertNode(parent, toFragment(o), nextSibling) if (oFromPool && o.tag === v.tag) insertNode(parent, toFragment(o), nextSibling)
if (o.dom != null) nextSibling = o.dom if (o.dom != null) nextSibling = o.dom
oldEnd--, end-- oldEnd--, end--
@ -237,7 +237,7 @@ module.exports = function($window) {
if (oldIndex != null) { if (oldIndex != null) {
o = old[oldIndex] o = old[oldIndex]
oFromPool = hasPool && oldIndex >= originalOldLength oFromPool = hasPool && oldIndex >= originalOldLength
updateNode(parent, o, v, hooks, getNextSibling(old, oldEnd + 1, nextSibling), oFromPool || recyclingParent, ns) updateNode(parent, o, v, hooks, getNextSibling(old, oldEnd + 1, originalOldLength, nextSibling), oFromPool || recyclingParent, ns)
insertNode(parent, toFragment(o), nextSibling) insertNode(parent, toFragment(o), nextSibling)
o.skip = true o.skip = true
if (o.dom != null) nextSibling = o.dom if (o.dom != null) nextSibling = o.dom
@ -402,8 +402,8 @@ module.exports = function($window) {
} }
else return vnode.dom else return vnode.dom
} }
function getNextSibling(vnodes, i, nextSibling) { function getNextSibling(vnodes, i, limit, nextSibling) {
for (; i < vnodes.length; i++) { for (; i < limit; i++) {
if (vnodes[i] != null && vnodes[i].dom != null) return vnodes[i].dom if (vnodes[i] != null && vnodes[i].dom != null) return vnodes[i].dom
} }
return nextSibling return nextSibling