targetj 1.0.243 → 1.0.244

package/build/TargetData.js

@@ -910,7 +910,7 @@ _defineProperty(TargetData, "allEventMap", {
   }
 });
 _defineProperty(TargetData, "excludedTargetKeys", new Set(['originalTargetName', 'originalTModel', 'activateNextTarget', 'invokerTarget', 'invokerTModel', 'active', 'addChildAction', 'childAction', 'fetchAction']));
-_defineProperty(TargetData, "lifecycleCallbackSet", new Set(['onComplete', 'onValueChange', 'onImperativeEnd', 'onImperativeStep', 'onStepsEnd', 'onSuccess', 'onError']));
+_defineProperty(TargetData, "lifecycleCallbackSet", new Set(['onComplete', 'onVisibleComplete', 'onValueChange', 'onImperativeEnd', 'onImperativeStep', 'onStepsEnd', 'onSuccess', 'onError']));
 _defineProperty(TargetData, "lifecycleCoreSet", new Set(['value', 'steps', 'cycles', 'enabledOn', 'pauseOn', 'loop', 'interval']));
 _defineProperty(TargetData, "lifecycleMethodSet", new Set([].concat(_toConsumableArray(_TargetData.lifecycleCallbackSet), _toConsumableArray(_TargetData.lifecycleCoreSet))));
 _defineProperty(TargetData, "lifecyclePatterns", {

package/build/TargetExecutor.js

@@ -204,7 +204,7 @@ var TargetExecutor = /*#__PURE__*/function () {
     key: "assignListTarget",
     value: function assignListTarget(tmodel, key, targetValue, valueList, initialValue, steps, interval, easing, cycles) {
       targetValue.valueList = valueList;
-      targetValue.stepList = Array.isArray(steps) ? steps : TUtil.isDefined(steps) && steps > 0 ? [steps] : [1];
+      targetValue.stepList = Array.isArray(steps) ? steps : TUtil.isDefined(steps) ? [steps] : [1];
       targetValue.intervalList = Array.isArray(interval) ? interval : TUtil.isDefined(interval) ? [interval || 8] : [8];
       targetValue.easingList = Array.isArray(easing) ? easing : TUtil.isDefined(easing) ? [easing] : [Easing.LINEAR];
       targetValue.cycles = cycles;
@@ -242,8 +242,15 @@ var TargetExecutor = /*#__PURE__*/function () {
     key: "snapActualToTarget",
     value: function snapActualToTarget(tmodel, key) {
       var targetValue = tmodel.targetValues[key];
-      var value = targetValue.value;
-      var newValue = typeof value === 'function' ? value.call(tmodel) : value;
+      var newValue;
+      if (Array.isArray(targetValue.valueList)) {
+        targetValue.valuePointer = targetValue.valueList.length - 1;
+        newValue = targetValue.valueList[targetValue.valuePointer];
+        targetValue.value = newValue;
+      } else {
+        var value = targetValue.value;
+        newValue = typeof value === "function" ? value.call(tmodel) : value;
+      }
       if (tmodel.val(key) === newValue) {
         return;
       }

package/build/TargetUtil.js

@@ -144,7 +144,7 @@ var TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "shouldActivateNextTarget",
     value: function shouldActivateNextTarget(tmodel, key) {
-      var _nextTarget$endsWith, _tmodel$targetValues$4, _tmodel$targetValues$5;
+      var _nextTarget$endsWith;
       var levelUp = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
       var sideStep = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
       var isImperative = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
@@ -182,9 +182,8 @@ var TargetUtil = /*#__PURE__*/function () {
       var canActivate = false;
       if (nextTarget) {
         if (isEndTrigger) {
-          var _tmodel$targetValues$2, _tmodel$targetValues$3;
-          var triggeredByCompleteCount = (_tmodel$targetValues$2 = (_tmodel$targetValues$3 = tmodel.targetValues[nextTarget]) === null || _tmodel$targetValues$3 === void 0 ? void 0 : _tmodel$targetValues$3.triggeredByCompleteCount) !== null && _tmodel$targetValues$2 !== void 0 ? _tmodel$targetValues$2 : 0;
-          if (targetValue.completeCount > triggeredByCompleteCount) {
+          var lastTriggeredCount = TargetUtil.getTriggeredByCompleteCount(tmodel, nextTarget, key);
+          if (targetValue.completeCount > lastTriggeredCount) {
             canActivate = true;
           }
         } else {
@@ -197,10 +196,11 @@ var TargetUtil = /*#__PURE__*/function () {
           if (fetchAction) {
             if (isEndTrigger) {
               if (prevOk === true) {
-                TargetUtil.activateTargetOnce(tmodel, nextTarget);
-                nextTargetActivated = true;
-                TargetUtil.clearPendingTargetsForNextTarget(tmodel, nextTarget);
-                tmodel.targetValues[nextTarget].triggeredByCompleteCount = targetValue.completeCount;
+                var activated = TargetUtil.activateTargetOnce(tmodel, nextTarget);
+                if (activated) {
+                  nextTargetActivated = true;
+                  TargetUtil.clearPendingTargetsForNextTarget(tmodel, nextTarget);
+                }
               } else {
                 TargetUtil.markPendingTargets(tmodel, key);
               }
@@ -221,7 +221,6 @@ var TargetUtil = /*#__PURE__*/function () {
               TargetUtil.activateTarget(tmodel, nextTarget);
               nextTargetActivated = true;
               TargetUtil.clearPendingTargetsForNextTarget(tmodel, nextTarget);
-              tmodel.targetValues[nextTarget].triggeredByCompleteCount = targetValue.completeCount;
             } else {
               TargetUtil.markPendingTargets(tmodel, key);
             }
@@ -240,10 +239,15 @@ var TargetUtil = /*#__PURE__*/function () {
       if (nextTargetActivated) {
         if (!isEndTrigger) {
           targetValue.nextTargetUpdateCount = targetValue.updateCount;
+        } else {
+          TargetUtil.setTriggeredByCompleteCount(tmodel, nextTarget, key, targetValue.completeCount);
         }
       }
-      var nextTargetCompleteCount = nextTarget ? (_tmodel$targetValues$4 = (_tmodel$targetValues$5 = tmodel.targetValues[nextTarget]) === null || _tmodel$targetValues$5 === void 0 ? void 0 : _tmodel$targetValues$5.completeCount) !== null && _tmodel$targetValues$4 !== void 0 ? _tmodel$targetValues$4 : 0 : 0;
-      var caughtUp = isEndTrigger ? targetValue.completeCount <= nextTargetCompleteCount : false;
+      var caughtUp = false;
+      if (isEndTrigger && nextTarget) {
+        var _lastTriggeredCount = TargetUtil.getTriggeredByCompleteCount(tmodel, nextTarget, key);
+        caughtUp = targetValue.completeCount <= _lastTriggeredCount;
+      }
       if (!nextTargetActivated && isCompleteMode) {
         if (nextTarget && caughtUp && !fetchAction) {
           TargetUtil.shouldActivateNextTarget(tmodel, nextTarget, levelUp, sideStep + 1, isImperative, "complete");
@@ -262,7 +266,9 @@ var TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "markPendingTargets",
     value: function markPendingTargets(tmodel, key) {
-      (tmodel.pendingTargets || (tmodel.pendingTargets = new Set())).add(key);
+      if (!tmodel.isTargetComplete(key)) {
+        (tmodel.pendingTargets || (tmodel.pendingTargets = new Set())).add(key);
+      }
     }
   }, {
     key: "clearPendingTarget",
@@ -300,9 +306,11 @@ var TargetUtil = /*#__PURE__*/function () {
       TargetUtil.cleanupVisibleComplete(tmodel, key);
       var cannotBeCleaned = tmodel.isTargetComplete(key) || !TargetUtil.isTargetFullyCompleted(tmodel, key);
       if (cannotBeCleaned) {
+        TargetUtil.markPendingTargets(tmodel, key);
         return false;
       }
       tmodel.setTargetComplete(key);
+      TargetUtil.clearPendingTarget(tmodel, key);
       var target = tmodel.targets[key];
       if (typeof (target === null || target === void 0 ? void 0 : target.onComplete) === "function") {
         target.onComplete.call(tmodel);
@@ -385,17 +393,32 @@ var TargetUtil = /*#__PURE__*/function () {
         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);
       }
     }
+  }, {
+    key: "getTriggeredByCompleteCount",
+    value: function getTriggeredByCompleteCount(tmodel, nextTarget, key) {
+      var _tmodel$targetValues$2, _tmodel$targetValues$3;
+      return (_tmodel$targetValues$2 = (_tmodel$targetValues$3 = tmodel.targetValues[nextTarget]) === null || _tmodel$targetValues$3 === void 0 || (_tmodel$targetValues$3 = _tmodel$targetValues$3.triggeredByCompleteCountMap) === null || _tmodel$targetValues$3 === void 0 ? void 0 : _tmodel$targetValues$3.get(key)) !== null && _tmodel$targetValues$2 !== void 0 ? _tmodel$targetValues$2 : 0;
+    }
+  }, {
+    key: "setTriggeredByCompleteCount",
+    value: function setTriggeredByCompleteCount(tmodel, nextTarget, key, count) {
+      var _tmodel$targetValues;
+      var nextTargetValue = (_tmodel$targetValues = tmodel.targetValues)[nextTarget] || (_tmodel$targetValues[nextTarget] = TargetUtil.emptyValue());
+      var triggeredByMap = nextTargetValue.triggeredByCompleteCountMap || (nextTargetValue.triggeredByCompleteCountMap = new Map());
+      triggeredByMap.set(key, count);
+    }
   }, {
     key: "activateTargetOnce",
     value: function activateTargetOnce(tmodel, nextTarget) {
-      var _tmodel$targetValues, _nextTargetValue$acti;
-      var nextTargetValue = (_tmodel$targetValues = tmodel.targetValues)[nextTarget] || (_tmodel$targetValues[nextTarget] = TargetUtil.emptyValue());
+      var _tmodel$targetValues2, _nextTargetValue$acti;
+      var nextTargetValue = (_tmodel$targetValues2 = tmodel.targetValues)[nextTarget] || (_tmodel$targetValues2[nextTarget] = TargetUtil.emptyValue());
       var last = (_nextTargetValue$acti = nextTargetValue.activationTime) !== null && _nextTargetValue$acti !== void 0 ? _nextTargetValue$acti : 0;
       if (last > 0 && last >= tmodel.getLastUpdate(nextTarget)) {
         return false;
       }
       nextTargetValue.activationTime = tmodel.getLastUpdate(nextTarget) + 0.001;
       tmodel.activateTarget(nextTarget);
+      return true;
     }
   }, {
     key: "activateTarget",
@@ -741,9 +764,9 @@ var TargetUtil = /*#__PURE__*/function () {
     value: function getOriginalNames(tmodel, key) {
       var originalTModel, originalTargetName;
       if (tmodel.isTargetImperative(key)) {
-        var _tmodel$targetValues$6, _tmodel$targetValues$7;
-        originalTModel = (_tmodel$targetValues$6 = tmodel.targetValues[key]) === null || _tmodel$targetValues$6 === void 0 ? void 0 : _tmodel$targetValues$6.originalTModel;
-        originalTargetName = (_tmodel$targetValues$7 = tmodel.targetValues[key]) === null || _tmodel$targetValues$7 === void 0 ? void 0 : _tmodel$targetValues$7.originalTargetName;
+        var _tmodel$targetValues$4, _tmodel$targetValues$5;
+        originalTModel = (_tmodel$targetValues$4 = tmodel.targetValues[key]) === null || _tmodel$targetValues$4 === void 0 ? void 0 : _tmodel$targetValues$4.originalTModel;
+        originalTargetName = (_tmodel$targetValues$5 = tmodel.targetValues[key]) === null || _tmodel$targetValues$5 === void 0 ? void 0 : _tmodel$targetValues$5.originalTargetName;
       } else {
         var _tmodel$targets$key4, _tmodel$targets$key5;
         originalTModel = (_tmodel$targets$key4 = tmodel.targets[key]) === null || _tmodel$targets$key4 === void 0 ? void 0 : _tmodel$targets$key4.originalTModel;
@@ -859,13 +882,31 @@ var TargetUtil = /*#__PURE__*/function () {
         }
       }
     }
+  }, {
+    key: "clearTriggeredByCompleteCount",
+    value: function clearTriggeredByCompleteCount(tmodel, nextTarget, key) {
+      var nextTargetValue = tmodel.targetValues[nextTarget];
+      var map = nextTargetValue === null || nextTargetValue === void 0 ? void 0 : nextTargetValue.triggeredByCompleteCountMap;
+      if (!map) {
+        return;
+      }
+      map.delete(key);
+      if (map.size === 0) {
+        nextTargetValue.triggeredByCompleteCountMap = undefined;
+      }
+    }
   }, {
     key: "resetSingleTargetState",
     value: function resetSingleTargetState(tmodel, key) {
+      var _tmodel$targets$key6;
       var targetValue = tmodel.targetValues[key];
+      var nextTarget = (_tmodel$targets$key6 = tmodel.targets[key]) === null || _tmodel$targets$key6 === void 0 ? void 0 : _tmodel$targets$key6.activateNextTarget;
+      if (nextTarget !== null && nextTarget !== void 0 && nextTarget.endsWith("$$")) {
+        TargetUtil.clearTriggeredByCompleteCount(tmodel, nextTarget, key);
+      }
       if (targetValue) {
         targetValue.completeCount = 0;
-        targetValue.triggeredByCompleteCount = 0;
+        targetValue.triggeredByCompleteCountMap = undefined;
         targetValue.resetFlag = true;
         targetValue.nextTargetUpdateCount = 0;
         targetValue.visibleCompleteSignature = undefined;