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

ensure null doesn't displace next siblings

Browse source
This commit is contained in:
Leo Horie 2016-12-02 20:41:07 -05:00
parent 2411303be8
commit 2f7c4983f3
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
render/render.js
View file

@ -124,9 +124,16 @@ module.exports = function($window) {
else if (old == null) createNodes(parent, vnodes, 0, vnodes.length, hooks, nextSibling, undefined)
else if (vnodes == null) removeNodes(old, 0, old.length, vnodes)
else {
if (old.length === vnodes.length && vnodes[0] != null && vnodes[0].key == null) {
var isUnkeyed = false
for (var i = 0; i < vnodes.length; i++) {
if (vnodes[i] != null) {
isUnkeyed = vnodes[i].key == null
break
}
}
if (old.length === vnodes.length && isUnkeyed) {
for (var i = 0; i < old.length; i++) {
if (old[i] === vnodes[i] || old[i] == null && vnodes[i] == null) continue
if (old[i] === vnodes[i]) continue
else if (old[i] == null) insertNode(parent, createNode(vnodes[i], hooks, ns), getNextSibling(old, i + 1, nextSibling))
else if (vnodes[i] == null) removeNodes(old, i, i + 1, vnodes)
else updateNode(parent, old[i], vnodes[i], hooks, getNextSibling(old, i + 1, nextSibling), false, ns)

13
render/tests/test-updateNodes.js
View file

@ -879,4 +879,17 @@ o.spec("updateNodes", function() {
o(onupdate.callCount).equals(0)
})
o("null stays in place", function() {
var vnodes = [{tag: "div"}, {tag: "a"}]
var temp = [null, {tag: "a"}]
var updated = [{tag: "div"}, {tag: "a"}]
render(root, vnodes)
var before = vnodes[1].dom
render(root, temp)
render(root, updated)
var after = updated[1].dom
o(before).equals(after)
})
})