targetj 1.0.254 → 1.0.256

package/build/$Dom.js

@@ -133,10 +133,15 @@ var $Dom = /*#__PURE__*/function () {
       }
       return slot;
     }
+  }, {
+    key: "isManagedChildNode",
+    value: function isManagedChildNode(node) {
+      return (node === null || node === void 0 ? void 0 : node.nodeType) === 1 && node.getAttribute("tgjs") === "true";
+    }
   }, {
     key: "enableSlotMode",
     value: function enableSlotMode() {
-      var _this$element4;
+      var _this = this;
       if (this.slotModeEnabled) {
         return;
       }
@@ -144,32 +149,24 @@ var $Dom = /*#__PURE__*/function () {
         this.slotModeEnabled = true;
         return;
       }
-      var existingSlot = this.findContentSlot();
-      if (existingSlot) {
-        if (this.element.firstChild !== existingSlot) {
-          this.element.insertBefore(existingSlot, this.element.firstChild);
+      var slot = this.findContentSlot();
+      if (!slot) {
+        var existingNodes = Array.from(this.element.childNodes);
+        slot = document.createElement("div");
+        slot.setAttribute("data-tj-slot", "content");
+        this.element.insertBefore(slot, this.element.firstChild);
+        for (var _i = 0, _existingNodes = existingNodes; _i < _existingNodes.length; _i++) {
+          var node = _existingNodes[_i];
+          if (!this.isManagedChildNode(node)) {
+            slot.appendChild(node);
+          }
         }
-        this.contentSlot = existingSlot;
-        this.slotModeEnabled = true;
-        this.hasRealChildren = Array.from(this.element.childNodes).some(function (node) {
-          return node !== existingSlot;
-        });
-        return;
-      }
-      if (!((_this$element4 = this.element) !== null && _this$element4 !== void 0 && _this$element4.firstChild)) {
-        this.slotModeEnabled = true;
-        return;
-      }
-      var existingNodes = Array.from(this.element.childNodes);
-      var slot = document.createElement("div");
-      slot.setAttribute("data-tj-slot", "content");
-      this.element.insertBefore(slot, this.element.firstChild);
-      for (var _i = 0, _existingNodes = existingNodes; _i < _existingNodes.length; _i++) {
-        var node = _existingNodes[_i];
-        slot.appendChild(node);
       }
       this.contentSlot = slot;
       this.slotModeEnabled = true;
+      this.hasRealChildren = Array.from(this.element.children).some(function (child) {
+        return child !== slot && _this.isManagedChildNode(child);
+      });
     }
   }, {
     key: "ensureSlotMode",
@@ -201,8 +198,8 @@ var $Dom = /*#__PURE__*/function () {
   }, {
     key: "getTagName",
     value: function getTagName() {
-      var _this$element5;
-      return (_this$element5 = this.element) === null || _this$element5 === void 0 || (_this$element5 = _this$element5.tagName) === null || _this$element5 === void 0 ? void 0 : _this$element5.toLowerCase();
+      var _this$element4;
+      return (_this$element4 = this.element) === null || _this$element4 === void 0 || (_this$element4 = _this$element4.tagName) === null || _this$element4 === void 0 ? void 0 : _this$element4.toLowerCase();
     }
   }, {
     key: "setSelector",
@@ -291,9 +288,9 @@ var $Dom = /*#__PURE__*/function () {
   }, {
     key: "setStyleByMap",
     value: function setStyleByMap(attrMap) {
-      var _this = this;
+      var _this2 = this;
       Object.keys(attrMap).forEach(function (key) {
-        _this.style(key, attrMap[key]);
+        _this2.style(key, attrMap[key]);
       });
     }
   }, {
@@ -578,14 +575,14 @@ var $Dom = /*#__PURE__*/function () {
   }, {
     key: "getScrollTop",
     value: function getScrollTop() {
-      var _this$element$scrollT, _this$element6;
-      return (_this$element$scrollT = (_this$element6 = this.element) === null || _this$element6 === void 0 ? void 0 : _this$element6.scrollTop) !== null && _this$element$scrollT !== void 0 ? _this$element$scrollT : 0;
+      var _this$element$scrollT, _this$element5;
+      return (_this$element$scrollT = (_this$element5 = this.element) === null || _this$element5 === void 0 ? void 0 : _this$element5.scrollTop) !== null && _this$element$scrollT !== void 0 ? _this$element$scrollT : 0;
     }
   }, {
     key: "getScrollLeft",
     value: function getScrollLeft() {
-      var _this$element$scrollL, _this$element7;
-      return (_this$element$scrollL = (_this$element7 = this.element) === null || _this$element7 === void 0 ? void 0 : _this$element7.scrollLeft) !== null && _this$element$scrollL !== void 0 ? _this$element$scrollL : 0;
+      var _this$element$scrollL, _this$element6;
+      return (_this$element$scrollL = (_this$element6 = this.element) === null || _this$element6 === void 0 ? void 0 : _this$element6.scrollLeft) !== null && _this$element$scrollL !== void 0 ? _this$element$scrollL : 0;
     }
   }], [{
     key: "createTemplate",

package/build/TargetUtil.js

@@ -239,7 +239,7 @@ var TargetUtil = /*#__PURE__*/function () {
         if (!isEndTrigger) {
           targetValue.nextTargetUpdateCount = targetValue.updateCount;
         } else {
-          TargetUtil.setTriggeredByCompleteCount(tmodel, nextTarget, key, targetValue.completeCount);
+          TargetUtil.snapshotTriggeredByCompleteCounts(tmodel, nextTarget);
         }
       }
       var caughtUp = false;
@@ -395,12 +395,25 @@ var TargetUtil = /*#__PURE__*/function () {
       return (_tmodel$targetValues$2 = (_tmodel$targetValues$3 = tmodel.targetValues[nextTarget]) === null || _tmodel$targetValues$3 === void 0 || (_tmodel$targetValues$3 = _tmodel$targetValues$3.triggeredByCompleteCountMap) === null || _tmodel$targetValues$3 === void 0 ? void 0 : _tmodel$targetValues$3.get(key)) !== null && _tmodel$targetValues$2 !== void 0 ? _tmodel$targetValues$2 : 0;
     }
   }, {
-    key: "setTriggeredByCompleteCount",
-    value: function setTriggeredByCompleteCount(tmodel, nextTarget, key, count) {
+    key: "snapshotTriggeredByCompleteCounts",
+    value: function snapshotTriggeredByCompleteCounts(tmodel, nextTarget) {
       var _tmodel$targetValues;
       var nextTargetValue = (_tmodel$targetValues = tmodel.targetValues)[nextTarget] || (_tmodel$targetValues[nextTarget] = TargetUtil.emptyValue());
-      var triggeredByMap = nextTargetValue.triggeredByCompleteCountMap || (nextTargetValue.triggeredByCompleteCountMap = new Map());
-      triggeredByMap.set(key, count);
+      var map = nextTargetValue.triggeredByCompleteCountMap || (nextTargetValue.triggeredByCompleteCountMap = new Map());
+      var nextIndex = tmodel.functionTargetNames.indexOf(nextTarget);
+      if (nextIndex < 0) {
+        return;
+      }
+      for (var i = 0; i < nextIndex; i++) {
+        var _tmodel$targetValues$4, _tmodel$targetValues$5;
+        var previousKey = tmodel.functionTargetNames[i];
+        var previousTarget = tmodel.targets[previousKey];
+        if ((previousTarget === null || previousTarget === void 0 ? void 0 : previousTarget.activateNextTarget) !== nextTarget) {
+          continue;
+        }
+        var completeCount = (_tmodel$targetValues$4 = (_tmodel$targetValues$5 = tmodel.targetValues[previousKey]) === null || _tmodel$targetValues$5 === void 0 ? void 0 : _tmodel$targetValues$5.completeCount) !== null && _tmodel$targetValues$4 !== void 0 ? _tmodel$targetValues$4 : 0;
+        map.set(previousKey, completeCount);
+      }
     }
   }, {
     key: "activateTargetOnce",
@@ -836,9 +849,9 @@ var TargetUtil = /*#__PURE__*/function () {
     value: function getOriginalNames(tmodel, key) {
       var originalTModel, originalTargetName;
       if (tmodel.isTargetImperative(key)) {
-        var _tmodel$targetValues$4, _tmodel$targetValues$5;
-        originalTModel = (_tmodel$targetValues$4 = tmodel.targetValues[key]) === null || _tmodel$targetValues$4 === void 0 ? void 0 : _tmodel$targetValues$4.originalTModel;
-        originalTargetName = (_tmodel$targetValues$5 = tmodel.targetValues[key]) === null || _tmodel$targetValues$5 === void 0 ? void 0 : _tmodel$targetValues$5.originalTargetName;
+        var _tmodel$targetValues$6, _tmodel$targetValues$7;
+        originalTModel = (_tmodel$targetValues$6 = tmodel.targetValues[key]) === null || _tmodel$targetValues$6 === void 0 ? void 0 : _tmodel$targetValues$6.originalTModel;
+        originalTargetName = (_tmodel$targetValues$7 = tmodel.targetValues[key]) === null || _tmodel$targetValues$7 === void 0 ? void 0 : _tmodel$targetValues$7.originalTargetName;
       } else {
         var _tmodel$targets$key4, _tmodel$targets$key5;
         originalTModel = (_tmodel$targets$key4 = tmodel.targets[key]) === null || _tmodel$targets$key4 === void 0 ? void 0 : _tmodel$targets$key4.originalTModel;