targetj 1.0.89 → 1.0.90

package/build/Bracket.js

@@ -37,6 +37,11 @@ var Bracket = exports.Bracket = /*#__PURE__*/function (_TModel) {
   }
   _inherits(Bracket, _TModel);
   return _createClass(Bracket, [{
+    key: "shouldBeBracketed",
+    value: function shouldBeBracketed() {
+      return false;
+    }
+  }, {
     key: "getWidth",
     value: function getWidth() {
       return this.getContentWidth();

package/build/BracketGenerator.js

@@ -23,8 +23,8 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 /**
  * Generates a bottom-up tree from the children of a TModel. When the number of children
  * exceeds a defined threshold (bracketThreshold), a tree is generated to limit the process loop to only
- * the visible branches. A TModel can opt out of tree generation by setting
- * `canBeBracketed` to false.
+ * the visible branches. A TModel can opt out of tree generation completely by defining a target
+ * `shouldBeBracketed` and setting it to false.
  */
 var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
   function BracketGenerator() {
@@ -34,13 +34,13 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
     key: "generate",
     value: function generate(page) {
       var brackets = BracketGenerator.bracketMap[page.oid];
-      if (!brackets) {
+      if (!brackets || page.lastChildrenUpdate.deletions.length > 0) {
         BracketGenerator.bracketMap[page.oid] = {
           brackets: BracketGenerator.buildTreeBottomUp(page, page.getChildren()),
           updateCount: 0
         };
-      } else if (page.lastChildrenUpdate.additions.length > 0 || page.lastChildrenUpdate.deletions.length > 0) {
-        BracketGenerator.updateTree(page, page.lastChildrenUpdate.additions, page.lastChildrenUpdate.deletions);
+      } else if (page.lastChildrenUpdate.additions.length > 0) {
+        BracketGenerator.updateTree(page, page.lastChildrenUpdate.additions);
       }
       page.lastChildrenUpdate.additions.length = 0;
       page.lastChildrenUpdate.deletions.length = 0;
@@ -50,14 +50,9 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
     key: "updateTree",
     value: function updateTree(page) {
       var additions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-      var deletions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
       var list = page.getChildren();
       var affectedIndices = new Set();
-      var bracketSize = page.getBracketThreshold() - 1;
-      deletions.forEach(function (item) {
-        var index = list.indexOf(item);
-        affectedIndices.add(index);
-      });
+      var bracketSize = page.getBracketThreshold();
       additions.forEach(function (_ref) {
         var index = _ref.index,
           segment = _ref.segment;
@@ -72,7 +67,7 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
       var end = null;
       sortedIndices.forEach(function (index) {
         var bracketStart = Math.floor(index / bracketSize) * bracketSize;
-        var bracketEnd = Math.min(list.length - 1, bracketStart + bracketSize - 1);
+        var bracketEnd = Math.min(list.length, bracketStart + bracketSize);
         if (start === null) {
           start = bracketStart;
           end = bracketEnd;
@@ -93,9 +88,10 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
     value: function updateSegmentInTree(page, list, start, end) {
       var _currentLevel;
       var topBrackets = BracketGenerator.bracketMap[page.oid].brackets;
-      var updatedSegment = BracketGenerator.buildTreeBottomUp(page, list.slice(start, end + 1));
-      var bracketSize = page.getBracketThreshold() - 1;
+      var updatedSegment = BracketGenerator.buildTreeBottomUp(page, list.slice(start, end));
+      var bracketSize = page.getBracketThreshold();
       var currentLevel = topBrackets;
+      var segmentParent = undefined;
       while (true) {
         var nextLevel = null;
         var _iterator = _createForOfIteratorHelper(currentLevel),
@@ -103,8 +99,14 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var bracket = _step.value;
-            if (bracket.startIndex <= start && bracket.endIndex >= end) {
+            if (!(bracket.getFirstChild() instanceof _Bracket.Bracket)) {
+              break;
+            }
+            var startIndex = bracket.startIndex;
+            var endIndex = Math.ceil(bracket.endIndex / bracketSize) * bracketSize;
+            if (startIndex <= start && endIndex >= end) {
               nextLevel = bracket.getChildren();
+              segmentParent = bracket;
               break;
             }
           }
@@ -119,7 +121,7 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
         currentLevel = nextLevel;
       }
       var mergeIndex = 0;
-      while (mergeIndex < currentLevel.length && currentLevel[mergeIndex].endIndex < start) {
+      while (mergeIndex < currentLevel.length && currentLevel[mergeIndex].endIndex <= start) {
         mergeIndex++;
       }
       var replaceCount = 0;
@@ -128,6 +130,20 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
       }
       var indexOffset = currentLevel.length > mergeIndex ? currentLevel[mergeIndex].startIndex : currentLevel[currentLevel.length - 1].endIndex;
       (_currentLevel = currentLevel).splice.apply(_currentLevel, [mergeIndex, replaceCount].concat(_toConsumableArray(updatedSegment)));
+      if (segmentParent) {
+        var _iterator2 = _createForOfIteratorHelper(updatedSegment),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var _bracket = _step2.value;
+            _bracket.parent = segmentParent;
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
       BracketGenerator.reindexSegment(updatedSegment, indexOffset);
       BracketGenerator.bracketMap[page.oid].updateCount++;
       if (currentLevel.length > bracketSize) {
@@ -139,25 +155,16 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
     value: function buildTreeBottomUp(page, list) {
       var length = list.length;
       var bracketSize = page.getBracketThreshold() - 1;
-      if (length <= bracketSize) {
-        return list;
-      }
       var brackets = [];
       var from = 0;
       for (var i = 0; i < length; i++) {
-        var canBeBracketed = list[i].canBeBracketed();
         var size = i - from;
-        if (canBeBracketed && (size === bracketSize || i === length - 1) || !canBeBracketed && size > 0) {
-          var to = canBeBracketed ? i + 1 : i;
-          brackets.push(BracketGenerator.createBracket(page, list, from, to));
-          from = i + 1;
-        }
-        if (!canBeBracketed) {
-          brackets.push(list[i]);
+        if (size === bracketSize || i === length - 1) {
+          brackets.push(BracketGenerator.createBracket(page, list, from, i + 1));
           from = i + 1;
         }
       }
-      return BracketGenerator.buildTreeBottomUp(page, brackets);
+      return brackets > bracketSize ? BracketGenerator.buildTreeBottomUp(page, brackets) : brackets;
     }
   }, {
     key: "createBracket",
@@ -179,7 +186,7 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
     key: "reindexSegment",
     value: function reindexSegment(segment, indexOffset) {
       var queue = segment.slice(0); // Start with the root node in the queue
-
+      var last = queue[queue.length - 1];
       while (queue.length > 0) {
         var bracket = queue.shift(); // Dequeue the first node
 
@@ -193,6 +200,11 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
           });
         }
       }
+      var parent = last.getParent();
+      while (parent) {
+        parent.endIndex = Math.max(parent.endIndex, last.endIndex);
+        parent = parent.getParent();
+      }
     }
   }]);
 }();

package/build/TModel.js

@@ -74,8 +74,7 @@ var TModel = exports.TModel = /*#__PURE__*/function () {
       heightFromDom: false,
       keepEventDefault: false,
       isIncluded: true,
-      canBeBracketed: true,
-      bracketThreshold: 6,
+      bracketThreshold: 5,
       isDomDeletable: true,
       calculateChildren: undefined,
       isVisible: undefined
@@ -252,11 +251,11 @@ var TModel = exports.TModel = /*#__PURE__*/function () {
       if (this.deletedChildren.length > 0) {
         this.deletedChildren.forEach(function (child) {
           var index = _this2.allChildren.indexOf(child);
+          _this2.lastChildrenUpdate.deletions.push(index);
           if (index >= 0) {
             _this2.allChildren.splice(index, 1);
           }
         });
-        this.lastChildrenUpdate.deletions = this.lastChildrenUpdate.deletions.concat(this.addedChildren);
         this.deletedChildren.length = 0;
       }
       return this.allChildren;
@@ -369,7 +368,10 @@ var TModel = exports.TModel = /*#__PURE__*/function () {
   }, {
     key: "shouldCalculateChildren",
     value: function shouldCalculateChildren() {
-      return _TUtil.TUtil.isDefined(this.actualValues.calculateChildren) ? this.actualValues.calculateChildren : this.isVisible() && this.isIncluded() && (this.hasChildren() || this.getContentHeight() > 0);
+      if (_TUtil.TUtil.isDefined(this.actualValues.calculateChildren)) {
+        return this.actualValues.calculateChildren;
+      }
+      return this.isVisible() && this.isIncluded() && (this.hasChildren() || this.addedChildren.count > 0 || this.getContentHeight() > 0);
     }
   }, {
     key: "createViewport",
@@ -421,11 +423,6 @@ var TModel = exports.TModel = /*#__PURE__*/function () {
     value: function keepEventDefault() {
       return this.actualValues.keepEventDefault;
     }
-  }, {
-    key: "canBeBracketed",
-    value: function canBeBracketed() {
-      return this.actualValues.canBeBracketed;
-    }
   }, {
     key: "getBracketThreshold",
     value: function getBracketThreshold() {
@@ -434,7 +431,10 @@ var TModel = exports.TModel = /*#__PURE__*/function () {
   }, {
     key: "shouldBeBracketed",
     value: function shouldBeBracketed() {
-      return this.canBeBracketed() && this.getChildren().length > this.getBracketThreshold();
+      if (_TUtil.TUtil.isDefined(this.actualValues.shouldBeBracketed)) {
+        return this.actualValues.shouldBeBracketed;
+      }
+      return this.getChildren().length > this.getBracketThreshold();
     }
   }, {
     key: "isIncluded",
@@ -831,8 +831,8 @@ var TModel = exports.TModel = /*#__PURE__*/function () {
     }
   }, {
     key: "addChild",
-    value: function addChild(child, index) {
-      index = _TUtil.TUtil.isDefined(index) ? index : this.addedChildren.count + this.allChildren.length;
+    value: function addChild(child) {
+      var index = this.addedChildren.count + this.allChildren.length;
       this.addedChildren.count++;
       _TModelUtil.TModelUtil.addItem(this.addedChildren.list, child, index);
       (0, _App.getRunScheduler)().schedule(10, 'addChild-' + this.oid + "-" + child.oid);

package/build/TModelManager.js

@@ -192,7 +192,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
           var tmodel = _step4.value;
           tmodel.domValues = {};
           var activateTargets = [].concat(tmodel.targets['onInvisibleEvent'], tmodel.targets['onResize']);
-          activateTargets === null || activateTargets === void 0 || activateTargets.forEach(function (key) {
+          activateTargets.forEach(function (key) {
             if (tmodel.targets[key] && tmodel.isTargetComplete(key)) {
               tmodel.activateTarget(key);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.89",
+  "version": "1.0.90",
   "keywords": [
     "targetj"
   ],