targetj 1.0.255 → 1.0.257

package/build/TargetExecutor.js

@@ -1,13 +1,17 @@
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+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 _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); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -83,10 +87,22 @@ var TargetExecutor = /*#__PURE__*/function () {
     value: function executeImperativeTarget(tmodel, key, value, steps, interval, easing, originalTargetName, originalTModel) {
       var cycles = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
       var options = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : {};
+      var snapUpdates = new Map();
+      TargetExecutor._executeImperativeTarget(tmodel, key, value, steps, interval, easing, originalTargetName, originalTModel, cycles, options, snapUpdates);
+      if (snapUpdates.size) {
+        AnimationUtil.overrideAnimatedKeyWithSnap(tmodel, _toConsumableArray(snapUpdates.keys()), _toConsumableArray(snapUpdates.values()));
+      }
+    }
+  }, {
+    key: "_executeImperativeTarget",
+    value: function _executeImperativeTarget(tmodel, key, value, steps, interval, easing, originalTargetName, originalTModel) {
+      var cycles = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
+      var options = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : {};
+      var snapUpdates = arguments.length > 10 ? arguments[10] : undefined;
       var targetValue;
       if (typeof key === 'string') {
         var cleanKey = TargetUtil.getTargetName(key);
-        key = !key.endsWith('+') ? key + "+" : key;
+        key = !key.endsWith('+') ? key + '+' : key;
         tmodel.allTargetMap[cleanKey] = key;
       }
       if (TargetParser.isListTarget(value)) {
@@ -97,18 +113,14 @@ var TargetExecutor = /*#__PURE__*/function () {
         targetValue = TargetExecutor.assignImperativeTargetValue(tmodel, key, originalTargetName, originalTModel);
         TargetExecutor.assignListTarget(tmodel, key, targetValue, value.list, value.list[0], vSteps, vInterval, vEasing, vCycles);
       } else if (TargetParser.isTargetSpecObject(value)) {
-        var _options = TargetExecutor.getTargetOptions(value);
+        var targetOptions = TargetExecutor.getTargetOptions(value);
         var valueArray = TargetParser.getValueStepsCycles(tmodel, key, value);
         var newValue = valueArray[0];
-        var newSteps = valueArray[1];
-        var newInterval = valueArray[2];
-        var newEasing = valueArray[3];
-        var newCycles = valueArray[4];
-        steps = TUtil.isDefined(newSteps) ? newSteps : steps;
-        interval = TUtil.isDefined(newInterval) ? newInterval : interval;
-        easing = TUtil.isDefined(newEasing) ? newEasing : easing;
-        cycles = TUtil.isDefined(newCycles) ? newCycles : cycles;
-        TargetExecutor.executeImperativeTarget(tmodel, key, newValue, steps, interval, easing, originalTargetName, originalTModel, cycles, _options);
+        var newSteps = TUtil.isDefined(valueArray[1]) ? valueArray[1] : steps;
+        var newInterval = TUtil.isDefined(valueArray[2]) ? valueArray[2] : interval;
+        var newEasing = TUtil.isDefined(valueArray[3]) ? valueArray[3] : easing;
+        var newCycles = TUtil.isDefined(valueArray[4]) ? valueArray[4] : cycles;
+        TargetExecutor._executeImperativeTarget(tmodel, key, newValue, newSteps, newInterval, newEasing, originalTargetName, originalTModel, newCycles, targetOptions, snapUpdates);
         return;
       } else if (TargetParser.isObjectTarget(key, value)) {
         var completeValue = TargetData.cssFunctionMap[key] ? _objectSpread(_objectSpread({}, TargetData.cssFunctionMap[key]), value) : value;
@@ -121,14 +133,14 @@ var TargetExecutor = /*#__PURE__*/function () {
           var newOptions = options;
           if (_typeof(newValue) === 'object' && !TargetParser.isListTarget(newValue)) {
             newOptions = TargetExecutor.getTargetOptions(newValue);
-            var _valueArray = TargetParser.getValueStepsCycles(tmodel, objectKey, completeValue[objectKey]);
+            var _valueArray = TargetParser.getValueStepsCycles(tmodel, objectKey, newValue);
             newValue = _valueArray[0];
             newSteps = TUtil.isDefined(_valueArray[1]) ? _valueArray[1] : steps;
             newInterval = TUtil.isDefined(_valueArray[2]) ? _valueArray[2] : interval;
             newEasing = TUtil.isDefined(_valueArray[3]) ? _valueArray[3] : easing;
             newCycles = TUtil.isDefined(_valueArray[4]) ? _valueArray[4] : cycles;
           }
-          TargetExecutor.executeImperativeTarget(tmodel, objectKey, newValue, newSteps, newInterval, newEasing, originalTargetName, originalTModel, newCycles, newOptions);
+          TargetExecutor._executeImperativeTarget(tmodel, objectKey, newValue, newSteps, newInterval, newEasing, originalTargetName, originalTModel, newCycles, newOptions, snapUpdates);
         });
       } else {
         if (_typeof(value) === 'object' && !TargetParser.isListTarget(value)) {
@@ -139,20 +151,17 @@ var TargetExecutor = /*#__PURE__*/function () {
             interval = TUtil.isDefined(_valueArray2[2]) ? _valueArray2[2] : interval;
             easing = TUtil.isDefined(_valueArray2[3]) ? _valueArray2[3] : easing;
             cycles = TUtil.isDefined(_valueArray2[4]) ? _valueArray2[4] : cycles;
-            TargetExecutor.executeImperativeTarget(tmodel, key, value, steps, interval, easing, originalTargetName, originalTModel, cycles, options);
-          } else {
-            targetValue = TargetExecutor.assignImperativeTargetValue(tmodel, key, originalTargetName, originalTModel, cycles);
-            TargetExecutor.assignSingleTarget(targetValue, value, undefined, steps, cycles, interval, easing);
+            TargetExecutor._executeImperativeTarget(tmodel, key, value, steps, interval, easing, originalTargetName, originalTModel, cycles, options, snapUpdates);
+            return;
           }
-        } else {
-          targetValue = TargetExecutor.assignImperativeTargetValue(tmodel, key, originalTargetName, originalTModel, cycles);
-          TargetExecutor.assignSingleTarget(targetValue, value, undefined, steps, cycles, interval, easing);
         }
+        targetValue = TargetExecutor.assignImperativeTargetValue(tmodel, key, originalTargetName, originalTModel);
+        TargetExecutor.assignSingleTarget(targetValue, value, undefined, steps, cycles, interval, easing);
       }
       if (targetValue) {
         TargetExecutor.resetImperativeProgress(targetValue);
         TargetExecutor.assignTargetOptions(targetValue, options);
-        TargetExecutor.updateTarget(tmodel, targetValue, key, true);
+        TargetExecutor.updateTarget(tmodel, targetValue, key, true, snapUpdates);
         if (tmodel.isTargetDone(key)) {
           TargetUtil.shouldActivateNextTarget(tmodel, key);
         }
@@ -160,10 +169,10 @@ var TargetExecutor = /*#__PURE__*/function () {
     }
   }, {
     key: "updateTarget",
-    value: function updateTarget(tmodel, targetValue, key, enforce) {
+    value: function updateTarget(tmodel, targetValue, key, enforce, snapUpdates) {
       tmodel.setLastUpdate(key);
       if (tmodel.getTargetSteps(key) === 0) {
-        TargetExecutor.snapActualToTarget(tmodel, key);
+        TargetExecutor.snapActualToTarget(tmodel, key, snapUpdates);
       }
       targetValue.executionFlag = true;
       targetValue.executionCount++;
@@ -173,8 +182,9 @@ var TargetExecutor = /*#__PURE__*/function () {
       tmodel.setTargetMethodName(key, 'value');
       var newStatus = TargetExecutor.calculateTargetStatus(tmodel, targetValue, key);
       tmodel.setTargetStatus(key, newStatus);
-      if (!TargetData.ignoreRerun[key] && tmodel.shouldScheduleRun(key)) {
-        getRunScheduler().schedule(1, 'updateTarget2-' + tmodel.oid + "-" + key);
+      var shouldSchedule = tmodel.isTargetImperative(key) || tmodel.shouldScheduleRun(key);
+      if (!TargetData.ignoreRerun[key] && shouldSchedule) {
+        getRunScheduler().schedule(1, "updateTarget-".concat(tmodel.oid, "-").concat(key));
       }
     }
   }, {
@@ -240,7 +250,8 @@ var TargetExecutor = /*#__PURE__*/function () {
     }
   }, {
     key: "snapActualToTarget",
-    value: function snapActualToTarget(tmodel, key) {
+    value: function snapActualToTarget(tmodel, key, snapUpdates) {
+      var _tmodel$animatingMap2;
       var targetValue = tmodel.targetValues[key];
       var newValue;
       if (Array.isArray(targetValue.valueList)) {
@@ -249,15 +260,25 @@ var TargetExecutor = /*#__PURE__*/function () {
         targetValue.value = newValue;
       } else {
         var value = targetValue.value;
-        newValue = typeof value === "function" ? value.call(tmodel) : value;
+        newValue = typeof value === 'function' ? value.call(tmodel) : value;
       }
-      if (tmodel.val(key) === newValue) {
+      var valueChanged = tmodel.val(key) !== newValue;
+      var isAnimating = (_tmodel$animatingMap2 = tmodel.animatingMap) === null || _tmodel$animatingMap2 === void 0 ? void 0 : _tmodel$animatingMap2.has(key);
+      if (!valueChanged && !isAnimating) {
         return;
       }
-      if (!tmodel.hasValidAnimation() || !tmodel.canBeAnimated(key)) {
+      if (valueChanged) {
         tmodel.val(key, newValue);
         tmodel.setActual(key, newValue);
         TUtil.handleValueChange(tmodel, key);
+      }
+      if (!tmodel.hasValidAnimation() || !tmodel.canBeAnimated(key)) {
+        targetValue.snapAnimation = false;
+        return;
+      }
+      targetValue.snapAnimation = true;
+      if (snapUpdates) {
+        snapUpdates.set(key, newValue);
         return;
       }
       AnimationUtil.overrideAnimatedKeyWithSnap(tmodel, key, newValue);

package/build/TargetUtil.js

@@ -116,29 +116,29 @@ var TargetUtil = /*#__PURE__*/function () {
         }
       }
       Object.keys(target).forEach(function (method) {
+        var _originalMethod$__tar;
         var originalMethod = target[method];
-        var shouldWrap = method === 'value' || typeof originalMethod === 'function' && TargetData.isLifeCycleMethod(method);
-        if (shouldWrap) {
-          if (originalMethod.__isBoundTargetMethod) {
-            return;
-          }
-          var wrappedMethod = function wrappedMethod() {
-            var _getPrevUpdateTime;
-            if (!TargetData.lifecycleCoreSet.has(method)) {
-              TargetUtil.currentTargetName = key;
-              TargetUtil.currentTModel = tmodel;
-            }
-            this.key = cleanKey;
-            this.value = this.val(cleanKey);
-            this.prevTargetValue = getPrevValue();
-            this.isPrevTargetUpdated = isPrevTargetUpdated;
-            var result = typeof originalMethod === 'function' ? originalMethod.apply(this, arguments) : originalMethod;
-            lastPrevUpdateTime = (_getPrevUpdateTime = getPrevUpdateTime()) !== null && _getPrevUpdateTime !== void 0 ? _getPrevUpdateTime : lastPrevUpdateTime;
-            return result;
-          };
-          wrappedMethod.__isBoundTargetMethod = true;
-          target[method] = wrappedMethod;
+        var sourceMethod = (_originalMethod$__tar = originalMethod === null || originalMethod === void 0 ? void 0 : originalMethod.__targetjsSource) !== null && _originalMethod$__tar !== void 0 ? _originalMethod$__tar : originalMethod;
+        var shouldWrap = method === 'value' || typeof sourceMethod === 'function' && TargetData.isLifeCycleMethod(method);
+        if (!shouldWrap) {
+          return;
         }
+        var wrappedMethod = function wrappedMethod() {
+          var _getPrevUpdateTime;
+          if (!TargetData.lifecycleCoreSet.has(method)) {
+            TargetUtil.currentTargetName = key;
+            TargetUtil.currentTModel = tmodel;
+          }
+          this.key = cleanKey;
+          this.value = this.val(cleanKey);
+          this.prevTargetValue = getPrevValue();
+          this.isPrevTargetUpdated = isPrevTargetUpdated;
+          var result = typeof sourceMethod === 'function' ? sourceMethod.apply(this, arguments) : sourceMethod;
+          lastPrevUpdateTime = (_getPrevUpdateTime = getPrevUpdateTime()) !== null && _getPrevUpdateTime !== void 0 ? _getPrevUpdateTime : lastPrevUpdateTime;
+          return result;
+        };
+        wrappedMethod.__targetjsSource = sourceMethod;
+        target[method] = wrappedMethod;
       });
     }
   }, {
@@ -239,7 +239,7 @@ var TargetUtil = /*#__PURE__*/function () {
         if (!isEndTrigger) {
           targetValue.nextTargetUpdateCount = targetValue.updateCount;
         } else {
-          TargetUtil.setTriggeredByCompleteCount(tmodel, nextTarget, key, targetValue.completeCount);
+          TargetUtil.snapshotTriggeredByCompleteCounts(tmodel, nextTarget);
         }
       }
       var caughtUp = false;
@@ -395,12 +395,25 @@ var TargetUtil = /*#__PURE__*/function () {
       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) {
+    key: "snapshotTriggeredByCompleteCounts",
+    value: function snapshotTriggeredByCompleteCounts(tmodel, nextTarget) {
       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);
+      var map = nextTargetValue.triggeredByCompleteCountMap || (nextTargetValue.triggeredByCompleteCountMap = new Map());
+      var nextIndex = tmodel.functionTargetNames.indexOf(nextTarget);
+      if (nextIndex < 0) {
+        return;
+      }
+      for (var i = 0; i < nextIndex; i++) {
+        var _tmodel$targetValues$4, _tmodel$targetValues$5;
+        var previousKey = tmodel.functionTargetNames[i];
+        var previousTarget = tmodel.targets[previousKey];
+        if ((previousTarget === null || previousTarget === void 0 ? void 0 : previousTarget.activateNextTarget) !== nextTarget) {
+          continue;
+        }
+        var completeCount = (_tmodel$targetValues$4 = (_tmodel$targetValues$5 = tmodel.targetValues[previousKey]) === null || _tmodel$targetValues$5 === void 0 ? void 0 : _tmodel$targetValues$5.completeCount) !== null && _tmodel$targetValues$4 !== void 0 ? _tmodel$targetValues$4 : 0;
+        map.set(previousKey, completeCount);
+      }
     }
   }, {
     key: "activateTargetOnce",
@@ -741,7 +754,7 @@ var TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "shouldIgnoreChildForCompletion",
     value: function shouldIgnoreChildForCompletion(child, completionScope) {
-      if (!child.exists()) {
+      if (!child || !child.exists()) {
         return true;
       }
       if (completionScope === "none") {
@@ -836,9 +849,9 @@ var TargetUtil = /*#__PURE__*/function () {
     value: function getOriginalNames(tmodel, key) {
       var originalTModel, originalTargetName;
       if (tmodel.isTargetImperative(key)) {
-        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;
+        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;
       } 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;
@@ -991,6 +1004,38 @@ var TargetUtil = /*#__PURE__*/function () {
       tmodel.removeFromUpdatingTargets(key);
       TargetUtil.clearPendingTarget(tmodel, key);
     }
+  }, {
+    key: "convertAnimatingTargetsToUpdating",
+    value: function convertAnimatingTargetsToUpdating(tmodels) {
+      var _iterator5 = _createForOfIteratorHelper(tmodels),
+        _step5;
+      try {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var tmodel = _step5.value;
+          if (!(tmodel !== null && tmodel !== void 0 && tmodel.hasAnimatingTargets())) {
+            continue;
+          }
+          var animatingTargets = _toConsumableArray(tmodel.getAnimatingTargets());
+          var _iterator6 = _createForOfIteratorHelper(animatingTargets),
+            _step6;
+          try {
+            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+              var targetName = _step6.value;
+              tmodel.setTargetStatus(targetName, "updating");
+              tmodel.removeFromAnimatingMap(targetName);
+            }
+          } catch (err) {
+            _iterator6.e(err);
+          } finally {
+            _iterator6.f();
+          }
+        }
+      } catch (err) {
+        _iterator5.e(err);
+      } finally {
+        _iterator5.f();
+      }
+    }
   }, {
     key: "getResetOptions",
     value: function getResetOptions(options) {

package/build/index.js

@@ -17,4 +17,5 @@ export * from "./TargetExecutor.js";
 export * from "./AnimationManager.js";
 export * from "./AnimationUtil.js";
 export * from "./VisibilityUtil.js";
-export * from "./ScheduleUtil.js";
+export * from "./ScheduleUtil.js";
+export * from "./StateUtil.js";