targetj 1.0.234 → 1.0.236

package/build/TModelManager.js

@@ -44,7 +44,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
         reasyncStyle: [],
         reattach: [],
         relocation: [],
-        invisibleDom: [],
+        deletedDom: [],
         noDom: [],
         updatingTModels: [],
         activeTModels: [],
@@ -52,6 +52,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
         activeTargets: []
       };
       this.visibleOidMap = {};
+      this.preservedDomMap = {};
       this.targetMethodMap = {};
       this.noDomMap = {};
     }
@@ -76,6 +77,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
     key: "clearAll",
     value: function clearAll() {
       this.visibleOidMap = {};
+      this.preservedDomMap = {};
       this.clearFrameLists();
       this.deleteDoms();
     }
@@ -84,6 +86,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
     value: function analyze() {
       var _this = this;
       var lastVisibleMap = _objectSpread({}, this.visibleOidMap);
+      var lastPreservedMap = _objectSpread({}, this.preservedDomMap);
       this.clearFrameLists();
       var activated = [];
       var _iterator = _createForOfIteratorHelper((0, _App.getLocationManager)().hasLocationList),
@@ -92,35 +95,40 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var tmodel = _step.value;
           lastVisibleMap[tmodel.oid] = undefined;
+          lastPreservedMap[tmodel.oid] = undefined;
           if (!tmodel.exists()) {
             if (tmodel.hasDom()) {
-              this.addToInvisibleDom(tmodel);
+              this.addToDeletedDom(tmodel);
             }
             delete this.visibleOidMap[tmodel.oid];
+            delete this.preservedDomMap[tmodel.oid];
             continue;
           }
           var visible = tmodel.isVisible();
           if (visible && tmodel.isIncluded()) {
             this.visibleOidMap[tmodel.oid] = tmodel;
+            delete this.preservedDomMap[tmodel.oid];
             this.lists.visible.push(tmodel);
           } else {
             delete this.visibleOidMap[tmodel.oid];
           }
-          var keepDom = this.shouldPreserveDom(tmodel);
-          if (keepDom) {
-            this.visibleOidMap[tmodel.oid] = tmodel;
+          var preserveDom = this.shouldPreserveDom(tmodel);
+          if (!visible && preserveDom && tmodel.hasDom()) {
+            this.preservedDomMap[tmodel.oid] = tmodel;
+          } else {
+            delete this.preservedDomMap[tmodel.oid];
           }
           if (tmodel.hasDom()) {
-            if (!tmodel.canHaveDom() || !tmodel.isIncluded() || tmodel.canDeleteDom() && !visible && !keepDom) {
-              this.addToInvisibleDom(tmodel);
+            if (!tmodel.canHaveDom() || !tmodel.isIncluded() || tmodel.canDeleteDom() && !visible && !preserveDom) {
+              this.addToDeletedDom(tmodel);
               tmodel.getChildren().forEach(function (tmodel) {
                 if (!tmodel.managesOwnScroll()) {
-                  _this.addToRecursiveInvisibleDom(tmodel);
+                  _this.addToRecursiveDeletedDom(tmodel);
                 }
               });
             }
           }
-          if (visible || tmodel.isActivated() || keepDom) {
+          if (visible || tmodel.isActivated()) {
             var _state$updatingTarget, _state$activeTargetLi;
             var state = tmodel.state();
             if (((_state$updatingTarget = state.updatingTargetList) === null || _state$updatingTarget === void 0 ? void 0 : _state$updatingTarget.length) > 0 || tmodel.hasAnimatingTargets()) {
@@ -132,7 +140,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
               this.lists.activeTargets = [].concat(_toConsumableArray(this.lists.activeTargets), _toConsumableArray(state.activeTargetList));
             }
           }
-          if (visible || tmodel.isActivated() || keepDom) {
+          if (visible || tmodel.isActivated()) {
             if (this.needsRerender(tmodel)) {
               this.lists.rerender.push(tmodel);
             }
@@ -157,7 +165,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
               activated.push(tmodel);
             }
           }
-          if (visible || tmodel.requiresDom() || keepDom) {
+          if (visible || tmodel.requiresDom()) {
             if (tmodel.canHaveDom() && !tmodel.hasDom() && tmodel.isIncluded() && !this.noDomMap[tmodel.oid]) {
               var _tmodel$getDomHolder, _tmodel$getDomParent;
               if ((_tmodel$getDomHolder = tmodel.getDomHolder()) !== null && _tmodel$getDomHolder !== void 0 && _tmodel$getDomHolder.exists() || this.noDomMap[(_tmodel$getDomParent = tmodel.getDomParent()) === null || _tmodel$getDomParent === void 0 ? void 0 : _tmodel$getDomParent.oid]) {
@@ -177,27 +185,27 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
       activated.forEach(function (t) {
         return t.deactivate();
       });
-      Object.values(lastVisibleMap).filter(function (v) {
+      Object.values(_objectSpread(_objectSpread({}, lastVisibleMap), lastPreservedMap)).filter(function (v) {
         return v !== undefined;
       }).forEach(function (tmodel) {
         if (tmodel.hasDom()) {
           if (!tmodel.exists() || !tmodel.isIncluded()) {
-            _this.addToInvisibleDom(tmodel);
+            _this.addToDeletedDom(tmodel);
           }
         }
       });
-      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;
+      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.deletedDom.length > 0 ? 5 : this.lists.restyle.length > 0 ? 10 : -1;
     }
   }, {
     key: "shouldPreserveDom",
     value: function shouldPreserveDom(tmodel) {
-      if (!tmodel.isVisible() && _TUtil.TUtil.isDefined(tmodel.targets.isVisible)) {
+      if (!tmodel.isIncluded()) {
         return false;
       }
-      var parent = tmodel.parent;
-      if (!tmodel.isIncluded()) {
+      if (!tmodel.isVisible() && _TUtil.TUtil.isDefined(tmodel.targets.isVisible)) {
         return false;
       }
+      var parent = tmodel.parent;
       while (parent && parent !== (0, _App.tRoot)()) {
         if (_TUtil.TUtil.isDefined(parent.targets.canDeleteDom)) {
           return parent.val('canDeleteDom') === false;
@@ -225,27 +233,29 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
       return true;
     }
   }, {
-    key: "addToRecursiveInvisibleDom",
-    value: function addToRecursiveInvisibleDom(tmodel) {
+    key: "addToRecursiveDeletedDom",
+    value: function addToRecursiveDeletedDom(tmodel) {
       var _this2 = this;
       delete this.visibleOidMap[tmodel.oid];
-      if (!this.lists.invisibleDom.includes(tmodel)) {
+      delete this.preservedDomMap[tmodel.oid];
+      if (!this.lists.deletedDom.includes(tmodel)) {
         if (tmodel.hasDom()) {
-          this.lists.invisibleDom.push(tmodel);
+          this.lists.deletedDom.push(tmodel);
         }
         tmodel.getChildren().forEach(function (tmodel) {
           if (!tmodel.managesOwnScroll()) {
-            _this2.addToRecursiveInvisibleDom(tmodel);
+            _this2.addToRecursiveDeletedDom(tmodel);
           }
         });
       }
     }
   }, {
-    key: "addToInvisibleDom",
-    value: function addToInvisibleDom(tmodel) {
+    key: "addToDeletedDom",
+    value: function addToDeletedDom(tmodel) {
       delete this.visibleOidMap[tmodel.oid];
-      if (!this.lists.invisibleDom.includes(tmodel)) {
-        this.lists.invisibleDom.push(tmodel);
+      delete this.preservedDomMap[tmodel.oid];
+      if (!this.lists.deletedDom.includes(tmodel)) {
+        this.lists.deletedDom.push(tmodel);
       }
     }
   }, {
@@ -253,6 +263,11 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
     value: function getVisibles() {
       return Object.values(this.visibleOidMap);
     }
+  }, {
+    key: "getAvailableDoms",
+    value: function getAvailableDoms() {
+      return Object.values(_objectSpread(_objectSpread({}, this.preservedDomMap), this.visibleOidMap));
+    }
   }, {
     key: "needsRelocation",
     value: function needsRelocation(tmodel) {
@@ -384,7 +399,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
   }, {
     key: "deleteDoms",
     value: function deleteDoms() {
-      var _iterator5 = _createForOfIteratorHelper(this.lists.invisibleDom),
+      var _iterator5 = _createForOfIteratorHelper(this.lists.deletedDom),
         _step5;
       try {
         for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
@@ -399,7 +414,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
       } finally {
         _iterator5.f();
       }
-      this.lists.invisibleDom.length = 0;
+      this.lists.deletedDom.length = 0;
     }
   }, {
     key: "deleteDom",

package/build/TUtil.js

@@ -364,6 +364,12 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
         tmodel.setScheduleTimeStamp(key, now);
         return 0;
       }
+      var remaining = tmodel.getScheduleRemainingTime(key);
+      if (TUtil.isDefined(remaining)) {
+        tmodel.setScheduleTimeStamp(key, now - Math.max(interval - remaining, 0));
+        tmodel.resetScheduleRemainingTime(key);
+        return remaining;
+      }
       var lastScheduledTime = tmodel.getScheduleTimeStamp(key);
       if (TUtil.isDefined(lastScheduledTime)) {
         var elapsed = now - lastScheduledTime;
@@ -372,6 +378,32 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
       tmodel.setScheduleTimeStamp(key, now);
       return interval;
     }
+  }, {
+    key: "pauseSchedule",
+    value: function pauseSchedule(tmodel, key) {
+      var interval = tmodel.getTargetInterval(key);
+      var lastScheduledTime = tmodel.getScheduleTimeStamp(key);
+      if (interval <= 0 || !TUtil.isDefined(lastScheduledTime)) {
+        return;
+      }
+      var now = TUtil.now();
+      var elapsed = now - lastScheduledTime;
+      var remaining = Math.max(interval - elapsed, 0);
+      tmodel.setScheduleRemainingTime(key, remaining);
+      tmodel.resetScheduleTimeStamp(key);
+    }
+  }, {
+    key: "resumeSchedule",
+    value: function resumeSchedule(tmodel, key) {
+      var remaining = tmodel.getScheduleRemainingTime(key);
+      if (!TUtil.isDefined(remaining)) {
+        return;
+      }
+      var now = TUtil.now();
+      var interval = tmodel.getTargetInterval(key);
+      tmodel.setScheduleTimeStamp(key, now - Math.max(interval - remaining, 0));
+      tmodel.resetScheduleRemainingTime(key);
+    }
   }, {
     key: "runTargetValue",
     value: function runTargetValue(tmodel, target, key, cycle, lastValue) {

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

@@ -311,7 +311,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         tmodel.setTargetMethodName(key, "onComplete");
       }
       var fetchAction = target === null || target === void 0 ? void 0 : target.fetchAction;
-      if (fetchAction && (0, _App.getLoader)().isLoadingComplete(tmodel, key)) {
+      if (fetchAction && (0, _App.getLoader)().isLoadingSuccessful(tmodel, key)) {
         var index = tmodel.fetchActionTargetList.indexOf(key);
         if (index >= 0) {
           tmodel.fetchActionTargetList.splice(index, 1);
@@ -411,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);
       }
@@ -437,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;
@@ -467,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)) {
@@ -485,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;
       }
@@ -494,14 +494,14 @@ 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 (child.exists() && !TargetUtil.isTModelComplete(child)) {
             return child.oid;
           }
           if (child.hasChildren()) {
-            if (!TargetUtil.areTargetChildrenComplete(child.getChildren(), waitForChildren)) {
+            if (!TargetUtil.areTargetChildrenComplete(child.getChildren(), completionScope)) {
               return child.oid;
             }
           }
@@ -517,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()) : []));
@@ -563,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) {
@@ -578,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;
@@ -683,6 +683,23 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         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) {
@@ -699,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) {
@@ -707,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) {
@@ -717,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) {
@@ -729,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);
@@ -741,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);
@@ -760,7 +806,7 @@ 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;
@@ -769,5 +815,26 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       tmodel.removeFromUpdatingTargets(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;
+          });
+        }
+      }
+    }
   }]);
 }();