Merge pull request #113 from jcmoore/splicework

Improve recycler splicing support -- correct branch
MediaMath · Aug 15, 2016 · c39dfbe · c39dfbe
2 parents b7b9141 + fbb21e4
commit c39dfbe
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 11 deletions.
diff --git a/src/shared/js/continuum.html b/src/shared/js/continuum.html
@@ -338,6 +338,7 @@
 		var limit = at + count;
 		var delta = 0;
 
+		this._fill(at);
 		if (this._items.add(at, count)) {
 			this._lowerBoundEagerRange(at);
 
@@ -450,6 +451,22 @@
 		return 0|!!(item && item.knowsHeight());
 	};
 
+	Continuum.prototype.areHeightsKnown = function (index, amount) {
+		var at = 0|index;
+		var count = 0|amount;
+		var place = at;
+		var limit = at + count - this.calculateOverflow(at, count);
+		var delta = 0;
+
+		for (place; place < limit; place++) {
+			if (this._items.get(place).knowsHeight()) {
+				delta++;
+			}
+		}
+
+		return delta;
+	};
+
 	Continuum.prototype.terminate = function (index) {
 		var at = 0|index;
 		var count = this._items.length();

diff --git a/src/strand-item-recycler/strand-item-recycler.js b/src/strand-item-recycler/strand-item-recycler.js
@@ -84,7 +84,7 @@ found here: https://github.com/Polymer/core-list
 
 	function BoundReference (itemRecycler, nthBind) {
 		this.itemRecycler = itemRecycler;
-		this.nthBind = nthBind;
+		this.nthBind = nthBind; // deprecated
 		this.nthDOM = -1;
 		this.young = -1;
 		this.height = 0;
@@ -269,11 +269,16 @@ found here: https://github.com/Polymer/core-list
 			var mutation = null;
 			var added = 0;
 			var removed = 0;
+			var deltaHeight = 0;
+			var knownHeights = 0;
 
 			for (index; index < count; index++) {
 				mutation = splices[index];
 				if (removed = 0|mutation.removed.length) {
-					itemRecycler._measurements.removeHeights(mutation.index, removed);
+					knownHeights = itemRecycler._measurements.areHeightsKnown(mutation.index, removed);
+					deltaHeight -= itemRecycler._getItemHeight() * (removed - knownHeights);
+					deltaHeight -= itemRecycler._measurements.removeHeights(mutation.index, removed);
+
 					transactor.removeHeightsAtIndex(mutation.index, removed);
 				}
 				if (added = 0|mutation.addedCount) {
@@ -282,6 +287,8 @@ found here: https://github.com/Polymer/core-list
 					transactor.addHeightsAtIndex(mutation.index, added, new Array(added));
 				}
 			}
+
+			itemRecycler._deltaMiddleHeight(deltaHeight);
 		},
 
 		_dataSpliced: function(record) {
@@ -393,6 +400,7 @@ found here: https://github.com/Polymer/core-list
 							if (bound &&
 								bound.value &&
 								this.data[bound.young] === model) {
+								bound.value.model = model;
 								bound.instance.notifyPath("model" + change.path.slice(delimiter), change.value);
 							}
 						}
@@ -402,6 +410,7 @@ found here: https://github.com/Polymer/core-list
 
 							if (bound &&
 								bound.young === num) {
+								bound.value.model = this.data[num];
 								bound.instance.notifyPath("model" + change.path.slice(delimiter), change.value);
 							}
 						}
@@ -785,12 +794,8 @@ found here: https://github.com/Polymer/core-list
 				if (count !== index) {
 					throw new Error("Recycler constraints broken -- count !== index: "+ count + " / " + index);
 				}
-				bound = this._demandBound();
-				count = binds.push(bound);
-				this._retrofitBound(bound, count - 1, young, useLightDom);
-
-				Polymer.dom(bound.element).appendChild(bound.instance);
-				Polymer.dom(this.$.middle).appendChild(bound.element);
+				bound = this._includeBoundAtIndex(index, young, spliced, useLightDom);
+				count++;
 			} else if (young < 0) {
 				bound = this._excludeBoundAtIndex(index, old, spliced);
 				bound = null;
@@ -932,16 +937,30 @@ found here: https://github.com/Polymer/core-list
 						}
 					}
 				}
+			} else {
+				for (index = 0; index < count; index++) {
+					bound = binds[index];
+					if (bound) {
+						if (replaced.young > bound.young ||
+							replaced === included) {
+							replaced = bound;
+						}
+					}
+				}
+
+				if (replaced.nthDOM === 0) {
+					replaced = included;
+				}
 			}
 
 			if (replaced === included) {
 				replaced = null;
 				limit = count;
 			} else {
-				limit = replaced.nthDOM - 1;
+				limit = replaced.nthDOM;
 			}
 
-			this._adjustNthDOM(limit, 1);
+			this._adjustNthDOM(limit - 1, 1);
 
 			bound = included;
 			index = 0|nthBind;
@@ -952,7 +971,7 @@ found here: https://github.com/Polymer/core-list
 
 			binds[index] = bound;
 
-			this._retrofitBound(bound, limit + 1, young, useLightDom);
+			this._retrofitBound(bound, limit, young, useLightDom);
 
 			Polymer.dom(bound.element).appendChild(bound.instance);
 			if (replaced) {