targetj 1.0.237 → 1.0.239

package/build/TargetUtil.js

@@ -46,6 +46,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         completeCount: 0,
         completeTime: 0,
         executionCount: 0,
+        visibleCompleteCount: 0,
         status: '',
         executionFlag: false,
         isImperative: false,
@@ -301,6 +302,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "cleanupTarget",
     value: function cleanupTarget(tmodel, key) {
+      TargetUtil.cleanupVisibleComplete(tmodel, key);
       if (tmodel.isTargetComplete(key) || !TargetUtil.isTargetFullyCompleted(tmodel, key)) {
         return false;
       }
@@ -321,6 +323,36 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       TargetUtil.bubbleInvokerCompletion(tmodel, key);
       return true;
     }
+  }, {
+    key: "cleanupVisibleComplete",
+    value: function cleanupVisibleComplete(tmodel, key) {
+      var target = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : tmodel.targets[key];
+      if (!target || typeof target.onVisibleComplete !== "function") {
+        return false;
+      }
+      var targetValue = tmodel.targetValues[key];
+      if (!targetValue) {
+        return false;
+      }
+      if (TargetUtil.isTargetTreeComplete(tmodel, key, 'visible') !== true) {
+        return false;
+      }
+      var signature = TargetUtil.getVisibleCompletionSignature(tmodel);
+      if (targetValue.visibleCompleteSignature === signature) {
+        return false;
+      }
+      targetValue.visibleCompleteSignature = signature;
+      target.onVisibleComplete.call(tmodel);
+      tmodel.setTargetMethodName(key, "onVisibleComplete");
+      return true;
+    }
+  }, {
+    key: "getVisibleCompletionSignature",
+    value: function getVisibleCompletionSignature(tmodel) {
+      return tmodel.visibleChildren.map(function (child) {
+        return child.oid;
+      }).sort().join('|');
+    }
   }, {
     key: "bubbleInvokerCompletion",
     value: function bubbleInvokerCompletion(tmodel, key) {
@@ -377,12 +409,17 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "isTModelComplete",
     value: function isTModelComplete(tmodel) {
-      var _state$updatingTarget, _state$activeTargetLi, _state$activatedTarge, _state$lastChildrenUp, _state$lastChildrenUp2;
-      if (!tmodel) {
-        return false;
-      }
+      var _state$updatingTarget2, _state$activeTargetLi2, _state$activatedTarge2, _state$lastChildrenUp3, _state$lastChildrenUp4;
+      var completionScope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "all";
       var state = tmodel.state();
-      return !((_state$updatingTarget = state.updatingTargetList) !== null && _state$updatingTarget !== void 0 && _state$updatingTarget.length) && !((_state$activeTargetLi = state.activeTargetList) !== null && _state$activeTargetLi !== void 0 && _state$activeTargetLi.length) && !((_state$activatedTarge = state.activatedTargets) !== null && _state$activatedTarge !== void 0 && _state$activatedTarge.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && !tmodel.hasAnimatingChildren() && !tmodel.hasUpdatingChildren() && !tmodel.hasActiveChildren() && !((_state$lastChildrenUp = state.lastChildrenUpdate) !== null && _state$lastChildrenUp !== void 0 && (_state$lastChildrenUp = _state$lastChildrenUp.deletions) !== null && _state$lastChildrenUp !== void 0 && _state$lastChildrenUp.length) && !((_state$lastChildrenUp2 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp2 !== void 0 && (_state$lastChildrenUp2 = _state$lastChildrenUp2.additions) !== null && _state$lastChildrenUp2 !== void 0 && _state$lastChildrenUp2.length) && !tmodel.pausedBatch && !(0, _App.getManager)().needsReattach(tmodel);
+      if (completionScope === "visible") {
+        var _state$updatingTarget, _state$activeTargetLi, _state$activatedTarge, _state$lastChildrenUp, _state$lastChildrenUp2;
+        if (TargetUtil.shouldIgnoreChildForCompletion(tmodel, "visible")) {
+          return true;
+        }
+        return !((_state$updatingTarget = state.updatingTargetList) !== null && _state$updatingTarget !== void 0 && _state$updatingTarget.length) && !((_state$activeTargetLi = state.activeTargetList) !== null && _state$activeTargetLi !== void 0 && _state$activeTargetLi.length) && !((_state$activatedTarge = state.activatedTargets) !== null && _state$activatedTarge !== void 0 && _state$activatedTarge.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && TargetUtil.getUpdatingChildren(tmodel, undefined, "visible").size === 0 && TargetUtil.getActiveChildren(tmodel, "visible").size === 0 && !((_state$lastChildrenUp = state.lastChildrenUpdate) !== null && _state$lastChildrenUp !== void 0 && (_state$lastChildrenUp = _state$lastChildrenUp.deletions) !== null && _state$lastChildrenUp !== void 0 && _state$lastChildrenUp.length) && !((_state$lastChildrenUp2 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp2 !== void 0 && (_state$lastChildrenUp2 = _state$lastChildrenUp2.additions) !== null && _state$lastChildrenUp2 !== void 0 && _state$lastChildrenUp2.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !(0, _App.getManager)().needsReattach(tmodel);
+      }
+      return !((_state$updatingTarget2 = state.updatingTargetList) !== null && _state$updatingTarget2 !== void 0 && _state$updatingTarget2.length) && !((_state$activeTargetLi2 = state.activeTargetList) !== null && _state$activeTargetLi2 !== void 0 && _state$activeTargetLi2.length) && !((_state$activatedTarge2 = state.activatedTargets) !== null && _state$activatedTarge2 !== void 0 && _state$activatedTarge2.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && !tmodel.hasAnimatingChildren() && !tmodel.hasUpdatingChildren() && !tmodel.hasActiveChildren() && !((_state$lastChildrenUp3 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp3 !== void 0 && (_state$lastChildrenUp3 = _state$lastChildrenUp3.deletions) !== null && _state$lastChildrenUp3 !== void 0 && _state$lastChildrenUp3.length) && !((_state$lastChildrenUp4 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp4 !== void 0 && (_state$lastChildrenUp4 = _state$lastChildrenUp4.additions) !== null && _state$lastChildrenUp4 !== void 0 && _state$lastChildrenUp4.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !(0, _App.getManager)().needsReattach(tmodel);
     }
   }, {
     key: "isFetchingComplete",
@@ -447,10 +484,11 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
     }
   }, {
     key: "isTargetTreeComplete",
-    value: function isTargetTreeComplete(tmodel, key) {
+    value: function isTargetTreeComplete(tmodel, key, completionScopeOverride) {
       var target = tmodel.targets[key];
       if (target) {
         var _target$childAction, _target$childAction2, _target$childAction3;
+        var completionScope = completionScopeOverride !== null && completionScopeOverride !== void 0 ? completionScopeOverride : target.completionScope;
         var targetType = _typeof(target.value);
         if (_TargetData.TargetData.controlTargetMap[key]) {
           return true;
@@ -467,13 +505,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.completionScope).size > 0) {
+        if (((_target$childAction = target.childAction) === null || _target$childAction === void 0 ? void 0 : _target$childAction.length) > 0 && TargetUtil.getUpdatingChildren(tmodel, key, 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.completionScope).size > 0) {
+        if (((_target$childAction2 = target.childAction) === null || _target$childAction2 === void 0 ? void 0 : _target$childAction2.length) > 0 && TargetUtil.getActiveChildren(tmodel, 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.completionScope) !== true) {
+        if (((_target$childAction3 = target.childAction) === null || _target$childAction3 === void 0 ? void 0 : _target$childAction3.length) > 0 && TargetUtil.areTargetChildrenComplete(target.childAction, completionScope) !== true) {
           return 'incomplete children';
         }
         if (target.fetchAction && !(0, _App.getLoader)().isLoadingSuccessful(tmodel, key)) {
@@ -497,12 +535,13 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
           if (TargetUtil.shouldIgnoreChildForCompletion(child, completionScope)) {
             continue;
           }
-          if (child.exists() && !TargetUtil.isTModelComplete(child)) {
+          if (child.exists() && !TargetUtil.isTModelComplete(child, completionScope)) {
             return child.oid;
           }
           if (child.hasChildren()) {
-            if (!TargetUtil.areTargetChildrenComplete(child.getChildren(), completionScope)) {
-              return child.oid;
+            var result = TargetUtil.areTargetChildrenComplete(child.getChildren(), completionScope);
+            if (result !== true) {
+              return result;
             }
           }
         }
@@ -559,6 +598,32 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       });
       return childrenMap;
     }
+  }, {
+    key: "hasVisibleActiveChild",
+    value: function hasVisibleActiveChild(tmodel) {
+      var _tmodel$activeTargetL, _tmodel$getChildren, _tmodel$getChildren2;
+      if (TargetUtil.shouldIgnoreChildForCompletion(tmodel, "visible")) {
+        return false;
+      }
+      if (((_tmodel$activeTargetL = tmodel.activeTargetList) === null || _tmodel$activeTargetL === void 0 ? void 0 : _tmodel$activeTargetL.length) > 0) {
+        return true;
+      }
+      var _iterator4 = _createForOfIteratorHelper((_tmodel$getChildren = (_tmodel$getChildren2 = tmodel.getChildren) === null || _tmodel$getChildren2 === void 0 ? void 0 : _tmodel$getChildren2.call(tmodel)) !== null && _tmodel$getChildren !== void 0 ? _tmodel$getChildren : []),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var child = _step4.value;
+          if (TargetUtil.hasVisibleActiveChild(child)) {
+            return true;
+          }
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+      return false;
+    }
   }, {
     key: "getActiveChildren",
     value: function getActiveChildren(tmodel) {
@@ -567,6 +632,12 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       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 (completionScope === "visible") {
+          if (TargetUtil.hasVisibleActiveChild(child)) {
+            childrenMap.set(child.oid, child);
+          }
+          return;
+        }
         if (TargetUtil.shouldIgnoreChildForCompletion(child, completionScope)) {
           return;
         }
@@ -586,7 +657,8 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         return true;
       }
       if (completionScope === "visible") {
-        return child.visibilityStatus && !child.isVisible();
+        var _child$visibilityStat;
+        return ((_child$visibilityStat = child.visibilityStatus) === null || _child$visibilityStat === void 0 ? void 0 : _child$visibilityStat.isVisible) !== true;
       }
       return false;
     }
@@ -689,44 +761,33 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "resetTargetState",
     value: function resetTargetState(tmodel, targetName) {
-      var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Set();
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var visited = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : new Set();
       if (!tmodel || !targetName) {
         return;
       }
       TargetUtil.resetSingleTargetState(tmodel, targetName);
+      TargetUtil.resetTargetChildActions(tmodel, targetName, options, visited);
       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);
+      TargetUtil.resetTargetsBetween(tmodel, targetName, nextTarget, options, visited);
+      TargetUtil.resetTargetPipelineState(tmodel, nextTarget, options, visited);
     }
   }, {
     key: "resetTargetPipelineState",
     value: function resetTargetPipelineState(tmodel, targetName) {
-      var _target$childAction4, _target$addChildActio;
-      var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Set();
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var visited = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : new Set();
       if (!tmodel || !targetName) {
         return;
       }
-      var target = tmodel.targets[targetName];
       TargetUtil.resetSingleTargetState(tmodel, targetName);
-      if ((_target$childAction4 = target.childAction) !== null && _target$childAction4 !== void 0 && _target$childAction4.length) {
-        target.childAction.forEach(function (child) {
-          if (child) {
-            TargetUtil.resetTargetChildState(child, visited);
-          }
-        });
-      }
-      if ((_target$addChildActio = target.addChildAction) !== null && _target$addChildActio !== void 0 && _target$addChildActio.length) {
-        target.addChildAction.forEach(function (child) {
-          if (child) {
-            TargetUtil.resetTargetChildState(child, visited);
-          }
-        });
-      }
+      TargetUtil.resetTargetChildActions(tmodel, targetName, options, visited);
+      var target = tmodel.targets[targetName];
       var nextTarget = target === null || target === void 0 ? void 0 : target.activateNextTarget;
       if (!nextTarget) {
         return;
@@ -735,12 +796,14 @@ 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);
+      TargetUtil.resetTargetsBetween(tmodel, targetName, nextTarget, options, visited);
+      TargetUtil.resetTargetPipelineState(tmodel, nextTarget, options, visited);
     }
   }, {
     key: "resetTargetsBetween",
-    value: function resetTargetsBetween(tmodel, fromTarget, toTarget, visited) {
+    value: function resetTargetsBetween(tmodel, fromTarget, toTarget) {
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+      var visited = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : new Set();
       var names = tmodel.functionTargetNames;
       var fromIndex = names.indexOf(fromTarget);
       var toIndex = names.indexOf(toTarget);
@@ -748,29 +811,16 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         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);
-            }
-          });
-        }
+        TargetUtil.resetTargetChildActions(tmodel, key, options, visited);
       }
     }
   }, {
     key: "resetTargetChildState",
-    value: function resetTargetChildState(tmodel, visited) {
+    value: function resetTargetChildState(tmodel) {
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Set();
       var sig = "".concat(tmodel.oid);
       if (visited.has(sig)) {
         return;
@@ -778,25 +828,38 @@ 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$childAction6, _target$addChildActio3;
         var key = names[i];
-        var target = tmodel.targets[key];
         TargetUtil.resetSingleTargetState(tmodel, key);
-        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);
-            }
-          });
-          target.childAction = [];
+        TargetUtil.resetTargetChildActions(tmodel, key, options, visited);
+      }
+    }
+  }, {
+    key: "resetTargetChildActions",
+    value: function resetTargetChildActions(tmodel, key) {
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var visited = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : new Set();
+      var target = tmodel.targets[key];
+      if (!target) {
+        return;
+      }
+      var childActions = target.childAction ? _toConsumableArray(target.childAction) : [];
+      var addChildActions = target.addChildAction ? _toConsumableArray(target.addChildAction) : [];
+      childActions.forEach(function (child) {
+        if (child) {
+          TargetUtil.resetTargetChildState(child, options, visited);
         }
-        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);
-            }
-          });
-          target.addChildAction = [];
+      });
+      addChildActions.forEach(function (child) {
+        if (child) {
+          TargetUtil.resetTargetChildState(child, options, visited);
+        }
+      });
+      if (options.clearChildActions) {
+        if (Array.isArray(target.childAction)) {
+          target.childAction.length = 0;
+        }
+        if (Array.isArray(target.addChildAction)) {
+          target.addChildAction.length = 0;
         }
       }
     }
