targetj 1.0.125 → 1.0.128

package/README.md

@@ -4,6 +4,8 @@ Welcome to TargetJ, a powerful JavaScript UI framework and library that you migh
 
 TargetJ distinguishes itself by introducing a novel concept known as 'targets,' which forms its core. Targets give methods and variable assignments life cycles and the autonomy to operate independently, with various callbacks to adapt to changes, mimicking the behavior of living cells. This opens a new paradigm in programming.
 
+⭐ We appreciate your star, it helps!
+
 ### Installation
 
 To install TargetJ, run the following command in your terminal:

package/build/$Dom.js

@@ -199,6 +199,11 @@ var $Dom = exports.$Dom = /*#__PURE__*/function () {
         this.append$Dom($dom);
       }
     }
+  }, {
+    key: "relocate",
+    value: function relocate(tmodel, orderIndex) {
+      this.element.insertBefore(tmodel.$dom.element, this.element.children[orderIndex]);
+    }
   }, {
     key: "appendTModel$Dom",
     value: function appendTModel$Dom(tmodel) {

package/build/BaseModel.js

@@ -248,7 +248,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         _this2.removeFromUpdatingTargets(key);
         _this2.processNewTarget(key);
       });
-      (0, _App.getRunScheduler)().schedule(10, 'addTargets-' + this.oid);
+      (0, _App.getRunScheduler)().schedule(1, 'addTargets-' + this.oid);
     }
   }, {
     key: "getTargetStepPercent",
@@ -688,7 +688,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       delete this.targetValues[key];
       this.addToActiveTargets(key);
       this.removeFromUpdatingTargets(key);
-      (0, _App.getRunScheduler)().schedule(10, 'deleteTargetValue-' + this.oid + "-" + key);
+      (0, _App.getRunScheduler)().schedule(1, 'deleteTargetValue-' + this.oid + "-" + key);
     }
   }, {
     key: "resetImperative",
@@ -730,7 +730,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
   }, {
     key: "manageChildTargetExecution",
     value: function manageChildTargetExecution(child, shouldCalculateChildTargets) {
-      return shouldCalculateChildTargets || this.shouldCalculateChildTargets() || child.hasChildren() || child.addedChildren.count > 0 || child.targetExecutionCount === 0;
+      return shouldCalculateChildTargets || this.shouldCalculateChildTargets() || child.hasChildren() || child.addedChildren.length > 0 || child.targetExecutionCount === 0;
     }
   }, {
     key: "shouldCalculateChildTargets",

package/build/BracketGenerator.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BracketGenerator = void 0;
 var _Bracket = require("./Bracket.js");
-var _TUtil = require("./TUtil.js");
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -35,29 +34,41 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
     value: function generate(page) {
       var regenerate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var brackets = BracketGenerator.bracketMap[page.oid];
-      if (!brackets || brackets.allChildren !== page.allChildren || regenerate) {
-        BracketGenerator.bracketMap[page.oid] = {
-          brackets: BracketGenerator.buildTreeBottomUp(page, page.getChildren()),
-          updateCount: 0,
-          allChildren: page.allChildren
-        };
-      } else if (page.lastChildrenUpdate.deletions.length > 0) {
-        BracketGenerator.updateTreeOnDeletions(page.lastChildrenUpdate.deletions);
-      } else if (page.lastChildrenUpdate.additions.length > 0) {
-        BracketGenerator.updateTreeOnAdditions(page, page.lastChildrenUpdate.additions);
+      if (!brackets || regenerate) {
+        BracketGenerator.bracketMap[page.oid] = BracketGenerator.buildTreeBottomUp(page, page.getChildren());
+      } else {
+        if (page.lastChildrenUpdate.deletions.length > 0) {
+          BracketGenerator.updateTreeOnDeletions(page, page.lastChildrenUpdate.deletions);
+          BracketGenerator.reindexTree(page);
+        }
+        if (page.lastChildrenUpdate.additions.length > 0) {
+          BracketGenerator.updateTreeOnAdditions(page, page.lastChildrenUpdate.additions);
+        }
+        if (page.lastChildrenUpdate.deletions.length > 0 || page.lastChildrenUpdate.additions.length > 0) {
+          BracketGenerator.reindexTree(page);
+        }
       }
       page.lastChildrenUpdate.additions.length = 0;
       page.lastChildrenUpdate.deletions.length = 0;
-      return BracketGenerator.bracketMap[page.oid].brackets;
+      return BracketGenerator.bracketMap[page.oid];
     }
   }, {
     key: "updateTreeOnDeletions",
-    value: function updateTreeOnDeletions(deletions) {
+    value: function updateTreeOnDeletions(page, deletions) {
       function deleteChildRecursively(parent, child) {
-        if (parent) {
-          var index = parent.allChildren.indexOf(child);
+        if (!parent) {
+          return;
+        }
+        if (child instanceof _Bracket.Bracket && child.parent === child.realParent) {
+          var topBrackets = BracketGenerator.bracketMap[page.oid];
+          var index = topBrackets.indexOf(child);
           if (index >= 0) {
-            parent.allChildren.splice(index, 1);
+            topBrackets.splice(index, 1);
+          }
+        } else {
+          var _index = parent.allChildren.indexOf(child);
+          if (_index >= 0) {
+            parent.allChildren.splice(_index, 1);
             if (parent.allChildren.length === 0) {
               deleteChildRecursively(parent.parent, parent);
             }
@@ -68,169 +79,195 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
         return deleteChildRecursively(child.bracket, child);
       });
     }
+  }, {
+    key: "reindexTree",
+    value: function reindexTree(page) {
+      var topBrackets = BracketGenerator.bracketMap[page.oid];
+      function reindexBracket(bracket, currentIndex) {
+        if (bracket.allChildren.length === 0) {
+          // Empty bracket; startIndex and endIndex remain as is
+          return currentIndex;
+        }
+        var containsBrackets = bracket.allChildren[0] instanceof _Bracket.Bracket;
+        if (containsBrackets) {
+          bracket.startIndex = currentIndex;
+          var _iterator = _createForOfIteratorHelper(bracket.allChildren),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var child = _step.value;
+              currentIndex = reindexBracket(child, currentIndex);
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+          bracket.endIndex = currentIndex;
+        } else {
+          bracket.startIndex = currentIndex;
+          currentIndex += bracket.allChildren.length;
+          bracket.endIndex = currentIndex;
+        }
+        return currentIndex;
+      }
+      var currentIndex = 0;
+      var _iterator2 = _createForOfIteratorHelper(topBrackets),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var topBracket = _step2.value;
+          currentIndex = reindexBracket(topBracket, currentIndex);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
   }, {
     key: "updateTreeOnAdditions",
-    value: function updateTreeOnAdditions(page) {
-      var additions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-      var list = page.getChildren();
-      var affectedIndices = new Set();
+    value: function updateTreeOnAdditions(page, additions) {
       var bracketSize = page.getBracketThreshold();
       additions.forEach(function (_ref) {
         var index = _ref.index,
-          segment = _ref.segment;
-        segment.forEach(function (_, i) {
-          return affectedIndices.add(index + i);
-        }); // eslint-disable-line no-unused-vars
-      });
-      var sortedIndices = Array.from(affectedIndices).sort(function (a, b) {
-        return a - b;
-      });
-      var start = null;
-      var end = null;
-      sortedIndices.forEach(function (index) {
-        var bracketStart = Math.floor(index / bracketSize) * bracketSize;
-        var bracketEnd = Math.min(list.length, bracketStart + bracketSize);
-        if (start === null) {
-          start = bracketStart;
-          end = bracketEnd;
-        } else if (bracketStart <= end + 1) {
-          end = Math.max(end, bracketEnd);
+          child = _ref.child;
+        var targetBracket = BracketGenerator.findOrCreateBracket(page, index);
+        if (targetBracket.allChildren.length) {
+          var newIndex = index - targetBracket.startIndex;
+          targetBracket.allChildren.splice(newIndex, 0, child);
         } else {
-          BracketGenerator.updateSegmentInTree(page, list, start, end);
-          start = bracketStart;
-          end = bracketEnd;
+          targetBracket.allChildren.push(child);
+        }
+        child.bracket = targetBracket;
+        var bracket = targetBracket;
+        while (bracket instanceof _Bracket.Bracket) {
+          bracket.startIndex = Math.min(bracket.startIndex, index);
+          bracket.endIndex = Math.max(bracket.endIndex, index + 1);
+          bracket = bracket.getParent();
+        }
+        if (targetBracket.allChildren.length > bracketSize) {
+          BracketGenerator.splitBracket(page, targetBracket);
         }
       });
-      if (start !== null && end !== null) {
-        BracketGenerator.updateSegmentInTree(page, list, start, end);
-      }
     }
   }, {
-    key: "updateSegmentInTree",
-    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));
+    key: "splitBracket",
+    value: function splitBracket(page, bracket) {
+      var list = bracket.allChildren;
       var bracketSize = page.getBracketThreshold();
-      var currentLevel = topBrackets;
-      var segmentParent = undefined;
-      while (true) {
-        var nextLevel = null;
-        var _iterator = _createForOfIteratorHelper(currentLevel),
-          _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var bracket = _step.value;
-            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;
+      var chunks = [];
+      var startIndex = bracket.startIndex;
+      for (var i = 0; i < list.length; i += bracketSize) {
+        var chunk = list.slice(i, i + bracketSize);
+        var endIndex = startIndex + chunk.length;
+        var newBracket = BracketGenerator.createBracket(page, startIndex, endIndex, chunk);
+        newBracket.parent = bracket.parent;
+        startIndex = newBracket.endIndex;
+        chunks.push(newBracket);
+      }
+      if (bracket.parent !== bracket.realParent) {
+        var index = bracket.parent.allChildren.indexOf(bracket);
+        if (index >= 0) {
+          var _bracket$parent$allCh;
+          (_bracket$parent$allCh = bracket.parent.allChildren).splice.apply(_bracket$parent$allCh, [index, 1].concat(chunks));
+        }
+        if (bracket.parent.allChildren.length >= bracketSize) {
+          var rebuiltChildren = BracketGenerator.buildTreeBottomUp(page, bracket.parent.allChildren);
+          bracket.parent.allChildren = rebuiltChildren;
+
+          // Update grandparent relationships
+          if (bracket.parent.parent) {
+            var parentIndex = bracket.parent.parent.allChildren.indexOf(bracket.parent);
+            if (parentIndex >= 0) {
+              var _bracket$parent$paren;
+              (_bracket$parent$paren = bracket.parent.parent.allChildren).splice.apply(_bracket$parent$paren, [parentIndex, 1].concat(_toConsumableArray(rebuiltChildren)));
             }
           }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
         }
-        if (!nextLevel) {
-          break;
+      } else {
+        var topBrackets = BracketGenerator.bracketMap[page.oid];
+        var _index2 = topBrackets.indexOf(bracket);
+        if (_index2 >= 0) {
+          topBrackets.splice.apply(topBrackets, [_index2, 1].concat(chunks));
+        }
+        if (topBrackets.length > page.getBracketThreshold()) {
+          BracketGenerator.bracketMap[page.oid] = BracketGenerator.buildTreeBottomUp(page, topBrackets);
         }
-        currentLevel = nextLevel;
-      }
-      var mergeIndex = 0;
-      while (mergeIndex < currentLevel.length && currentLevel[mergeIndex].endIndex <= start) {
-        mergeIndex++;
-      }
-      var replaceCount = 0;
-      while (mergeIndex + replaceCount < currentLevel.length && currentLevel[mergeIndex + replaceCount].startIndex <= end) {
-        replaceCount++;
       }
-      var indexOffset = currentLevel.length > mergeIndex ? currentLevel[mergeIndex].startIndex : currentLevel.length > 0 ? currentLevel[currentLevel.length - 1].endIndex : 0;
-      (_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;
+    }
+  }, {
+    key: "findOrCreateBracket",
+    value: function findOrCreateBracket(page, index) {
+      var brackets = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : BracketGenerator.bracketMap[page.oid];
+      var _iterator3 = _createForOfIteratorHelper(brackets),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var bracket = _step3.value;
+          if (bracket.startIndex <= index && bracket.endIndex >= index) {
+            if (bracket.getFirstChild() instanceof _Bracket.Bracket) {
+              return BracketGenerator.findOrCreateBracket(page, index, bracket.allChildren);
+            }
+            return bracket;
           }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
         }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
       }
-      BracketGenerator.reindexSegment(updatedSegment, indexOffset);
-      BracketGenerator.bracketMap[page.oid].updateCount++;
-      if (currentLevel.length > bracketSize) {
-        BracketGenerator.bracketMap[page.oid].brackets = BracketGenerator.buildTreeBottomUp(page, currentLevel);
+      var newBracket = BracketGenerator.createBracket(page, index, index);
+      brackets.push(newBracket);
+      if (brackets.length > page.getBracketThreshold()) {
+        var topBrackets = BracketGenerator.buildTreeBottomUp(page, brackets);
+        BracketGenerator.bracketMap[page.oid].brackets = topBrackets;
       }
+      return newBracket;
     }
   }, {
     key: "buildTreeBottomUp",
     value: function buildTreeBottomUp(page, list) {
       var length = list.length;
-      var bracketSize = page.getBracketThreshold() - 1;
+      var bracketSize = page.getBracketThreshold();
       var brackets = [];
-      var from = 0;
-      for (var i = 0; i < length; i++) {
-        var size = i - from;
-        if (size === bracketSize || i === length - 1) {
-          brackets.push(BracketGenerator.createBracket(page, list, from, i + 1));
-          from = i + 1;
+      var _loop = function _loop() {
+        var chunk = list.slice(i, i + bracketSize);
+        var containsBrackets = chunk[0] instanceof _Bracket.Bracket;
+        var startIndex = containsBrackets ? chunk[0].startIndex : i;
+        var endIndex = containsBrackets ? chunk[chunk.length - 1].endIndex : i + chunk.length;
+        var bracket = BracketGenerator.createBracket(page, startIndex, endIndex, chunk);
+        if (containsBrackets) {
+          chunk.forEach(function (child) {
+            child.parent = bracket;
+          });
         }
+        brackets.push(bracket);
+      };
+      for (var i = 0; i < length; i += bracketSize) {
+        _loop();
       }
       return brackets.length > bracketSize ? BracketGenerator.buildTreeBottomUp(page, brackets) : brackets;
     }
   }, {
     key: "createBracket",
-    value: function createBracket(page, list, startIndex, endIndex) {
+    value: function createBracket(page, startIndex, endIndex, list) {
       var bracket = new _Bracket.Bracket(page);
-      bracket.allChildren = list.slice(startIndex, endIndex);
-      bracket.startIndex = bracket.allChildren[0] instanceof _Bracket.Bracket ? bracket.allChildren[0].startIndex : startIndex;
-      bracket.endIndex = bracket.allChildren[bracket.allChildren.length - 1] instanceof _Bracket.Bracket ? bracket.allChildren[bracket.allChildren.length - 1].endIndex : endIndex;
-      bracket.allChildren.forEach(function (t) {
-        if (t instanceof _Bracket.Bracket) {
-          t.realParent = page;
-          t.parent = bracket;
+      bracket.realParent = page;
+      bracket.allChildren = list || bracket.allChildren;
+      bracket.startIndex = startIndex;
+      bracket.endIndex = endIndex;
+      bracket.allChildren.forEach(function (child) {
+        if (child instanceof _Bracket.Bracket) {
+          child.realParent = page;
+          child.parent = bracket;
         } else {
-          t.bracket = bracket;
+          child.bracket = bracket;
         }
       });
-      bracket.realParent = page;
       BracketGenerator.all[bracket.oid] = bracket;
       return bracket;
     }
-  }, {
-    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
-
-        bracket.startIndex += indexOffset;
-        bracket.endIndex += indexOffset;
-        if (bracket instanceof _Bracket.Bracket) {
-          bracket.getChildren().forEach(function (child) {
-            if (_TUtil.TUtil.isDefined(child.startIndex) && _TUtil.TUtil.isDefined(child.endIndex)) {
-              queue.push(child);
-            }
-          });
-        }
-      }
-      var parent = last.getParent();
-      while (parent) {
-        parent.endIndex = Math.max(parent.endIndex, last.endIndex);
-        parent = parent.getParent();
-      }
-    }
   }]);
 }();
 _defineProperty(BracketGenerator, "bracketMap", {});

package/build/EventListener.js

@@ -311,26 +311,32 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "resetEventsOnTimeout",
     value: function resetEventsOnTimeout() {
-      if (this.touchTimeStamp > 0 && this.touchCount === 0 && (this.currentTouch.deltaY || this.currentTouch.deltaX || this.currentTouch.pinchDelta)) {
-        var diff = _TUtil.TUtil.now() - this.touchTimeStamp;
-        (0, _App.getRunScheduler)().schedule(10, "scroll decay ");
+      if (this.currentTouch.deltaY || this.currentTouch.deltaX || this.currentTouch.pinchDelta) {
+        var diff = this.touchTimeStamp - _TUtil.TUtil.now();
         if (diff > 100) {
-          this.currentTouch.deltaY *= 0.9;
-          this.currentTouch.deltaX *= 0.9;
-          this.currentTouch.pinchDelta *= 0.9;
-          if (Math.abs(this.currentTouch.deltaY) < 1) {
+          this.currentTouch.deltaY *= 0.95;
+          this.currentTouch.deltaX *= 0.95;
+          this.currentTouch.pinchDelta *= 0.95;
+          if (Math.abs(this.currentTouch.deltaY) < 0.1) {
             this.currentTouch.deltaY = 0;
           }
-          if (Math.abs(this.currentTouch.deltaX) < 1) {
+          if (Math.abs(this.currentTouch.deltaX) < 0.1) {
             this.currentTouch.deltaX = 0;
           }
-          if (Math.abs(this.currentTouch.pinchDelta) < 1) {
+          if (Math.abs(this.currentTouch.pinchDelta) < 0.1) {
             this.currentTouch.pinchDelta = 0;
           }
           if (this.currentTouch.deltaX === 0 && this.currentTouch.deltaY === 0 && this.currentTouch.pinchDelta === 0) {
             this.touchTimeStamp = 0;
           }
         }
+        if (diff <= 0 || this.touchTimeStamp === 0) {
+          this.currentTouch.deltaY = 0;
+          this.currentTouch.deltaX = 0;
+          this.currentTouch.pinchDelta = 0;
+          this.touchTimeStamp = 0;
+        }
+        (0, _App.getRunScheduler)().schedule(10, "scroll decay");
       }
     }
   }, {
@@ -475,7 +481,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
               event.preventDefault();
             }
             if (this.touchCount > 0) {
-              this.touchTimeStamp = Math.max(now, this.touchTimeStamp);
+              this.touchTimeStamp = now + 10;
               this.move(event);
               event.stopPropagation();
             } else if (this.isCurrentSource('wheel')) {
@@ -516,7 +522,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           if (this.preventDefault(tmodel, eventName)) {
             event.preventDefault();
           }
-          this.touchTimeStamp = Math.max(now, this.touchTimeStamp);
+          this.touchTimeStamp = now + 500;
           this.wheel(event);
           break;
         case 'key':
@@ -853,23 +859,29 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       if (this.touchCount <= 1 && this.start0) {
         var deltaX = 0,
           deltaY = 0,
-          period = 1;
+          period = 0,
+          startPeriod = 0;
         if (_TUtil.TUtil.isDefined(this.end0)) {
           deltaX = this.start0.originalX - this.end0.x;
           deltaY = this.start0.originalY - this.end0.y;
-          period = this.end0.timeStamp - this.start0.timeStamp;
+          startPeriod = _TUtil.TUtil.now() - this.start0.timeStamp;
+          period = startPeriod < 250 ? _TUtil.TUtil.now() - this.start0.timeStamp : 0;
         }
         var momentum;
-        if (this.currentTouch.orientation === "horizontal" && Math.abs(deltaX) > 0) {
+        if (this.currentTouch.orientation === "horizontal" && Math.abs(deltaX) > 0 && period > 0) {
           momentum = _TUtil.TUtil.momentum(0, deltaX, period);
-          this.currentTouch.deltaX = momentum.distance;
-          this.currentTouch.manualMomentumFlag = true;
-          this.touchTimeStamp = _TUtil.TUtil.now() + momentum.duration;
-        } else if (this.currentTouch.orientation === "vertical" && Math.abs(deltaY) > 0) {
+          this.touchTimeStamp = this.end0.timeStamp + momentum.duration;
+          if (this.touchTimeStamp - _TUtil.TUtil.now() > 0) {
+            this.currentTouch.deltaX = momentum.distance;
+            this.currentTouch.manualMomentumFlag = true;
+          }
+        } else if (this.currentTouch.orientation === "vertical" && Math.abs(deltaY) > 0 && period > 0) {
           momentum = _TUtil.TUtil.momentum(0, deltaY, period);
-          this.currentTouch.deltaY = momentum.distance;
-          this.currentTouch.manualMomentumFlag = true;
-          this.touchTimeStamp = _TUtil.TUtil.now() + momentum.duration;
+          this.touchTimeStamp = this.end0.timeStamp + momentum.duration;
+          if (this.touchTimeStamp - _TUtil.TUtil.now() > 0) {
+            this.currentTouch.deltaY = momentum.distance;
+            this.currentTouch.manualMomentumFlag = true;
+          }
         }
       }
     }

package/build/LocationManager.js

@@ -103,8 +103,12 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
   }, {
     key: "getChildren",
     value: function getChildren(container) {
+      container.getChildren();
       if (container.shouldBeBracketed()) {
         return _BracketGenerator.BracketGenerator.generate(container);
+      } else {
+        container.lastChildrenUpdate.additions.length = 0;
+        container.lastChildrenUpdate.deletions.length = 0;
       }
       if (_BracketGenerator.BracketGenerator.bracketMap[container.oid]) {
         delete _BracketGenerator.BracketGenerator.bracketMap[container.oid];

package/build/RunScheduler.js

@@ -128,11 +128,15 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
       this.runningFlag = false;
       if (this.rerunId) {
         this.schedule(1, "rerun-".concat(this.rerunId));
-      } else if (!this.delayProcess || this.delayProcess.delay > 15) {
-        if ((0, _App.getEvents)().eventQueue.length > 0) {
-          this.schedule(15, "events-".concat((0, _App.getEvents)().eventQueue.length));
-        } else if (_TargetExecutor.TargetExecutor.needsRerun) {
-          this.schedule(15, 'targetExecutor-needsRerun');
+      } else {
+        var newDelay = this.nextRuns.length > 0 ? this.nextRuns[0].delay - (_TUtil.TUtil.now() - this.nextRuns[0].insertTime) : 15;
+        if (newDelay >= 15) {
+          if ((0, _App.getEvents)().eventQueue.length > 0) {
+            this.schedule(15, "events-".concat((0, _App.getEvents)().eventQueue.length));
+          } else if (_TargetExecutor.TargetExecutor.needsRerun) {
+            _TargetExecutor.TargetExecutor.needsRerun = false;
+            this.schedule(15, 'targetExecutor-needsRerun');
+          }
         }
       }
     }
@@ -146,7 +150,7 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
     value: function domOperations(runningStep) {
       var _this = this;
       this.domProcessing = 1;
-      if (runningStep === 5) {
+      if (runningStep === 10) {
         this.domFixStyles();
       } else {
         Promise.all(RunScheduler.steps.filter(function (_, index) {
@@ -215,7 +219,7 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
   }, {
     key: "delayRun",
     value: function delayRun(delay, runId) {
-      var insertTime = _TUtil.TUtil.now();
+      var insertTime = this.runStartTime;
       var runTime = insertTime + delay;
       if (!this.delayProcess) {
         this.setDelayProcess(runId, insertTime, runTime, delay);
@@ -257,6 +261,8 @@ _defineProperty(RunScheduler, "steps", [function () {
   return (0, _App.getManager)().createDoms();
 }, function () {
   return (0, _App.getManager)().reattachTModels();
+}, function () {
+  return (0, _App.getManager)().relocateTModels();
 }, function () {
   return (0, _App.getManager)().renderTModels();
 }, function () {

package/build/TModel.js

@@ -10,14 +10,7 @@ var _App = require("./App.js");
 var _Viewport = require("./Viewport.js");
 var _TUtil = require("./TUtil.js");
 var _SearchUtil = require("./SearchUtil.js");
-var _TModelUtil = require("./TModelUtil.js");
 var _TargetUtil = require("./TargetUtil.js");
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -39,10 +32,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
     var _this;
     _classCallCheck(this, TModel);
     _this = _callSuper(this, TModel, [type, targets]);
-    _this.addedChildren = {
-      count: 0,
-      list: []
-    };
+    _this.addedChildren = [];
     _this.deletedChildren = [];
     _this.lastChildrenUpdate = {
       additions: [],
@@ -119,9 +109,12 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "addChild",
     value: function addChild(child) {
-      var index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.addedChildren.count + this.allChildren.length;
-      this.addedChildren.count++;
-      _TModelUtil.TModelUtil.addItem(this.addedChildren.list, child, index);
+      var index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.addedChildren.length + this.allChildren.length;
+      this.addedChildren.push({
+        index: index,
+        originalIndex: index,
+        child: child
+      });
       (0, _App.getRunScheduler)().schedule(1, 'addChild-' + this.oid + "-" + child.oid);
       return this;
     }
@@ -136,23 +129,19 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "moveChild",
-    value: function moveChild(child, newIndex) {
-      var _this$addedChildren$l;
+    value: function moveChild(child, index) {
       var currentIndex = this.allChildren.indexOf(child);
-      if (currentIndex === newIndex) {
-        return this;
-      }
       this.deletedChildren.push(child);
-      this.addedChildren.count++;
-      var segment = [{
-        index: newIndex,
-        segment: [child]
-      }];
-      (_this$addedChildren$l = this.addedChildren.list).push.apply(_this$addedChildren$l, segment);
-      this.addedChildren.list.sort(function (a, b) {
-        return a.index - b.index;
+      this.addedChildren.push({
+        index: currentIndex < index ? index - 1 : index,
+        originalIndex: index,
+        child: child
       });
-      (0, _App.getRunScheduler)().schedule(1, 'removeChild-' + this.oid + "-" + child.oid);
+      if (child.hasDom() && child.requiresDomRelocation()) {
+        child.domOrderIndex = index;
+        child.activate();
+      }
+      (0, _App.getRunScheduler)().schedule(1, 'moveChild-' + this.oid + "-" + child.oid);
       return this;
     }
   }, {
@@ -169,27 +158,29 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
         });
         this.deletedChildren.length = 0;
       }
-      if (this.addedChildren.count > 0) {
-        this.addedChildren.list.forEach(function (_ref) {
+      if (this.addedChildren.length > 0) {
+        this.addedChildren.sort(function (a, b) {
+          return a.index - b.index;
+        });
+        this.addedChildren.forEach(function (_ref) {
           var index = _ref.index,
-            segment = _ref.segment;
-          segment.forEach(function (t) {
-            t.parent = _this2;
-            if (!_TUtil.TUtil.isDefined(t.val('canDeleteDom')) && _this2.val('canDeleteDom') === false) {
-              t.val('canDeleteDom', false);
-            }
-          });
+            originalIndex = _ref.originalIndex,
+            child = _ref.child;
+          child.parent = _this2;
+          if (!_TUtil.TUtil.isDefined(child.val('canDeleteDom')) && _this2.val('canDeleteDom') === false) {
+            child.val('canDeleteDom', false);
+          }
           if (index >= _this2.allChildren.length) {
-            var _this2$allChildren;
-            (_this2$allChildren = _this2.allChildren).push.apply(_this2$allChildren, _toConsumableArray(segment));
+            _this2.allChildren.push(child);
           } else {
-            var _this2$allChildren2;
-            (_this2$allChildren2 = _this2.allChildren).splice.apply(_this2$allChildren2, [index, 0].concat(_toConsumableArray(segment)));
+            _this2.allChildren.splice(index, 0, child);
           }
+          _this2.lastChildrenUpdate.additions.push({
+            index: originalIndex,
+            child: child
+          });
         });
-        this.lastChildrenUpdate.additions = this.lastChildrenUpdate.additions.concat(this.addedChildren.list);
-        this.addedChildren.list.length = 0;
-        this.addedChildren.count = 0;
+        this.addedChildren.length = 0;
       }
       return this.allChildren;
     }
@@ -217,60 +208,60 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       if (_TUtil.TUtil.isDefined(this.val('calculateChildren'))) {
         return this.val('calculateChildren');
       }
-      var result = this.isIncluded() && (this.isVisible() || this.currentStatus === 'new') && (this.hasChildren() || this.addedChildren.count > 0 || this.getContentHeight() > 0);
+      var result = this.isIncluded() && (this.isVisible() || this.currentStatus === 'new') && (this.hasChildren() || this.addedChildren.length > 0 || this.getContentHeight() > 0);
       this.currentStatus = undefined;
       return result;
     }
   }, {
     key: "getFirstChild",
     value: function getFirstChild() {
-      return this.hasChildren() ? this.getChildren()[0] : undefined;
+      return this.allChildren[0];
     }
   }, {
     key: "hasChildren",
     value: function hasChildren() {
-      return this.getChildren().length > 0;
+      return this.allChildren.length > 0;
     }
   }, {
     key: "findChildren",
     value: function findChildren(type) {
-      return this.getChildren().filter(function (child) {
+      return this.allChildren.filter(function (child) {
         return child.type === type;
       });
     }
   }, {
     key: "getLastChild",
     value: function getLastChild() {
-      return this.hasChildren() ? this.getChildren()[this.getChildren().length - 1] : undefined;
+      return this.allChildren[this.allChildren.length - 1];
     }
   }, {
     key: "getChild",
     value: function getChild(index) {
-      return this.hasChildren() ? this.getChildren()[index] : undefined;
+      return this.allChildren[index];
     }
   }, {
     key: "getChildIndex",
     value: function getChildIndex(child) {
-      return this.getChildren().indexOf(child);
+      return this.allChildren.indexOf(child);
     }
   }, {
     key: "getChildrenOids",
     value: function getChildrenOids() {
-      return this.getChildren().map(function (o) {
+      return this.allChildren.map(function (o) {
         return o.oid;
       }).join(" ");
     }
   }, {
     key: "findChild",
     value: function findChild(type) {
-      return this.getChildren().find(function (child) {
+      return this.allChildren.find(function (child) {
         return child.type === type;
       });
     }
   }, {
     key: "findLastChild",
     value: function findLastChild(type) {
-      return this.getChildren().findLast(function (child) {
+      return this.allChildren.findLast(function (child) {
         return child.type === type;
       });
     }
@@ -531,6 +522,11 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
     value: function canHaveDom() {
       return this.val('canHaveDom');
     }
+  }, {
+    key: "requiresDomRelocation",
+    value: function requiresDomRelocation() {
+      return _TUtil.TUtil.isDefined(this.val('requiresDomRelocation')) ? this.val('requiresDomRelocation') : !_TUtil.TUtil.isDefined(this.transformMap.x) && !_TUtil.TUtil.isDefined(this.transformMap.y);
+    }
   }, {
     key: "getBaseElement",
     value: function getBaseElement() {

package/build/TModelManager.js

@@ -42,6 +42,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
         restyle: [],
         reasyncStyle: [],
         reattach: [],
+        relocation: [],
         invisibleDom: [],
         noDom: [],
         updatingTModels: [],
@@ -62,6 +63,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
       this.lists.restyle.length = 0;
       this.lists.reasyncStyle.length = 0;
       this.lists.reattach.length = 0;
+      this.lists.relocation.length = 0;
       this.lists.noDom.length = 0;
       this.lists.updatingTModels.length = 0;
       this.lists.updatingTargets.length = 0;
@@ -99,6 +101,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
             this.needsRerender(tmodel);
             this.needsRestyle(tmodel);
             this.needsReattach(tmodel);
+            this.needsRelocation(tmodel);
             if (tmodel.updatingTargetList.length > 0) {
               this.lists.updatingTModels.push(tmodel);
               this.lists.updatingTargets = [].concat(_toConsumableArray(this.lists.updatingTargets), _toConsumableArray(tmodel.updatingTargetList));
@@ -126,7 +129,16 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
         return tmodel !== null && tmodel.hasDom() && tmodel.canDeleteDom();
       });
       (_this$lists$invisible = this.lists.invisibleDom).push.apply(_this$lists$invisible, _toConsumableArray(lastVisible));
-      return this.lists.noDom.length > 0 ? 0 : this.lists.reattach.length > 0 ? 1 : this.lists.rerender.length > 0 ? 2 : this.lists.reasyncStyle.length > 0 ? 3 : this.lists.invisibleDom.length > 0 ? 4 : this.lists.restyle.length > 0 ? 5 : -1;
+      return this.lists.noDom.length > 0 ? 0 : this.lists.reattach.length > 0 ? 1 : this.lists.relocation.length > 0 ? 2 : this.lists.rerender.length > 0 ? 3 : this.lists.reasyncStyle.length > 0 ? 4 : this.lists.invisibleDom.length > 0 ? 5 : this.lists.restyle.length > 0 ? 10 : -1;
+    }
+  }, {
+    key: "needsRelocation",
+    value: function needsRelocation(tmodel) {
+      if (tmodel.hasDom() && _TUtil.TUtil.isDefined(tmodel.domOrderIndex)) {
+        this.lists.relocation.push(tmodel);
+        return true;
+      }
+      return false;
     }
   }, {
     key: "needsRerender",
@@ -202,14 +214,34 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "deleteDoms",
-    value: function deleteDoms() {
-      var _iterator4 = _createForOfIteratorHelper(this.lists.invisibleDom),
+    key: "relocateTModels",
+    value: function relocateTModels() {
+      this.lists.relocation.sort(function (a, b) {
+        return b.domOrderIndex - a.domOrderIndex;
+      });
+      var _iterator4 = _createForOfIteratorHelper(this.lists.relocation),
         _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var _tmodel$$dom4;
           var tmodel = _step4.value;
+          tmodel.getDomParent().$dom.relocate(tmodel, tmodel.domOrderIndex);
+          tmodel.domOrderIndex = undefined;
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+    }
+  }, {
+    key: "deleteDoms",
+    value: function deleteDoms() {
+      var _iterator5 = _createForOfIteratorHelper(this.lists.invisibleDom),
+        _step5;
+      try {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var _tmodel$$dom4;
+          var tmodel = _step5.value;
           tmodel.styleMap = {};
           tmodel.transformMap = {};
           tmodel.val('isVisible', false);
@@ -217,46 +249,46 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
           tmodel.$dom = null;
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
       this.lists.invisibleDom.length = 0;
     }
   }, {
     key: "fixStyles",
     value: function fixStyles() {
-      var _iterator5 = _createForOfIteratorHelper(this.lists.restyle),
-        _step5;
+      var _iterator6 = _createForOfIteratorHelper(this.lists.restyle),
+        _step6;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var tmodel = _step5.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var tmodel = _step6.value;
           if (tmodel.hasDom()) {
             _TModelUtil.TModelUtil.fixStyle(tmodel);
           }
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
     }
   }, {
     key: "fixAsyncStyles",
     value: function fixAsyncStyles() {
-      var _iterator6 = _createForOfIteratorHelper(this.lists.reasyncStyle),
-        _step6;
+      var _iterator7 = _createForOfIteratorHelper(this.lists.reasyncStyle),
+        _step7;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var tmodel = _step6.value;
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var tmodel = _step7.value;
           if (tmodel.hasDom()) {
             _TModelUtil.TModelUtil.fixAsyncStyle(tmodel);
           }
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator6.f();
+        _iterator7.f();
       }
     }
   }, {
@@ -282,11 +314,11 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
       this.lists.noDom.sort(function (a, b) {
         return a.getUIDepth() < b.getUIDepth() ? -1 : 1;
       });
-      var _iterator7 = _createForOfIteratorHelper(this.lists.noDom),
-        _step7;
+      var _iterator8 = _createForOfIteratorHelper(this.lists.noDom),
+        _step8;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var _tmodel = _step7.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var _tmodel = _step8.value;
           var $dom = void 0;
           if (_$Dom.$Dom.query("#".concat(_tmodel.oid))) {
             $dom = new _$Dom.$Dom("#".concat(_tmodel.oid));
@@ -297,9 +329,9 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator7.f();
+        _iterator8.f();
       }
       for (var _i = 0, _needsDom = needsDom; _i < _needsDom.length; _i++) {
         var _tmodel$getDomHolder;

package/build/TModelUtil.js

@@ -22,45 +22,6 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
     _classCallCheck(this, TModelUtil);
   }
   return _createClass(TModelUtil, null, [{
-    key: "addItem",
-    value: function addItem(list, child, index) {
-      var merged = false;
-      for (var i = 0; i < list.length; i++) {
-        var entry = list[i];
-        var startIndex = entry.index;
-        var endIndex = entry.index + entry.segment.length - 1;
-        if (index === endIndex + 1) {
-          entry.segment.push(child);
-          merged = true;
-        } else if (index >= startIndex && index <= endIndex) {
-          entry.segment.splice(index - startIndex, 0, child);
-          merged = true;
-        } else if (index === startIndex - 1) {
-          entry.segment.unshift(child);
-          entry.index = index;
-          merged = true;
-        }
-        if (merged) {
-          var _endIndex = entry.index + entry.segment.length - 1;
-          if (i + 1 < list.length && _endIndex === list[i + 1].index) {
-            var nextEntry = list[i + 1];
-            entry.segment = entry.segment.concat(nextEntry.segment);
-            list.splice(i + 1, 1);
-          }
-          break;
-        }
-      }
-      if (!merged) {
-        list.push({
-          index: index,
-          segment: [child]
-        });
-        list.sort(function (a, b) {
-          return a.index - b.index;
-        });
-      }
-    }
-  }, {
     key: "defaultActualValues",
     value: function defaultActualValues() {
       return {

package/build/TUtil.js

@@ -128,14 +128,14 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
       var maxDistance = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 100;
       var distance = current - past;
       var speed = time < 10 ? Math.abs(distance) / 10 : Math.abs(distance) / time;
-      var duration = Math.min(speed / deceleration, 300);
+      var duration = speed / deceleration;
       var momentumDistance = Math.pow(speed, 2) / (2 * deceleration);
       if (momentumDistance > maxDistance) {
         momentumDistance = maxDistance;
       }
       var adjustedDistance = distance > 0 ? distance + momentumDistance : distance - momentumDistance;
       return {
-        distance: Math.round(adjustedDistance) / 20,
+        distance: Math.round(adjustedDistance) / 5,
         duration: Math.round(duration),
         momentumDistance: momentumDistance
       };
@@ -221,7 +221,8 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
           var g = _step2.value;
           var gtab = g.isVisible() ? tab + '|  ' : tab + 'x  ';
           if (g.type === 'BI') {
-            console.log("".concat(gtab).concat(g.oid, " v:").concat(g.isVisible(), " x:").concat(Math.floor(g.getX()), " y:").concat(Math.floor(g.getY()), ", absY:").concat(Math.floor(g.absY), " yy:").concat(Math.floor(g.absY + g.getDomParent().absY), " w:").concat(Math.floor(g.getWidth()), " h:").concat(Math.floor(g.getHeight()), " hc:").concat(Math.floor(g.getContentHeight())));
+            console.log("".concat(gtab).concat(g.oid, " ").concat(g.startIndex, "-").concat(g.endIndex));
+            //console.log(`${gtab}${g.oid} v:${g.isVisible()} x:${Math.floor(g.getX())} y:${Math.floor(g.getY())}, absY:${Math.floor(g.absY)} yy:${Math.floor(g.absY + g.getDomParent().absY)} w:${Math.floor(g.getWidth())} h:${Math.floor(g.getHeight())} hc:${Math.floor(g.getContentHeight())}`);
           } else {
             console.log("".concat(gtab).concat(g.oid, " v:").concat(g.isVisible(), " x:").concat(Math.floor(g.getX()), " y:").concat(Math.floor(g.getY()), " absY:").concat(Math.floor(g.absY), " yy:").concat(Math.floor(g.absY + g.getDomParent().absY), " w:").concat(Math.floor(g.getWidth()), " h:").concat(Math.floor(g.getHeight()), " hc:").concat(Math.floor(g.getContentHeight())));
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.125",
+  "version": "1.0.128",
   "keywords": [
     "targetj"
   ],