fix diff bug when array is sparse, item type and position and array length change

This commit is contained in:
Leo Horie 2016-11-23 22:28:08 -05:00
parent 0c94bae845
commit 8eb61a12ab
4 changed files with 73 additions and 45 deletions

View file

@ -141,7 +141,9 @@ module.exports = function($window) {
while (oldEnd >= oldStart && end >= start) {
var o = old[oldStart], v = vnodes[start]
if (o === v && !recycling) oldStart++, start++
else if (o != null && v != null && o.key === v.key) {
else if (o == null) oldStart++
else if (v == null) start++
else if (o.key === v.key) {
oldStart++, start++
updateNode(parent, o, v, hooks, getNextSibling(old, oldStart, nextSibling), recycling, ns)
if (recycling && o.tag === v.tag) insertNode(parent, toFragment(o), nextSibling)
@ -149,7 +151,9 @@ module.exports = function($window) {
else {
var o = old[oldEnd]
if (o === v && !recycling) oldEnd--, start++
else if (o != null && v != null && o.key === v.key) {
else if (o == null) oldEnd--
else if (v == null) start++
else if (o.key === v.key) {
updateNode(parent, o, v, hooks, getNextSibling(old, oldEnd + 1, nextSibling), recycling, ns)
if (recycling || start < end) insertNode(parent, toFragment(o), getNextSibling(old, oldStart, nextSibling))
oldEnd--, start++
@ -160,7 +164,9 @@ module.exports = function($window) {
while (oldEnd >= oldStart && end >= start) {
var o = old[oldEnd], v = vnodes[end]
if (o === v && !recycling) oldEnd--, end--
else if (o != null && v != null && o.key === v.key) {
else if (o == null) oldEnd--
else if (v == null) end--
else if (o.key === v.key) {
updateNode(parent, o, v, hooks, getNextSibling(old, oldEnd + 1, nextSibling), recycling, ns)
if (recycling && o.tag === v.tag) insertNode(parent, toFragment(o), nextSibling)
if (o.dom != null) nextSibling = o.dom

View file

@ -715,6 +715,22 @@ o.spec("updateNodes", function() {
o(updated[2].dom.nodeName).equals("A")
o(updated[2].dom).equals(root.childNodes[2])
})
o("change type, position and length", function() {
var vnodes = {tag: "div", children: [
undefined,
{tag: "#", children: "a"}
]}
var updated = {tag: "div", children: [
{tag: "[", children: [{tag: "#", children: "b"}]},
undefined,
undefined
]}
render(root, vnodes)
render(root, updated)
o(root.firstChild.childNodes.length).equals(1)
})
o("removes then recreates then reverses children", function() {
var vnodes = [{tag: "a", key: 1, children: [{tag: "i", key: 3}, {tag: "s", key: 4}]}, {tag: "b", key: 2}]
var temp1 = []