targetj 1.0.237 → 1.0.239

package/build/TargetManager.js

@@ -10,7 +10,7 @@ var _TUtil = require("./TUtil.js");
 var _TargetUtil = require("./TargetUtil.js");
 var _TModelUtil = require("./TModelUtil.js");
 var _SearchUtil = require("./SearchUtil.js");
-var _TargetData = require("./TargetData.js");
+var _ScheduleUtil = require("./ScheduleUtil.js");
 var _AnimationUtil = require("./AnimationUtil.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; } } }; }
@@ -56,6 +56,9 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
         tmodel.removeFromActiveTargets(key);
         return;
       }
+      if (_ScheduleUtil.ScheduleUtil.shouldPauseTarget(tmodel, key)) {
+        return;
+      }
       if (tmodel.isExecuted(key) && tmodel.hasUpdatingImperativeTargets(key)) {
         return;
       }
@@ -63,7 +66,7 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
         if (tmodel.isScheduledPending(key)) {
           return;
         }
-        var schedulePeriod = _TUtil.TUtil.scheduleExecution(tmodel, key);
+        var schedulePeriod = _ScheduleUtil.ScheduleUtil.scheduleExecution(tmodel, key);
         if (schedulePeriod > 0) {
           (0, _App.getRunScheduler)().schedule(schedulePeriod, "targetSchedule__".concat(tmodel.oid));
           return;
@@ -95,7 +98,10 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var key = _step2.value;
-          schedulePeriod = _TUtil.TUtil.scheduleExecution(tmodel, key);
+          if (_ScheduleUtil.ScheduleUtil.shouldPauseTarget(tmodel, key)) {
+            continue;
+          }
+          schedulePeriod = _ScheduleUtil.ScheduleUtil.scheduleExecution(tmodel, key);
           if (schedulePeriod > 0) {
             (0, _App.getRunScheduler)().schedule(schedulePeriod, "setActualValues-".concat(tmodel.oid));
           } else {
@@ -184,7 +190,7 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
         originalTModel = this.findOriginalTModel(tmodel, originalTargetName);
         originalTarget = originalTModel ? originalTModel.targets[originalTargetName] : null;
       }
-      var newStatus = this.calculateTargetStatus(tmodel, targetValue, key);
+      var newStatus = this.calculateTargetStatus(tmodel, key);
       tmodel.setTargetStatus(key, newStatus);
       if (tmodel.isTargetImperative(key)) {
         var capKey = _TargetUtil.TargetUtil.getTargetName(_TUtil.TUtil.capitalizeFirstLetter(key));
@@ -199,6 +205,7 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
           tmodel.incrementTargetCycle(key);
           tmodel.resetTargetStep(key);
           tmodel.resetTargetInitialValue(key);
+          delete targetValue.valuePointer;
         }
       } else {
         var _tmodel$targets$key;
@@ -207,6 +214,7 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
           tmodel.resetTargetStep(key);
           tmodel.resetTargetInitialValue(key);
           tmodel.resetTargetExecutionFlag(key);
+          delete targetValue.valuePointer;
           _TargetExecutor.TargetExecutor.executeDeclarativeTarget(tmodel, key);
         }
         if (typeof ((_tmodel$targets$key = tmodel.targets[key]) === null || _tmodel$targets$key === void 0 ? void 0 : _tmodel$targets$key.onStepsEnd) === "function") {
@@ -218,7 +226,11 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
     }
   }, {
     key: "calculateTargetStatus",
-    value: function calculateTargetStatus(tmodel, targetValue, key) {
+    value: function calculateTargetStatus(tmodel, key) {
+      var targetValue = tmodel.targetValues[key];
+      if (!targetValue) {
+        return;
+      }
       var valuePointer = tmodel.getValueListPointer(key);
       var cycle = tmodel.getTargetCycle(key);
       var cycles = tmodel.getTargetCycles(key);
@@ -233,166 +245,182 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "handleWebAnimationAPI",
-    value: function handleWebAnimationAPI(tmodel, cleanKey, key, targetValue, from, to, steps, interval, timeShift) {
-      var _batch$keyMap;
-      var skipStartFrame = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
-      var batch = tmodel.waapiBatch || (tmodel.waapiBatch = {
-        frames: [],
-        easing: undefined,
-        keyMap: {},
-        totalDuration: 0
-      });
-      var isTransform = _TargetData.TargetData.isTransformKey(cleanKey);
-      var getFrameAtTime = function getFrameAtTime(t) {
-        var shifted = Math.max(0, t + timeShift);
-        for (var i = 0; i < batch.frames.length; i++) {
-          var _frame = batch.frames[i];
-          if (Math.abs(_frame.keyTime - shifted) < 0.0001) {
-            return _frame;
-          }
+    key: "catchupTargetByElapsed",
+    value: function catchupTargetByElapsed(tmodel, key) {
+      var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+        _ref$fireEnd = _ref.fireEnd,
+        fireEnd = _ref$fireEnd === void 0 ? false : _ref$fireEnd;
+      var targetValue = tmodel.targetValues[key];
+      if (!targetValue) {
+        return {
+          done: false
+        };
+      }
+      var progress = _TUtil.TUtil.advanceTargetByElapsed(tmodel, key);
+      var step = progress.step;
+      var valuePointer = progress.valuePointer;
+      var cycle = progress.cycle;
+      var theValue = tmodel.getTargetValue(key);
+      var steps = tmodel.getTargetSteps(key);
+      var cycles = tmodel.getTargetCycles(key);
+      if (progress.done) {
+        var _targetValue$valueLis, _targetValue$valueLis2, _targetValue$valueLis3;
+        var finalValue = (_targetValue$valueLis = targetValue.valueList) !== null && _targetValue$valueLis !== void 0 && _targetValue$valueLis.length ? targetValue.valueList[targetValue.valueList.length - 1] : theValue;
+        tmodel.val(key, finalValue);
+        tmodel.setActual(key, finalValue);
+        tmodel.addToStyleTargetList(key);
+        targetValue.step = steps;
+        targetValue.valuePointer = (_targetValue$valueLis2 = (_targetValue$valueLis3 = targetValue.valueList) === null || _targetValue$valueLis3 === void 0 ? void 0 : _targetValue$valueLis3.length) !== null && _targetValue$valueLis2 !== void 0 ? _targetValue$valueLis2 : valuePointer;
+        targetValue.value = finalValue;
+        targetValue.cycle = cycles;
+        delete targetValue.catchupAt;
+        if (fireEnd) {
+          this.fireOnEnd(tmodel, key);
         }
-        var frame = {
-          keyTime: shifted,
-          tfMap: {},
-          styleMap: {},
-          keyMeta: new Map()
+        return {
+          done: true,
+          step: steps,
+          cycle: cycles,
+          valuePointer: targetValue.valuePointer
         };
-        batch.frames.push(frame);
-        return frame;
+      }
+      var initialValue = tmodel.getTargetInitialValue(key);
+      if (!_TUtil.TUtil.isDefined(initialValue)) {
+        initialValue = this.resolveInitialValue(tmodel, key, theValue);
+        tmodel.setTargetInitialValue(key, initialValue);
+      }
+      var value = step > 0 ? _TModelUtil.TModelUtil.easingMorph(tmodel, key, initialValue, theValue, step, steps) : initialValue;
+      tmodel.val(key, value);
+      tmodel.setActual(key, value);
+      tmodel.addToStyleTargetList(key);
+      targetValue.step = step;
+      targetValue.valuePointer = valuePointer;
+      targetValue.cycle = cycle;
+      return {
+        done: false,
+        step: step,
+        cycle: cycle,
+        valuePointer: valuePointer
       };
-      var keyDuration = 0;
-      if (targetValue.valueList && targetValue.valueList.length) {
-        var valueList = targetValue.valueList;
-        var stepList = targetValue.stepList || [1];
-        var intervalList = targetValue.intervalList;
-        var step = targetValue.step;
-        if (!skipStartFrame) {
-          var frame = getFrameAtTime(0);
-          if (isTransform) {
-            frame.tfMap[cleanKey] = step > 0 && _TUtil.TUtil.isDefined(tmodel.val(key)) ? tmodel.val(key) : valueList[0];
-            tmodel.val(key, frame.tfMap[cleanKey]);
-          } else {
-            frame.styleMap[cleanKey] = valueList[0];
-            tmodel.val(key, frame.styleMap[cleanKey]);
-          }
-        }
-        for (var i = 1; i < valueList.length; i++) {
-          var stepValue = stepList[(i - 1) % stepList.length];
-          var intervalValue = intervalList[(i - 1) % intervalList.length];
-          var duration = stepValue * intervalValue;
-          keyDuration += duration;
-          var _frame2 = getFrameAtTime(keyDuration);
-          if (isTransform) {
-            _frame2.tfMap[cleanKey] = valueList[i];
-          } else {
-            _frame2.styleMap[cleanKey] = valueList[i];
-          }
-          _frame2.keyMeta.set(cleanKey, {
-            steps: stepValue,
-            interval: intervalValue
-          });
-        }
-        targetValue.valuePointer = valueList.length;
-      } else {
-        interval = interval || 8;
-        keyDuration = steps * interval;
-        if (!skipStartFrame) {
-          var frame0 = getFrameAtTime(0);
-          if (isTransform) {
-            frame0.tfMap[cleanKey] = from;
-          } else {
-            frame0.styleMap[cleanKey] = from;
-          }
-        }
-        var frame1 = getFrameAtTime(keyDuration);
-        if (isTransform) {
-          frame1.tfMap[cleanKey] = to;
-        } else {
-          frame1.styleMap[cleanKey] = to;
-        }
-        tmodel.val(key, from);
-        frame1.keyMeta.set(cleanKey, {
-          steps: steps,
-          interval: interval
-        });
-      }
-      if (tmodel.getTargetEasing(key)) {
-        batch.easing = tmodel.getTargetEasing(key);
-      }
-      batch.totalDuration = Math.max(0, batch.totalDuration, timeShift + keyDuration);
-      ((_batch$keyMap = batch.keyMap)[cleanKey] || (_batch$keyMap[cleanKey] = new Set())).add(key);
-      tmodel.removeFromUpdatingTargets(key);
-      return keyDuration;
     }
   }, {
     key: "setActualValue",
     value: function setActualValue(tmodel, key) {
+      var _catchup$step, _catchup$valuePointer;
       var targetValue = tmodel.targetValues[key];
       if (!targetValue) {
         return;
       }
-      if (!tmodel.isTargetImperative(key) && !tmodel.isTargetEnabled(key)) {
-        (0, _App.getRunScheduler)().schedule(15, "setActualValue-postpone-".concat(tmodel.oid, "}"));
+      if (!this.canUpdateTarget(tmodel, key)) {
         return;
       }
-      var theValue = tmodel.getTargetValue(key);
-      var cleanKey = _TargetUtil.TargetUtil.getTargetName(key);
-      var step = tmodel.getTargetStep(key);
-      var steps = tmodel.getTargetSteps(key);
-      var cycle = tmodel.getTargetCycle(key);
-      var valuePointer = tmodel.getValueListPointer(key);
-      var interval = tmodel.getTargetInterval(key);
-      var initialValue = tmodel.getTargetInitialValue(key);
-      var lastUpdateTime = tmodel.getLastUpdate(key);
-      var now = _TUtil.TUtil.now();
-      if (!_TUtil.TUtil.isDefined(initialValue)) {
-        initialValue = _TUtil.TUtil.isDefined(tmodel.val(key)) ? tmodel.val(key) : typeof theValue === 'number' ? 0 : undefined;
-        tmodel.setTargetInitialValue(key, initialValue);
+      var state = this.getTargetUpdateState(tmodel, key);
+      if (!_TUtil.TUtil.isDefined(state.initialValue)) {
+        state.initialValue = this.resolveInitialValue(tmodel, key, state.theValue);
+        tmodel.setTargetInitialValue(key, state.initialValue);
       }
-      if (tmodel.canBeAnimated(cleanKey)) {
-        if (tmodel.hasDom()) {
-          var cycles = tmodel.isTargetImperative(key) ? tmodel.getTargetCycles(key) : 0;
-          var cycleDuration = this.handleWebAnimationAPI(tmodel, cleanKey, key, targetValue, initialValue, theValue, steps, interval, 0);
-          for (var c = 1; c < cycles; c++) {
-            this.handleWebAnimationAPI(tmodel, cleanKey, key, targetValue, initialValue, theValue, steps, interval, c * cycleDuration, true);
-          }
-        }
+      var catchup = this.catchupTargetByElapsed(tmodel, key, {
+        fireEnd: true
+      });
+      if (catchup.done) {
+        (0, _App.getRunScheduler)().scheduleOnlyIfEarlier(1, "".concat(tmodel.oid, "---").concat(key, "-catchup-finished"));
         return;
       }
-      if (step <= steps) {
-        tmodel.incrementTargetStep(key, now, lastUpdateTime, interval, steps);
-        var newValue = _TModelUtil.TModelUtil.easingMorph(tmodel, key, initialValue, theValue, step, steps);
+      var step = (_catchup$step = catchup.step) !== null && _catchup$step !== void 0 ? _catchup$step : 0;
+      var valuePointer = (_catchup$valuePointer = catchup.valuePointer) !== null && _catchup$valuePointer !== void 0 ? _catchup$valuePointer : tmodel.getValueListPointer(key);
+      if (tmodel.canBeAnimated(state.cleanKey)) {
+        this.animateActualValue(tmodel, key, targetValue, state, step, valuePointer);
+      } else {
+        this.updateActualValue(tmodel, key, targetValue, state, step, valuePointer);
+      }
+    }
+  }, {
+    key: "canUpdateTarget",
+    value: function canUpdateTarget(tmodel, key) {
+      if (!tmodel.isTargetImperative(key) && !tmodel.isTargetEnabled(key)) {
+        (0, _App.getRunScheduler)().schedule(15, "setActualValue-postpone-".concat(tmodel.oid));
+        return false;
+      }
+      return true;
+    }
+  }, {
+    key: "getTargetUpdateState",
+    value: function getTargetUpdateState(tmodel, key) {
+      return {
+        theValue: tmodel.getTargetValue(key),
+        cleanKey: _TargetUtil.TargetUtil.getTargetName(key),
+        steps: tmodel.getTargetSteps(key),
+        cycle: tmodel.getTargetCycle(key),
+        interval: tmodel.getTargetInterval(key),
+        initialValue: tmodel.getTargetInitialValue(key),
+        lastUpdateTime: tmodel.getLastUpdate(key),
+        now: _TUtil.TUtil.now()
+      };
+    }
+  }, {
+    key: "resolveInitialValue",
+    value: function resolveInitialValue(tmodel, key, theValue) {
+      if (_TUtil.TUtil.isDefined(tmodel.val(key))) {
+        return tmodel.val(key);
+      }
+      if (typeof theValue === 'number') {
+        return 0;
+      }
+      return undefined;
+    }
+  }, {
+    key: "animateActualValue",
+    value: function animateActualValue(tmodel, key, targetValue, state, step, valuePointer) {
+      if (!tmodel.hasDom()) {
+        return;
+      }
+      var newValue = step > 0 ? _TModelUtil.TModelUtil.easingMorph(tmodel, key, state.initialValue, state.theValue, step, state.steps) : state.initialValue;
+      var cycles = tmodel.isTargetImperative(key) ? tmodel.getTargetCycles(key) : 0;
+      var cycleDuration = _AnimationUtil.AnimationUtil.handleWebAnimationAPI(tmodel, state.cleanKey, key, targetValue, newValue, state.theValue, valuePointer, step, state.steps, state.interval, 0, false, true);
+      for (var c = 1; c < cycles; c++) {
+        _AnimationUtil.AnimationUtil.handleWebAnimationAPI(tmodel, state.cleanKey, key, targetValue, newValue, state.theValue, valuePointer, step, state.steps, state.interval, c * cycleDuration, true, false);
+      }
+    }
+  }, {
+    key: "updateActualValue",
+    value: function updateActualValue(tmodel, key, targetValue, state, step, valuePointer) {
+      if (step <= state.steps) {
+        tmodel.incrementTargetStep(key, state.now, state.lastUpdateTime, state.interval, state.steps);
+        var newValue = _TModelUtil.TModelUtil.easingMorph(tmodel, key, state.initialValue, state.theValue, step, state.steps);
         tmodel.val(key, newValue);
         tmodel.setActual(key, newValue);
         tmodel.addToStyleTargetList(key);
         this.fireOnStep(tmodel, key, step);
-        if (tmodel.getTargetStep(key) < steps) {
-          (0, _App.getRunScheduler)().scheduleOnlyIfEarlier(interval, "".concat(tmodel.oid, "---").concat(key, "-").concat(step, "/").concat(steps, "-").concat(cycle, "-").concat(interval));
+        if (tmodel.getTargetStep(key) < state.steps) {
+          (0, _App.getRunScheduler)().scheduleOnlyIfEarlier(state.interval, "".concat(tmodel.oid, "---").concat(key, "-").concat(step, "/").concat(state.steps, "-").concat(state.cycle, "-").concat(state.interval));
           return;
         }
       }
-      tmodel.val(key, theValue);
-      tmodel.setActual(key, theValue);
+      this.finishCurrentSegment(tmodel, key, targetValue, state, valuePointer);
+    }
+  }, {
+    key: "finishCurrentSegment",
+    value: function finishCurrentSegment(tmodel, key, targetValue, state, valuePointer) {
+      tmodel.val(key, state.theValue);
+      tmodel.setActual(key, state.theValue);
       tmodel.addToStyleTargetList(key);
-      targetValue.step = steps;
+      targetValue.step = state.steps;
       tmodel.setLastUpdate(key);
-      step = steps;
       var scheduleTime = 1;
       if (targetValue.valueList && valuePointer < targetValue.valueList.length) {
         tmodel.incrementValueListPointer(key);
-        valuePointer = tmodel.getValueListPointer(key);
+        var nextPointer = tmodel.getValueListPointer(key);
         tmodel.resetTargetStep(key);
         targetValue.initialValue = targetValue.value;
-        targetValue.value = targetValue.valueList[valuePointer];
-        targetValue.steps = targetValue.stepList[(valuePointer - 1) % targetValue.stepList.length];
-        targetValue.interval = Array.isArray(targetValue.intervalList) ? targetValue.intervalList[(valuePointer - 1) % targetValue.intervalList.length] : 0;
-        targetValue.easing = targetValue.easingList[(valuePointer - 1) % targetValue.easingList.length];
-        scheduleTime = interval;
+        targetValue.value = targetValue.valueList[nextPointer];
+        targetValue.steps = targetValue.stepList[(nextPointer - 1) % targetValue.stepList.length];
+        targetValue.interval = Array.isArray(targetValue.intervalList) ? targetValue.intervalList[(nextPointer - 1) % targetValue.intervalList.length] : 0;
+        targetValue.easing = targetValue.easingList[(nextPointer - 1) % targetValue.easingList.length];
+        scheduleTime = state.interval;
       } else {
         this.fireOnEnd(tmodel, key);
       }
-      (0, _App.getRunScheduler)().scheduleOnlyIfEarlier(scheduleTime, "".concat(tmodel.oid, "---").concat(key, "-").concat(step, "/").concat(steps, "-").concat(cycle, "-").concat(scheduleTime));
+      (0, _App.getRunScheduler)().scheduleOnlyIfEarlier(scheduleTime, "".concat(tmodel.oid, "---").concat(key, "-").concat(state.steps, "/").concat(state.steps, "-").concat(state.cycle, "-").concat(scheduleTime));
     }
   }]);
 }();