targetj 1.0.232 → 1.0.234

package/build/TargetUtil.js

@@ -7,13 +7,13 @@ exports.TargetUtil = void 0;
 var _App = require("./App.js");
 var _TUtil = require("./TUtil.js");
 var _TargetData = require("./TargetData.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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw 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."); }
+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 _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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
-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 _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); } }
@@ -203,7 +203,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
               if (prevOk === true) {
                 TargetUtil.activateTargetOnce(tmodel, nextTarget);
                 nextTargetActivated = true;
-                TargetUtil.clearPendingTargets(tmodel, key);
+                TargetUtil.clearPendingTargetsForNextTarget(tmodel, nextTarget);
                 tmodel.targetValues[nextTarget].triggeredByCompleteCount = targetValue.completeCount;
               } else {
                 TargetUtil.markPendingTargets(tmodel, key);
@@ -224,7 +224,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
               tmodel.removeFromActiveTargets(nextTarget);
               TargetUtil.activateTarget(tmodel, nextTarget);
               nextTargetActivated = true;
-              TargetUtil.clearPendingTargets(tmodel, key);
+              TargetUtil.clearPendingTargetsForNextTarget(tmodel, nextTarget);
               tmodel.targetValues[nextTarget].triggeredByCompleteCount = targetValue.completeCount;
             } else {
               TargetUtil.markPendingTargets(tmodel, key);
@@ -269,8 +269,8 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       (tmodel.pendingTargets || (tmodel.pendingTargets = new Set())).add(key);
     }
   }, {
-    key: "clearPendingTargets",
-    value: function clearPendingTargets(tmodel, key) {
+    key: "clearPendingTarget",
+    value: function clearPendingTarget(tmodel, key) {
       var pending = tmodel.pendingTargets;
       if (!pending) {
         return;
@@ -280,11 +280,29 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         tmodel.pendingTargets = undefined;
       }
     }
+  }, {
+    key: "clearPendingTargetsForNextTarget",
+    value: function clearPendingTargetsForNextTarget(tmodel, nextTarget) {
+      var pending = tmodel.pendingTargets;
+      if (!pending) {
+        return;
+      }
+      for (var _i = 0, _arr = _toConsumableArray(pending); _i < _arr.length; _i++) {
+        var _tmodel$targets$key;
+        var key = _arr[_i];
+        if (((_tmodel$targets$key = tmodel.targets[key]) === null || _tmodel$targets$key === void 0 ? void 0 : _tmodel$targets$key.activateNextTarget) === nextTarget) {
+          pending.delete(key);
+        }
+      }
+      if (pending.size === 0) {
+        tmodel.pendingTargets = undefined;
+      }
+    }
   }, {
     key: "cleanupTarget",
     value: function cleanupTarget(tmodel, key) {
       if (tmodel.isTargetComplete(key) || !TargetUtil.isTargetFullyCompleted(tmodel, key)) {
-        return;
+        return false;
       }
       tmodel.setTargetComplete(key);
       var target = tmodel.targets[key];
@@ -301,6 +319,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         target.fetchAction = false;
       }
       TargetUtil.bubbleInvokerCompletion(tmodel, key);
+      return true;
     }
   }, {
     key: "bubbleInvokerCompletion",
@@ -333,9 +352,9 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       };
       tryCleanupAndBubble(targetValue.originalTModel, targetValue.originalTargetName);
       if (!tmodel.isTargetImperative(key)) {
-        var _tmodel$targets$key, _tmodel$targets$key2;
+        var _tmodel$targets$key2, _tmodel$targets$key3;
         tryCleanupAndBubble(targetValue.invokerTModel, targetValue.invokerTargetName);
-        tryCleanupAndBubble((_tmodel$targets$key = tmodel.targets[key]) === null || _tmodel$targets$key === void 0 ? void 0 : _tmodel$targets$key.originalTModel, (_tmodel$targets$key2 = tmodel.targets[key]) === null || _tmodel$targets$key2 === void 0 ? void 0 : _tmodel$targets$key2.originalTargetName);
+        tryCleanupAndBubble((_tmodel$targets$key2 = tmodel.targets[key]) === null || _tmodel$targets$key2 === void 0 ? void 0 : _tmodel$targets$key2.originalTModel, (_tmodel$targets$key3 = tmodel.targets[key]) === null || _tmodel$targets$key3 === void 0 ? void 0 : _tmodel$targets$key3.originalTargetName);
       }
     }
   }, {
@@ -478,12 +497,12 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
           if (TargetUtil.shouldIgnoreChildForCompletion(child, waitForChildren)) {
             continue;
           }
-          if (_App.App.tmodelIdMap[child.oid] && !TargetUtil.isTModelComplete(child)) {
-            return false;
+          if (child.exists() && !TargetUtil.isTModelComplete(child)) {
+            return child.oid;
           }
           if (child.hasChildren()) {
             if (!TargetUtil.areTargetChildrenComplete(child.getChildren(), waitForChildren)) {
-              return false;
+              return child.oid;
             }
           }
         }
@@ -642,7 +661,9 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       tmodel.clearActiveChildren();
       tmodel.clearAnimatingChildren();
       (0, _App.getLocationManager)().domIslandSet.delete(tmodel);
-      delete _App.App.tmodelIdMap[tmodel.oid];
+      if (_App.App.tmodelIdMap[tmodel.oid] === tmodel) {
+        delete _App.App.tmodelIdMap[tmodel.oid];
+      }
     }
   }, {
     key: "getOriginalNames",
@@ -653,9 +674,9 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         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$key3, _tmodel$targets$key4;
-        originalTModel = (_tmodel$targets$key3 = tmodel.targets[key]) === null || _tmodel$targets$key3 === void 0 ? void 0 : _tmodel$targets$key3.originalTModel;
-        originalTargetName = (_tmodel$targets$key4 = tmodel.targets[key]) === null || _tmodel$targets$key4 === void 0 ? void 0 : _tmodel$targets$key4.originalTargetName;
+        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;
+        originalTargetName = (_tmodel$targets$key5 = tmodel.targets[key]) === null || _tmodel$targets$key5 === void 0 ? void 0 : _tmodel$targets$key5.originalTargetName;
       }
       return {
         originalTModel: originalTModel,
@@ -746,7 +767,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       tmodel.removeFromActiveTargets(key);
       tmodel.removeFromAnimatingMap(key);
       tmodel.removeFromUpdatingTargets(key);
-      TargetUtil.clearPendingTargets(tmodel, key);
+      TargetUtil.clearPendingTarget(tmodel, key);
     }
   }]);
 }();

package/build/Viewport.js

@@ -154,6 +154,12 @@ var Viewport = exports.Viewport = /*#__PURE__*/function () {
       this.ySouth = Math.max(ySouth, this.ySouth);
       child.getRealParent().viewport.xEast = Math.max(child.getRealParent().viewport.xEast, this.xEast);
       child.getRealParent().viewport.ySouth = Math.max(child.getRealParent().viewport.ySouth, this.ySouth);
+      if (this.container.getContainerOverflowMode() === 'always' || this.currentChild.getItemOverflowMode() === 'always') {
+        this.yEast = child.getRealParent().viewport.ySouth;
+        this.yNext = child.getRealParent().viewport.ySouth;
+        this.xNext = child.getRealParent().viewport.xWest;
+        this.xSouth = child.getRealParent().viewport.xWest;
+      }
     }
   }]);
 }();