@@ -809,6 +872,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         targetValue.triggeredByCompleteCount = 0;
         targetValue.resetFlag = true;
         targetValue.nextTargetUpdateCount = 0;
+        targetValue.visibleCompleteSignature = undefined;
         targetValue.status = '';
       }
       tmodel.cancelAnimation();
@@ -819,25 +883,13 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       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;
-          });
-        }
-      }
+    key: "getResetOptions",
+    value: function getResetOptions(options) {
+      var reset = options === null || options === void 0 ? void 0 : options.reset;
+      return {
+        shouldReset: reset === true || reset === 'pipeline' || reset === 'tree' || reset === 'all',
+        clearChildActions: reset === 'tree' || reset === 'all'
+      };
     }
   }]);
 }();

package/build/VisibilityUtil.js

@@ -45,7 +45,7 @@ var VisibilityUtil = exports.VisibilityUtil = /*#__PURE__*/function () {
         status.right = x - visibilityMargin <= clip.r;
         status.left = x + width + visibilityMargin >= clip.x;
         status.bottom = y - child.getTopMargin() - visibilityMargin <= clip.b;
-        status.top = y + height + visibilityMargin >= clip.y;
+        status.top = y + height + child.getBottomMargin() + visibilityMargin >= clip.y;
         status.clipX = clip.x;
         status.clipY = clip.y;
         status.clipR = clip.r;

package/build/index.js

@@ -211,4 +211,15 @@ Object.keys(_VisibilityUtil).forEach(function (key) {
       return _VisibilityUtil[key];
     }
   });
+});
+var _ScheduleUtil = require("./ScheduleUtil.js");
+Object.keys(_ScheduleUtil).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _ScheduleUtil[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _ScheduleUtil[key];
+    }
+  });
 });