targetj 1.0.233 → 1.0.235

package/build/TargetData.js

@@ -708,7 +708,11 @@ _defineProperty(TargetData, "attributesToTargets", {
   onscroll: 'onScroll',
   onscrollleft: 'onScrollLeft',
   onscrolltop: 'onScrollTop',
+  onscrollleftend: 'onScrollLeftEnd',
+  onscrolltopend: 'onScrollTopEnd',
   onwindowscroll: 'onWindowScroll',
+  onwindowscrolltopend: 'onWindowScrollTopEnd',
+  onwindowscrollleftend: 'onWindowScrollLeftEnd',
   onpopstate: 'onPopState',
   onchange: 'onChange',
   oninput: 'onInput',
@@ -796,7 +800,11 @@ _defineProperty(TargetData, "targetToEventsMapping", {
   onScroll: ['touchStart', 'mouseStart', 'wheelEvents'],
   onScrollLeft: ['touchStart', 'mouseStart', 'wheelEvents'],
   onScrollTop: ['touchStart', 'mouseStart', 'wheelEvents'],
+  onScrollLeftEnd: ['touchStart', 'mouseStart', 'wheelEvents'],
+  onScrollTopEnd: ['touchStart', 'mouseStart', 'wheelEvents'],
   onWindowScroll: ['containerScroll'],
+  onWindowScrollTopEnd: ['containerScroll'],
+  onWindowScrollLeftEnd: ['containerScroll'],
   onPopState: ['popState'],
   onChange: ['changeEvents'],
   onInput: ['inputEvents'],
@@ -879,8 +887,20 @@ _defineProperty(TargetData, "allEventMap", {
   onScrollLeft: function onScrollLeft(tmodel) {
     return (0, _App.getEvents)().getOrientation() !== 'vertical' && (0, _App.getEvents)().isScrollLeftHandler(tmodel) && (0, _App.getEvents)().deltaX();
   },
-  onWindowScroll: function onWindowScroll() {
-    return (0, _App.getEvents)().getEventType() === 'scroll';
+  onScrollTopEnd: function onScrollTopEnd(tmodel) {
+    return (0, _App.getEvents)().getEventType() === 'scrolltopend' && (0, _App.getEvents)().isScrollTopEndHandler(tmodel);
+  },
+  onScrollLeftEnd: function onScrollLeftEnd(tmodel) {
+    return (0, _App.getEvents)().getEventType() === 'scrollleftend' && (0, _App.getEvents)().isScrollLeftEndHandler(tmodel);
+  },
+  onWindowScroll: function onWindowScroll(tmodel) {
+    return (0, _App.getEvents)().getEventType() === 'scroll' && (0, _App.getEvents)().getEventTModel() === tmodel;
+  },
+  onWindowScrollTopEnd: function onWindowScrollTopEnd(tmodel) {
+    return (0, _App.getEvents)().getEventType() === 'windowscrolltopend' && (0, _App.getEvents)().getEventTModel() === tmodel;
+  },
+  onWindowScrollLeftEnd: function onWindowScrollLeftEnd(tmodel) {
+    return (0, _App.getEvents)().getEventType() === 'windowscrollleftend' && (0, _App.getEvents)().getEventTModel() === tmodel;
   },
   onPopState: function onPopState() {
     return (0, _App.getEvents)().getEventType() === 'popstate';

package/build/TargetExecutor.js

@@ -163,7 +163,7 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
       var newStatus = TargetExecutor.calculateTargetStatus(tmodel, targetValue, key);
       tmodel.setTargetStatus(key, newStatus);
       if (!_TargetData.TargetData.ignoreRerun[key] && tmodel.shouldScheduleRun(key)) {
-        (0, _App.getRunScheduler)().schedule(1, 'updateTarget2-' + tmodel.oid + "-" + key);
+        (0, _App.getRunScheduler)().schedule(1, 'updateTarget2-' + tmodel.oid);
       }
     }
   }, {

package/build/TargetManager.js

@@ -65,7 +65,7 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
         }
         var schedulePeriod = _TUtil.TUtil.scheduleExecution(tmodel, key);
         if (schedulePeriod > 0) {
-          (0, _App.getRunScheduler)().timeSchedule(schedulePeriod, "targetSchedule__".concat(tmodel.oid, "__").concat(key, "_").concat(schedulePeriod));
+          (0, _App.getRunScheduler)().schedule(schedulePeriod, "targetSchedule__".concat(tmodel.oid));
           return;
         }
       }
@@ -97,7 +97,7 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
           var key = _step2.value;
           schedulePeriod = _TUtil.TUtil.scheduleExecution(tmodel, key);
           if (schedulePeriod > 0) {
-            (0, _App.getRunScheduler)().schedule(schedulePeriod, "setActualValues-".concat(tmodel.oid, "__").concat(key, "_").concat(schedulePeriod));
+            (0, _App.getRunScheduler)().schedule(schedulePeriod, "setActualValues-".concat(tmodel.oid));
           } else {
             tmodel.resetScheduleTimeStamp(key);
             this.setActualValue(tmodel, key);
@@ -333,7 +333,7 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
         return;
       }
       if (!tmodel.isTargetImperative(key) && !tmodel.isTargetEnabled(key)) {
-        (0, _App.getRunScheduler)().schedule(15, "setActualValue-postpone-".concat(tmodel.oid, "__").concat(key));
+        (0, _App.getRunScheduler)().schedule(15, "setActualValue-postpone-".concat(tmodel.oid, "}"));
         return;
       }
       var theValue = tmodel.getTargetValue(key);

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);
       }
     }
   }, {
@@ -392,7 +411,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "isTargetFullyCompleted",
     value: function isTargetFullyCompleted(tmodel, key) {
-      var result = !tmodel.isTargetUpdating(key) && tmodel.isTargetCompleteDeep(key) === true;
+      var result = !tmodel.isTargetUpdating(key) && tmodel.isTargetTreeComplete(key) === true;
       if (result && !tmodel.isTargetImperative(key)) {
         result = !tmodel.hasUpdatingImperativeTargets(key);
       }
@@ -418,17 +437,17 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         if (tmodel.hasUpdatingImperativeTargets(targetName)) {
           return tmodel.oid + "." + targetName + ": " + tmodel.getUpdatingImperativeTargets(targetName);
         }
-        if (tmodel.isTargetCompleteDeep(targetName) !== true) {
-          //const activeChildrenList = [ ...(tmodel.activeChildrenMap?.values() ?? []) ];
-          //return  tmodel.oid + "." + targetName + " ==> " + tmodel.getTargetStatus(targetName) + ", " + tmodel.isTargetCompleteDeep(targetName) + ":: " + activeChildrenList.map(t => t.oid + ':' + t.hasAnyUpdates()) + ", " + [ ...TargetUtil.getUpdatingChildren(tmodel, targetName).keys() ]; 
+        if (tmodel.isTargetTreeComplete(targetName) !== true) {
+          //const activeChildrenList = [ ...TargetUtil.getActiveChildren(tmodel, tmodel.targets[targetName].completionScope).values() ];
+          //return  tmodel.oid + "." + targetName + " ==> " + tmodel.getTargetStatus(targetName) + ", " + tmodel.isTargetTreeComplete(targetName) + ":: " + activeChildrenList.map(t => t.oid + ':' + t.hasAnyUpdates()) + ", " + [ ...TargetUtil.getUpdatingChildren(tmodel, targetName).keys() ]; 
           return false;
         }
       }
       return true;
     }
   }, {
-    key: "isTargetCompleteDeep",
-    value: function isTargetCompleteDeep(tmodel, key) {
+    key: "isTargetTreeComplete",
+    value: function isTargetTreeComplete(tmodel, key) {
       var target = tmodel.targets[key];
       if (target) {
         var _target$childAction, _target$childAction2, _target$childAction3;
@@ -448,13 +467,13 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         if (!tmodel.isTargetComplete(key) && !tmodel.isTargetDone(key)) {
           return 'not done';
         }
-        if (((_target$childAction = target.childAction) === null || _target$childAction === void 0 ? void 0 : _target$childAction.length) > 0 && TargetUtil.getUpdatingChildren(tmodel, key, target.waitForChildren).size > 0) {
+        if (((_target$childAction = target.childAction) === null || _target$childAction === void 0 ? void 0 : _target$childAction.length) > 0 && TargetUtil.getUpdatingChildren(tmodel, key, target.completionScope).size > 0) {
           return 'updating children';
         }
-        if (((_target$childAction2 = target.childAction) === null || _target$childAction2 === void 0 ? void 0 : _target$childAction2.length) > 0 && TargetUtil.getActiveChildren(tmodel, target.waitForChildren).size > 0) {
+        if (((_target$childAction2 = target.childAction) === null || _target$childAction2 === void 0 ? void 0 : _target$childAction2.length) > 0 && TargetUtil.getActiveChildren(tmodel, target.completionScope).size > 0) {
           return 'active children';
         }
-        if (((_target$childAction3 = target.childAction) === null || _target$childAction3 === void 0 ? void 0 : _target$childAction3.length) > 0 && TargetUtil.areTargetChildrenComplete(target.childAction, target.waitForChildren) !== true) {
+        if (((_target$childAction3 = target.childAction) === null || _target$childAction3 === void 0 ? void 0 : _target$childAction3.length) > 0 && TargetUtil.areTargetChildrenComplete(target.childAction, target.completionScope) !== true) {
           return 'incomplete children';
         }
         if (target.fetchAction && !(0, _App.getLoader)().isLoadingSuccessful(tmodel, key)) {
@@ -466,7 +485,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "areTargetChildrenComplete",
     value: function areTargetChildrenComplete(children) {
-      var waitForChildren = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'all';
+      var completionScope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'all';
       if (!children) {
         return true;
       }
@@ -475,15 +494,15 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var child = _step2.value;
-          if (TargetUtil.shouldIgnoreChildForCompletion(child, waitForChildren)) {
+          if (TargetUtil.shouldIgnoreChildForCompletion(child, completionScope)) {
             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;
+            if (!TargetUtil.areTargetChildrenComplete(child.getChildren(), completionScope)) {
+              return child.oid;
             }
           }
         }
@@ -498,12 +517,12 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
     key: "getUpdatingChildren",
     value: function getUpdatingChildren(tmodel, originalTargetName) {
       var _tmodel$updatingChild, _tmodel$updatingChild2, _tmodel$animatingChil, _tmodel$animatingChil2;
-      var waitForChildren = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "all";
+      var completionScope = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "all";
       var childrenMap = new Map();
       var children = [].concat(_toConsumableArray((_tmodel$updatingChild = (_tmodel$updatingChild2 = tmodel.updatingChildrenMap) === null || _tmodel$updatingChild2 === void 0 ? void 0 : _tmodel$updatingChild2.values()) !== null && _tmodel$updatingChild !== void 0 ? _tmodel$updatingChild : []), _toConsumableArray((_tmodel$animatingChil = (_tmodel$animatingChil2 = tmodel.animatingChildrenMap) === null || _tmodel$animatingChil2 === void 0 ? void 0 : _tmodel$animatingChil2.values()) !== null && _tmodel$animatingChil !== void 0 ? _tmodel$animatingChil : []));
       children.forEach(function (child) {
         var _child$updatingTarget;
-        if (TargetUtil.shouldIgnoreChildForCompletion(child, waitForChildren)) {
+        if (TargetUtil.shouldIgnoreChildForCompletion(child, completionScope)) {
           return;
         }
         var updatingList = [].concat(_toConsumableArray((_child$updatingTarget = child.updatingTargetList) !== null && _child$updatingTarget !== void 0 ? _child$updatingTarget : []), _toConsumableArray(child.animatingMap ? _toConsumableArray(child.animatingMap.keys()) : []));
@@ -544,11 +563,11 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
     key: "getActiveChildren",
     value: function getActiveChildren(tmodel) {
       var _tmodel$activeChildre, _tmodel$activeChildre2;
-      var waitForChildren = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'all';
+      var completionScope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'all';
       var childrenMap = new Map();
       var children = _toConsumableArray((_tmodel$activeChildre = (_tmodel$activeChildre2 = tmodel.activeChildrenMap) === null || _tmodel$activeChildre2 === void 0 ? void 0 : _tmodel$activeChildre2.values()) !== null && _tmodel$activeChildre !== void 0 ? _tmodel$activeChildre : []);
       children.forEach(function (child) {
-        if (TargetUtil.shouldIgnoreChildForCompletion(child, waitForChildren)) {
+        if (TargetUtil.shouldIgnoreChildForCompletion(child, completionScope)) {
           return;
         }
         if (child.activeTargetList.length) {
@@ -559,11 +578,11 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
     }
   }, {
     key: "shouldIgnoreChildForCompletion",
-    value: function shouldIgnoreChildForCompletion(child, waitForChildren) {
-      if (waitForChildren === "none") {
+    value: function shouldIgnoreChildForCompletion(child, completionScope) {
+      if (completionScope === "none") {
         return true;
       }
-      if (waitForChildren === "visible") {
+      if (completionScope === "visible") {
         return child.visibilityStatus && !child.isVisible();
       }
       return false;
@@ -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,15 +674,32 @@ 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,
         originalTargetName: originalTargetName
       };
     }
+  }, {
+    key: "resetTargetState",
+    value: function resetTargetState(tmodel, targetName) {
+      var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Set();
+      if (!tmodel || !targetName) {
+        return;
+      }
+      TargetUtil.resetSingleTargetState(tmodel, targetName);
+      var target = tmodel.targets[targetName];
+      var nextTarget = target === null || target === void 0 ? void 0 : target.activateNextTarget;
+      var nextTargetDef = tmodel.targets[nextTarget];
+      if (!nextTargetDef || !nextTarget.endsWith('$') && nextTargetDef.active === false) {
+        return;
+      }
+      TargetUtil.resetTargetsBetween(tmodel, targetName, nextTarget, visited);
+      TargetUtil.resetTargetPipelineState(tmodel, nextTarget, visited);
+    }
   }, {
     key: "resetTargetPipelineState",
     value: function resetTargetPipelineState(tmodel, targetName) {
@@ -678,7 +716,6 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
             TargetUtil.resetTargetChildState(child, visited);
           }
         });
-        target.childAction = [];
       }
       if ((_target$addChildActio = target.addChildAction) !== null && _target$addChildActio !== void 0 && _target$addChildActio.length) {
         target.addChildAction.forEach(function (child) {
@@ -686,7 +723,6 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
             TargetUtil.resetTargetChildState(child, visited);
           }
         });
-        target.addChildAction = [];
       }
       var nextTarget = target === null || target === void 0 ? void 0 : target.activateNextTarget;
       if (!nextTarget) {
@@ -696,8 +732,39 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       if (!nextTargetDef || !nextTarget.endsWith('$') && nextTargetDef.active === false) {
         return;
       }
+      TargetUtil.resetTargetsBetween(tmodel, targetName, nextTarget, visited);
       TargetUtil.resetTargetPipelineState(tmodel, nextTarget, visited);
     }
+  }, {
+    key: "resetTargetsBetween",
+    value: function resetTargetsBetween(tmodel, fromTarget, toTarget, visited) {
+      var names = tmodel.functionTargetNames;
+      var fromIndex = names.indexOf(fromTarget);
+      var toIndex = names.indexOf(toTarget);
+      if (fromIndex < 0 || toIndex < 0 || toIndex <= fromIndex) {
+        return;
+      }
+      for (var i = fromIndex + 1; i < toIndex; i++) {
+        var _target$childAction5, _target$addChildActio2;
+        var key = names[i];
+        TargetUtil.resetSingleTargetState(tmodel, key);
+        var target = tmodel.targets[key];
+        if (target !== null && target !== void 0 && (_target$childAction5 = target.childAction) !== null && _target$childAction5 !== void 0 && _target$childAction5.length) {
+          target.childAction.forEach(function (child) {
+            if (child) {
+              TargetUtil.resetTargetChildState(child, visited);
+            }
+          });
+        }
+        if (target !== null && target !== void 0 && (_target$addChildActio2 = target.addChildAction) !== null && _target$addChildActio2 !== void 0 && _target$addChildActio2.length) {
+          target.addChildAction.forEach(function (child) {
+            if (child) {
+              TargetUtil.resetTargetChildState(child, visited);
+            }
+          });
+        }
+      }
+    }
   }, {
     key: "resetTargetChildState",
     value: function resetTargetChildState(tmodel, visited) {
@@ -708,11 +775,11 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       visited.add(sig);
       var names = Object.keys(tmodel.targetValues);
       for (var i = 0; i < names.length; i++) {
-        var _target$childAction5, _target$addChildActio2;
+        var _target$childAction6, _target$addChildActio3;
         var key = names[i];
         var target = tmodel.targets[key];
         TargetUtil.resetSingleTargetState(tmodel, key);
-        if (target !== null && target !== void 0 && (_target$childAction5 = target.childAction) !== null && _target$childAction5 !== void 0 && _target$childAction5.length) {
+        if (target !== null && target !== void 0 && (_target$childAction6 = target.childAction) !== null && _target$childAction6 !== void 0 && _target$childAction6.length) {
           target.childAction.forEach(function (child) {
             if (child) {
               TargetUtil.resetTargetChildState(child, visited);
@@ -720,7 +787,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
           });
           target.childAction = [];
         }
-        if (target !== null && target !== void 0 && (_target$addChildActio2 = target.addChildAction) !== null && _target$addChildActio2 !== void 0 && _target$addChildActio2.length) {
+        if (target !== null && target !== void 0 && (_target$addChildActio3 = target.addChildAction) !== null && _target$addChildActio3 !== void 0 && _target$addChildActio3.length) {
           target.addChildAction.forEach(function (child) {
             if (child) {
               TargetUtil.resetTargetChildState(child, visited);
@@ -739,14 +806,35 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         targetValue.triggeredByCompleteCount = 0;
         targetValue.resetFlag = true;
         targetValue.nextTargetUpdateCount = 0;
-        targetValue.status = 'complete';
+        targetValue.status = '';
       }
       tmodel.cancelAnimation();
       tmodel.activatedTargets.length = 0;
       tmodel.removeFromActiveTargets(key);
       tmodel.removeFromAnimatingMap(key);
       tmodel.removeFromUpdatingTargets(key);
-      TargetUtil.clearPendingTargets(tmodel, key);
+      TargetUtil.clearPendingTarget(tmodel, key);
+    }
+  }, {
+    key: "removeChildFromTargetActions",
+    value: function removeChildFromTargetActions(parent, child) {
+      if (!parent || !child) {
+        return;
+      }
+      for (var _i2 = 0, _Object$values = Object.values(parent.targets); _i2 < _Object$values.length; _i2++) {
+        var _target$childAction7, _target$addChildActio4;
+        var target = _Object$values[_i2];
+        if ((_target$childAction7 = target.childAction) !== null && _target$childAction7 !== void 0 && _target$childAction7.length) {
+          target.childAction = target.childAction.filter(function (c) {
+            return c !== child;
+          });
+        }
+        if ((_target$addChildActio4 = target.addChildAction) !== null && _target$addChildActio4 !== void 0 && _target$addChildActio4.length) {
+          target.addChildAction = target.addChildAction.filter(function (c) {
+            return c !== child;
+          });
+        }
+      }
     }
   }]);
 }();