targetj 1.0.259 → 1.1.0

package/build/TModelUtil.js

@@ -147,8 +147,8 @@ var TModelUtil = /*#__PURE__*/function () {
       };
     }
   }, {
-    key: "restoreDomState",
-    value: function restoreDomState($root, domState) {
+    key: "restoreMountedDom",
+    value: function restoreMountedDom($root, domState) {
       if (!($root !== null && $root !== void 0 && $root.getElement()) || !domState) {
         return;
       }
@@ -157,22 +157,25 @@ var TModelUtil = /*#__PURE__*/function () {
         _step;
       try {
         var _loop = function _loop() {
+          var _element$tagName2;
           var state = _step.value;
           var element = elements[state.index];
           if (!element) {
             return 1; // continue
           }
-          if (state.kind === "input") {
+          var tagName = (_element$tagName2 = element.tagName) === null || _element$tagName2 === void 0 ? void 0 : _element$tagName2.toLowerCase();
+          if (state.kind === "input" && tagName === "input") {
             element.value = state.value;
             element.checked = state.checked;
             element.indeterminate = state.indeterminate;
-          } else if (state.kind === "textarea") {
+          } else if (state.kind === "textarea" && tagName === "textarea") {
             element.value = state.value;
-          } else if (state.kind === "select") {
-            _toConsumableArray(element.options).forEach(function (option, index) {
-              option.selected = state.selected[index] === true;
+          } else if (state.kind === "select" && tagName === "select") {
+            Array.from(element.options).forEach(function (option, index) {
+              var _state$selected;
+              option.selected = ((_state$selected = state.selected) === null || _state$selected === void 0 ? void 0 : _state$selected[index]) === true;
             });
-          } else if (state.kind === "details") {
+          } else if (state.kind === "details" && tagName === "details") {
             element.open = state.open;
           }
         };

package/build/TUtil.js

@@ -11,9 +11,8 @@ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o =
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { getLocationManager, tRoot, getEvents } from "./App.js";
+import { getLocationManager, tRoot } from "./App.js";
 import { TargetUtil } from "./TargetUtil.js";
-import { TargetData } from "./TargetData.js";
 import { TModel } from "./TModel.js";
 
 /**
@@ -99,6 +98,11 @@ var TUtil = /*#__PURE__*/function () {
     value: function isDefined(obj) {
       return typeof obj !== "undefined" && obj !== null;
     }
+  }, {
+    key: "hasProperty",
+    value: function hasProperty(obj, key) {
+      return Object.prototype.hasOwnProperty.call(obj, key);
+    }
   }, {
     key: "isNumber",
     value: function isNumber(num) {
@@ -234,19 +238,6 @@ var TUtil = /*#__PURE__*/function () {
       }
       return false;
     }
-  }, {
-    key: "runTargetValue",
-    value: function runTargetValue(tmodel, target, key, cycle, lastValue) {
-      var cleanKey = TargetUtil.getTargetName(key);
-      var isExternalEvent = TargetData.allEventMap[cleanKey];
-      if (isExternalEvent) {
-        return typeof target.value === 'function' ? target.value.call(tmodel, getEvents().getCurrentOriginalEvent(), cycle, lastValue) : TUtil.isDefined(target.value) ? target.value : target;
-      } else if (tmodel.val("___".concat(key))) {
-        return typeof target.value === 'function' ? target.value.call(tmodel, tmodel.val("___".concat(key)), cycle, lastValue) : TUtil.isDefined(target.value) ? target.value : target;
-      } else {
-        return typeof target.value === 'function' ? target.value.call(tmodel, cycle, lastValue) : TUtil.isDefined(target.value) ? target.value : target;
-      }
-    }
   }, {
     key: "mergeTargets",
     value: function mergeTargets(tmodel1, tmodel2) {
@@ -321,7 +312,7 @@ var TUtil = /*#__PURE__*/function () {
   }, {
     key: "advanceTargetByElapsed",
     value: function advanceTargetByElapsed(tmodel, key) {
-      var _targetValue$valueLis2;
+      var _targetValue$valueLis3;
       var targetValue = tmodel.targetValues[key];
       if (!targetValue) {
         return {
@@ -331,21 +322,24 @@ var TUtil = /*#__PURE__*/function () {
           done: false
         };
       }
-      if (!targetValue.catchupAt) {
-        var _targetValue$valueLis;
+      if (!TUtil.isDefined(targetValue.catchupAt)) {
+        var _targetValue$valueLis, _targetValue$valueLis2;
+        var step = tmodel.getTargetStep(key);
+        var valuePointer = (_targetValue$valueLis = targetValue.valueList) !== null && _targetValue$valueLis !== void 0 && _targetValue$valueLis.length ? tmodel.getValueListPointer(key) : 0;
         return {
-          step: tmodel.getTargetStep(key),
+          step: step,
           cycle: tmodel.getTargetCycle(key),
-          valuePointer: (_targetValue$valueLis = targetValue.valueList) !== null && _targetValue$valueLis !== void 0 && _targetValue$valueLis.length ? tmodel.getValueListPointer(key) : 0,
-          done: tmodel.getTargetStep(key) >= tmodel.getTargetSteps(key)
+          valuePointer: valuePointer,
+          done: (_targetValue$valueLis2 = targetValue.valueList) !== null && _targetValue$valueLis2 !== void 0 && _targetValue$valueLis2.length ? valuePointer >= targetValue.valueList.length : false
         };
       }
-      var elapsedMs = TUtil.now() - targetValue.catchupAt;
-      if ((_targetValue$valueLis2 = targetValue.valueList) !== null && _targetValue$valueLis2 !== void 0 && _targetValue$valueLis2.length) {
-        return TUtil.advanceValueListTargetByElapsed(tmodel, key, elapsedMs);
-      } else {
-        return TUtil.advanceSimpleTargetByElapsed(tmodel, key, elapsedMs);
+      var now = TUtil.now();
+      var elapsedMs = now - targetValue.catchupAt;
+      var progress = (_targetValue$valueLis3 = targetValue.valueList) !== null && _targetValue$valueLis3 !== void 0 && _targetValue$valueLis3.length ? TUtil.advanceValueListTargetByElapsed(tmodel, key, elapsedMs) : TUtil.advanceSimpleTargetByElapsed(tmodel, key, elapsedMs);
+      if (!progress.done) {
+        targetValue.catchupAt = now - progress.remainingMs;
       }
+      return progress;
     }
   }, {
     key: "advanceSimpleTargetByElapsed",
@@ -355,15 +349,16 @@ var TUtil = /*#__PURE__*/function () {
       var cycles = tmodel.getTargetCycles(key);
       var step = tmodel.getTargetStep(key);
       var cycle = tmodel.getTargetCycle(key);
+      var remainingMs = elapsedMs;
       if (steps <= 0) {
         return {
           step: steps,
           valuePointer: 0,
           cycle: cycles,
-          done: true
+          done: true,
+          remainingMs: 0
         };
       }
-      var remainingMs = elapsedMs;
       while (remainingMs > 0 && cycle < cycles) {
         var remainingSteps = Math.max(steps - step, 0);
         var remainingSegmentMs = remainingSteps * interval;
@@ -375,7 +370,8 @@ var TUtil = /*#__PURE__*/function () {
               step: steps,
               valuePointer: 0,
               cycle: cycles,
-              done: true
+              done: true,
+              remainingMs: remainingMs
             };
           }
           step = 0;
@@ -383,12 +379,14 @@ var TUtil = /*#__PURE__*/function () {
         }
         var advancedSteps = TUtil.limit(Math.floor(remainingMs / interval), 0, remainingSteps);
         step += advancedSteps;
+        remainingMs -= advancedSteps * interval;
         return {
           step: step,
           steps: steps,
           valuePointer: 0,
           cycle: cycle,
-          done: false
+          done: false,
+          remainingMs: remainingMs
         };
       }
       return {
@@ -396,7 +394,8 @@ var TUtil = /*#__PURE__*/function () {
         steps: steps,
         valuePointer: 0,
         cycle: cycle,
-        done: cycle >= cycles
+        done: cycle >= cycles,
+        remainingMs: remainingMs
       };
     }
   }, {
@@ -411,7 +410,7 @@ var TUtil = /*#__PURE__*/function () {
       var valuePointer = tmodel.getValueListPointer(key);
       var step = tmodel.getTargetStep(key);
       var remainingMs = elapsedMs;
-      while (remainingMs > 0 && cycle < cycles) {
+      while (cycle < cycles) {
         while (remainingMs > 0 && valuePointer < valueList.length) {
           var segmentSteps = stepList[(valuePointer - 1) % stepList.length];
           var interval = intervalList[(valuePointer - 1) % intervalList.length] || 8;
@@ -426,29 +425,39 @@ var TUtil = /*#__PURE__*/function () {
           }
           var advancedSteps = TUtil.limit(Math.floor(remainingMs / interval), 0, remainingSteps);
           step += advancedSteps;
+          remainingMs -= advancedSteps * interval;
           return {
             step: step,
             steps: segmentSteps,
             valuePointer: valuePointer,
             cycle: cycle,
-            done: false
+            done: false,
+            remainingMs: remainingMs
           };
         }
-        cycle++;
-        if (cycle >= cycles) {
-          var finalPointer = valueList.length;
-          var finalStepIndex = Math.max(0, valueList.length - 2);
-          var finalSteps = stepList[finalStepIndex % stepList.length];
-          return {
-            step: finalSteps,
-            steps: finalSteps,
-            valuePointer: finalPointer,
-            cycle: cycles,
-            done: true
-          };
+        if (valuePointer >= valueList.length) {
+          cycle++;
+          if (cycle >= cycles) {
+            var finalPointer = valueList.length;
+            var finalStepIndex = Math.max(0, valueList.length - 2);
+            var finalSteps = stepList[finalStepIndex % stepList.length];
+            return {
+              step: finalSteps,
+              steps: finalSteps,
+              valuePointer: finalPointer,
+              cycle: cycles,
+              done: true,
+              remainingMs: remainingMs
+            };
+          }
+          valuePointer = 1;
+          step = 0;
+          if (remainingMs <= 0) {
+            break;
+          }
+          continue;
         }
-        valuePointer = 1;
-        step = 0;
+        break;
       }
       var currentSteps = stepList[(valuePointer - 1) % stepList.length];
       return {
@@ -456,6 +465,7 @@ var TUtil = /*#__PURE__*/function () {
         steps: currentSteps,
         valuePointer: valuePointer,
         cycle: cycle,
+        remainingMs: remainingMs,
         done: cycle >= cycles
       };
     }

package/build/TargetData.js

@@ -68,6 +68,12 @@ var TargetData = /*#__PURE__*/function () {
     value: function isTransformKey(key) {
       return !!TargetData.transformMap[key];
     }
+  }, {
+    key: "affectsVisibility",
+    value: function affectsVisibility(key) {
+      key = TargetUtil.getTargetName(key);
+      return ["x", "y", "width", "height", "dim"].includes(TargetUtil.getTargetName(key));
+    }
   }]);
 }();
 _TargetData = TargetData;
@@ -923,6 +929,6 @@ _defineProperty(TargetData, "lifecyclePatterns", {
 });
 _defineProperty(TargetData, "eventSet", new Set([].concat(_toConsumableArray(Object.keys(_TargetData.allEventMap)), _toConsumableArray(Object.keys(_TargetData.internalEventMap)))));
 _defineProperty(TargetData, "styleSet", new Set([].concat(_toConsumableArray(Object.keys(_TargetData.styleTargetMap)), _toConsumableArray(Object.keys(_TargetData.asyncStyleTargetMap)), _toConsumableArray(Object.keys(_TargetData.attributeTargetMap)))));
-_defineProperty(TargetData, "reservedKeywordSet", new Set([].concat(_toConsumableArray(_TargetData.styleSet), _toConsumableArray(Object.keys(_TargetData.defaultActualValues())), _toConsumableArray(Object.keys(_TargetData.allEventMap)), _toConsumableArray(Object.keys(_TargetData.internalEventMap)), _toConsumableArray(Object.keys(_TargetData.mustExecuteTargets)), ['html', 'isInFlow', 'domHolder', 'domParent', 'gap', 'widthFromDom', 'heightFromDom', 'requiresDom', 'preventDefault', 'canDeleteDom', 'textOnly', 'styling', '$dom', 'defaultStyling', 'reuseDomDefinition', 'canHaveDom', 'excludeXYCalc', 'excludeX', 'excludeY', 'containerOverflowMode', 'itemOverflowMode', 'baseElement', 'element', 'otype', 'calculateChildren', 'domIsland', 'bracketThreshold', 'bracketSize', 'shouldBeBracketed', 'sourceDom'])));
+_defineProperty(TargetData, "reservedKeywordSet", new Set([].concat(_toConsumableArray(_TargetData.styleSet), _toConsumableArray(Object.keys(_TargetData.defaultActualValues())), _toConsumableArray(Object.keys(_TargetData.allEventMap)), _toConsumableArray(Object.keys(_TargetData.internalEventMap)), _toConsumableArray(Object.keys(_TargetData.mustExecuteTargets)), ['children', 'addChildren', 'addParticles', 'html', 'isInFlow', 'domHolder', 'domParent', 'gap', 'widthFromDom', 'heightFromDom', 'requiresDom', 'preventDefault', 'canDeleteDom', 'textOnly', 'styling', '$dom', 'defaultStyling', 'reuseDomDefinition', 'canHaveDom', 'excludeXYCalc', 'excludeX', 'excludeY', 'containerOverflowMode', 'itemOverflowMode', 'baseElement', 'element', 'otype', 'calculateChildren', 'domIsland', 'bracketThreshold', 'bracketSize', 'shouldBeBracketed', 'sourceDom'])));
 _defineProperty(TargetData, "activationKeywordSet", new Set(['originalTModel', 'originalTargetName', 'activateNextTarget']));
 export { TargetData };

package/build/TargetExecutor.js

@@ -25,6 +25,7 @@ import { TUtil } from "./TUtil.js";
 import { AnimationUtil } from "./AnimationUtil.js";
 import { Easing } from "./Easing.js";
 import { getLoader, getRunScheduler, getAnimationManager } from "./App.js";
+import { TModelFactory } from "./TModelFactory.js";
 
 /**
  * It is responsible for executing both declarative and imperative targets.
@@ -159,8 +160,12 @@ var TargetExecutor = /*#__PURE__*/function () {
         TargetExecutor.assignSingleTarget(targetValue, value, undefined, steps, cycles, interval, easing);
       }
       if (targetValue) {
+        var _tmodel$noDomUpdating;
         TargetExecutor.resetImperativeProgress(targetValue);
         TargetExecutor.assignTargetOptions(targetValue, options);
+        if (targetValue.steps > 0 && (_tmodel$noDomUpdating = tmodel.noDomUpdatingTargets) !== null && _tmodel$noDomUpdating !== void 0 && _tmodel$noDomUpdating.has(key)) {
+          targetValue.catchupAt = TUtil.now();
+        }
         TargetExecutor.updateTarget(tmodel, targetValue, key, true, snapUpdates);
         if (tmodel.isTargetDone(key)) {
           TargetUtil.shouldActivateNextTarget(tmodel, key);
@@ -251,7 +256,7 @@ var TargetExecutor = /*#__PURE__*/function () {
   }, {
     key: "snapActualToTarget",
     value: function snapActualToTarget(tmodel, key, snapUpdates) {
-      var _tmodel$animatingMap2;
+      var _tmodel$animatingMap$, _tmodel$animatingMap2;
       var targetValue = tmodel.targetValues[key];
       var newValue;
       if (Array.isArray(targetValue.valueList)) {
@@ -263,7 +268,11 @@ var TargetExecutor = /*#__PURE__*/function () {
         newValue = typeof value === 'function' ? value.call(tmodel) : value;
       }
       var valueChanged = tmodel.val(key) !== newValue;
-      var isAnimating = (_tmodel$animatingMap2 = tmodel.animatingMap) === null || _tmodel$animatingMap2 === void 0 ? void 0 : _tmodel$animatingMap2.has(key);
+      var cleanKey = TargetUtil.getTargetName(key);
+      var animatedKey = _toConsumableArray((_tmodel$animatingMap$ = (_tmodel$animatingMap2 = tmodel.animatingMap) === null || _tmodel$animatingMap2 === void 0 ? void 0 : _tmodel$animatingMap2.keys()) !== null && _tmodel$animatingMap$ !== void 0 ? _tmodel$animatingMap$ : []).find(function (animatedKey) {
+        return TargetUtil.getTargetName(animatedKey) === cleanKey;
+      });
+      var isAnimating = !!animatedKey;
       if (!valueChanged && !isAnimating) {
         return;
       }
@@ -272,7 +281,7 @@ var TargetExecutor = /*#__PURE__*/function () {
         tmodel.setActual(key, newValue);
         TUtil.handleValueChange(tmodel, key);
       }
-      if (!tmodel.hasValidAnimation() || !tmodel.canBeAnimated(key)) {
+      if (!isAnimating || !tmodel.hasValidAnimation() || !tmodel.canBeAnimated(key)) {
         targetValue.snapAnimation = false;
         return;
       }
@@ -315,7 +324,23 @@ var TargetExecutor = /*#__PURE__*/function () {
         return;
       }
       var targetInitial = !tmodel.targetValues[key] && TUtil.isDefined(tmodel.targets[key].initialValue) ? tmodel.targets[key].initialValue : undefined;
-      var valueArray = TargetParser.getValueStepsCycles(tmodel, key, tmodel.targets[key], cycle);
+      var target = tmodel.targets[key];
+      var hasInstances = target && _typeof(target) === 'object' && TUtil.isDefined(target.instances);
+      var instances = hasInstances ? TargetParser.getTargetInstances(tmodel, key, target, cycle) : 1;
+      var valueArray;
+      if (hasInstances) {
+        var values = new Array(instances);
+        valueArray = TargetParser.getValueStepsCycles(tmodel, key, target, cycle, 0);
+        values[0] = valueArray[0];
+        valueArray[0] = values;
+        var lastValues = tmodel.val(key);
+        for (var instance = 1; instance < instances; instance++) {
+          var lastValue = Array.isArray(lastValues) ? lastValues[instance] : lastValues;
+          values[instance] = TargetParser.getInstanceTargetValue(tmodel, key, target, cycle, lastValue, instance);
+        }
+      } else {
+        valueArray = TargetParser.getValueStepsCycles(tmodel, key, target, cycle);
+      }
       var newValue = valueArray[0];
       var newSteps = valueArray[1] || 0;
       var newInterval = valueArray[2] || 0;
@@ -324,20 +349,42 @@ var TargetExecutor = /*#__PURE__*/function () {
       var targetValue = tmodel.targetValues[key] || TargetUtil.emptyValue();
       tmodel.targetValues[key] = targetValue;
       var easing = TUtil.isDefined(newEasing) ? newEasing : TUtil.isDefined(tmodel.targets[key].easing) ? tmodel.targets[key].easing : undefined;
+      var specialTarget;
       if (TargetParser.isIntervalTarget(newValue)) {
         TargetExecutor.assignSingleTarget(targetValue, undefined, targetInitial, 0, 2, newValue.interval, easing);
+      } else if (specialTarget = tmodel.handleSpecialTarget(key, newValue, {
+        steps: newSteps,
+        cycles: newCycles,
+        interval: newInterval,
+        easing: easing
+      })) {
+        var _options$steps, _options$cycles, _options$interval, _options$easing;
+        var options = specialTarget === true ? {} : specialTarget;
+        TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, (_options$steps = options.steps) !== null && _options$steps !== void 0 ? _options$steps : newSteps, (_options$cycles = options.cycles) !== null && _options$cycles !== void 0 ? _options$cycles : newCycles, (_options$interval = options.interval) !== null && _options$interval !== void 0 ? _options$interval : newInterval, (_options$easing = options.easing) !== null && _options$easing !== void 0 ? _options$easing : easing);
       } else if (TargetParser.isChildTarget(key, newValue)) {
         tmodel.addChild(newValue);
         TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval, easing);
       } else if (TargetParser.isChildrenTarget(key, newValue)) {
-        var values = Array.isArray(newValue) ? newValue : newValue ? [newValue] : [];
-        values.forEach(function (child) {
+        var _options$steps2, _options$cycles2, _options$interval2, _options$easing2;
+        var _values = Array.isArray(newValue) ? newValue : newValue ? [newValue] : [];
+        _values.forEach(function (child) {
+          var addedChildrenCount = tmodel.addedChildren.length;
           tmodel.addChild(child);
-          TargetUtil.markAddChild(tmodel, TargetUtil.currentTargetName, tmodel.addedChildren[tmodel.addedChildren.length - 1].child);
+          if (tmodel.addedChildren.length > addedChildrenCount) {
+            var addedChild = tmodel.addedChildren[tmodel.addedChildren.length - 1].child;
+            TargetUtil.markAddChild(tmodel, TargetUtil.currentTargetName, addedChild);
+          }
         });
-        TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval, easing);
+        var result = tmodel.finalizeChildrenTarget(key, {
+          steps: newSteps,
+          cycles: newCycles,
+          interval: newInterval,
+          easing: easing
+        });
+        var _options = result && _typeof(result) === "object" ? result : {};
+        TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, (_options$steps2 = _options.steps) !== null && _options$steps2 !== void 0 ? _options$steps2 : 0, (_options$cycles2 = _options.cycles) !== null && _options$cycles2 !== void 0 ? _options$cycles2 : newCycles, (_options$interval2 = _options.interval) !== null && _options$interval2 !== void 0 ? _options$interval2 : newInterval, (_options$easing2 = _options.easing) !== null && _options$easing2 !== void 0 ? _options$easing2 : easing);
       } else if (TargetParser.isChildObjectTarget(key, tmodel.targets[key])) {
-        var child = new TModel(key, tmodel.targets[key]);
+        var child = TargetExecutor.createTModel(key, tmodel.targets[key]);
         tmodel.addChild(child);
         var filteredValue = Object.fromEntries(Object.entries(newValue).filter(function (_ref) {
           var _ref2 = _slicedToArray(_ref, 1),
@@ -365,6 +412,13 @@ var TargetExecutor = /*#__PURE__*/function () {
         TargetExecutor.assignSingleTarget(targetValue, newValue, targetInitial, newSteps, newCycles, newInterval, easing);
       }
     }
+  }, {
+    key: "createTModel",
+    value: function createTModel(key, targets) {
+      return TModelFactory.create(key, targets, function (type, targets) {
+        return new TModel(type, targets);
+      });
+    }
   }]);
 }();
 export { TargetExecutor };

package/build/TargetManager.js

@@ -99,7 +99,7 @@ var TargetManager = /*#__PURE__*/function () {
           }
           schedulePeriod = ScheduleUtil.scheduleExecution(tmodel, key);
           if (schedulePeriod > 0) {
-            getRunScheduler().schedule(schedulePeriod, "setActualValues-".concat(tmodel.oid));
+            getRunScheduler().schedule(schedulePeriod, "setActualValues-".concat(tmodel.oid, "-").concat(key));
           } else {
             tmodel.resetScheduleTimeStamp(key);
             this.setActualValue(tmodel, key);
@@ -161,7 +161,8 @@ var TargetManager = /*#__PURE__*/function () {
           }
         }
       } else {
-        needsRefire = TUtil.handleValueChange(tmodel, key);
+        needsRefire = tmodel.handleSpecialTargetStep(key, step, steps) || needsRefire;
+        needsRefire = TUtil.handleValueChange(tmodel, key) || needsRefire;
         if (target !== null && target !== void 0 && target.activateNextTarget && !target.activateNextTarget.endsWith('$$') && target.activateNextTarget.endsWith('$')) {
           needsRefire = true;
           TargetUtil.shouldActivateNextTarget(tmodel, key);
@@ -188,6 +189,7 @@ var TargetManager = /*#__PURE__*/function () {
       }
       var newStatus = this.calculateTargetStatus(tmodel, key);
       tmodel.setTargetStatus(key, newStatus);
+      tmodel.handleSpecialTargetEnd(key);
       if (tmodel.isTargetImperative(key)) {
         var capKey = TargetUtil.getTargetName(TUtil.capitalizeFirstLetter(key));
         if (originalTarget && typeof originalTarget["on".concat(capKey, "End")] === "function") {
@@ -247,6 +249,7 @@ var TargetManager = /*#__PURE__*/function () {
   }, {
     key: "catchupTargetByElapsed",
     value: function catchupTargetByElapsed(tmodel, key) {
+      var _targetValue$valueLis4;
       var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
         _ref$fireEnd = _ref.fireEnd,
         fireEnd = _ref$fireEnd === void 0 ? false : _ref$fireEnd;
@@ -260,17 +263,16 @@ var TargetManager = /*#__PURE__*/function () {
       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;
+        var _targetValue$valueLis, _progress$steps, _targetValue$valueLis2, _targetValue$valueLis3;
+        var finalValue = (_targetValue$valueLis = targetValue.valueList) !== null && _targetValue$valueLis !== void 0 && _targetValue$valueLis.length ? targetValue.valueList[targetValue.valueList.length - 1] : tmodel.getTargetValue(key);
         tmodel.val(key, finalValue);
         tmodel.setActual(key, finalValue);
         tmodel.addToStyleTargetList(key);
-        targetValue.step = steps;
+        targetValue.step = (_progress$steps = progress.steps) !== null && _progress$steps !== void 0 ? _progress$steps : tmodel.getTargetSteps(key);
         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) {
@@ -278,11 +280,23 @@ var TargetManager = /*#__PURE__*/function () {
         }
         return {
           done: true,
-          step: steps,
+          step: targetValue.step,
           cycle: cycles,
           valuePointer: targetValue.valuePointer
         };
       }
+      if ((_targetValue$valueLis4 = targetValue.valueList) !== null && _targetValue$valueLis4 !== void 0 && _targetValue$valueLis4.length) {
+        targetValue.valuePointer = valuePointer;
+        targetValue.initialValue = targetValue.valueList[valuePointer - 1];
+        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] : targetValue.interval;
+        targetValue.easing = targetValue.easingList[(valuePointer - 1) % targetValue.easingList.length];
+      }
+      targetValue.step = step;
+      targetValue.cycle = cycle;
+      var theValue = tmodel.getTargetValue(key);
+      var steps = tmodel.getTargetSteps(key);
       var initialValue = tmodel.getTargetInitialValue(key);
       if (!TUtil.isDefined(initialValue)) {
         initialValue = this.resolveInitialValue(tmodel, key, theValue);
@@ -292,9 +306,6 @@ var TargetManager = /*#__PURE__*/function () {
       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,
@@ -330,7 +341,7 @@ var TargetManager = /*#__PURE__*/function () {
       if (tmodel.canBeAnimated(state.cleanKey)) {
         this.animateActualValue(tmodel, key, targetValue, state, step, valuePointer);
       } else {
-        this.updateActualValue(tmodel, key, targetValue, state, step, valuePointer);
+        this.updateActualValue(tmodel, key, targetValue, state, step);
       }
     }
   }, {
@@ -371,6 +382,7 @@ var TargetManager = /*#__PURE__*/function () {
     key: "animateActualValue",
     value: function animateActualValue(tmodel, key, targetValue, state, step, valuePointer) {
       if (!tmodel.hasDom()) {
+        tmodel.addToNoDomUpdatingTargets(key);
         return;
       }
       var newValue = step > 0 ? TModelUtil.easingMorph(tmodel, key, state.initialValue, state.theValue, step, state.steps) : state.initialValue;
@@ -382,7 +394,7 @@ var TargetManager = /*#__PURE__*/function () {
     }
   }, {
     key: "updateActualValue",
-    value: function updateActualValue(tmodel, key, targetValue, state, step, valuePointer) {
+    value: function updateActualValue(tmodel, key, targetValue, state, step) {
       if (step <= state.steps) {
         tmodel.incrementTargetStep(key, state.now, state.lastUpdateTime, state.interval, state.steps);
         var newValue = TModelUtil.easingMorph(tmodel, key, state.initialValue, state.theValue, step, state.steps);
@@ -395,27 +407,31 @@ var TargetManager = /*#__PURE__*/function () {
           return;
         }
       }
-      this.finishCurrentSegment(tmodel, key, targetValue, state, valuePointer);
+      this.finishCurrentSegment(tmodel, key, targetValue, state);
     }
   }, {
     key: "finishCurrentSegment",
-    value: function finishCurrentSegment(tmodel, key, targetValue, state, valuePointer) {
+    value: function finishCurrentSegment(tmodel, key, targetValue, state) {
       tmodel.val(key, state.theValue);
       tmodel.setActual(key, state.theValue);
       tmodel.addToStyleTargetList(key);
       targetValue.step = state.steps;
       tmodel.setLastUpdate(key);
       var scheduleTime = 1;
-      if (targetValue.valueList && valuePointer < targetValue.valueList.length) {
+      if (targetValue.valueList) {
         tmodel.incrementValueListPointer(key);
         var nextPointer = tmodel.getValueListPointer(key);
-        tmodel.resetTargetStep(key);
-        targetValue.initialValue = targetValue.value;
-        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;
+        if (nextPointer < targetValue.valueList.length) {
+          tmodel.resetTargetStep(key);
+          targetValue.initialValue = targetValue.value;
+          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);
+        }
       } else {
         this.fireOnEnd(tmodel, key);
       }

package/build/TargetParser.js

@@ -9,6 +9,7 @@ import { TargetData } from './TargetData.js';
 import { TUtil } from './TUtil.js';
 import { TModel } from "./TModel.js";
 import { Easing } from "./Easing.js";
+import { getEvents } from "./App.js";
 
 /**
  * It provides helper functions for classify target types
@@ -98,7 +99,41 @@ var TargetParser = /*#__PURE__*/function () {
       if (!value || _typeof(value) !== 'object' || Array.isArray(value) || Object.getPrototypeOf(value) !== Object.prototype) {
         return false;
       }
-      return Object.prototype.hasOwnProperty.call(value, 'value') || Object.prototype.hasOwnProperty.call(value, 'steps') || Object.prototype.hasOwnProperty.call(value, 'interval') || Object.prototype.hasOwnProperty.call(value, 'easing') || Object.prototype.hasOwnProperty.call(value, 'cycles');
+      return Object.prototype.hasOwnProperty.call(value, 'value') || Object.prototype.hasOwnProperty.call(value, 'steps') || Object.prototype.hasOwnProperty.call(value, 'interval') || Object.prototype.hasOwnProperty.call(value, 'easing') || Object.prototype.hasOwnProperty.call(value, 'cycles') || Object.prototype.hasOwnProperty.call(value, 'instances');
+    }
+  }, {
+    key: "getTargetInstances",
+    value: function getTargetInstances(tmodel, key) {
+      var target = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : tmodel.targets[key];
+      var cycle = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : tmodel.getTargetCycle(key);
+      if (!target || _typeof(target) !== 'object' || !TUtil.isDefined(target.instances)) {
+        return 1;
+      }
+      var instances = typeof target.instances === 'function' ? target.instances.call(tmodel, cycle) : target.instances;
+      return Math.max(1, Math.floor(Number(instances) || 1));
+    }
+  }, {
+    key: "getInstanceTargetValue",
+    value: function getInstanceTargetValue(tmodel, key, target, cycle, lastValue, instance) {
+      return TargetParser.runTargetValue(tmodel, target, key, cycle, lastValue, instance);
+    }
+  }, {
+    key: "runTargetValue",
+    value: function runTargetValue(tmodel, target, key, cycle, lastValue) {
+      var instance = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : undefined;
+      var cleanKey = TargetUtil.getTargetName(key);
+      var isExternalEvent = TargetData.allEventMap[cleanKey];
+      var instanceArgs = TUtil.isDefined(instance) ? [instance] : [];
+      if (isExternalEvent) {
+        var _target$value;
+        return typeof target.value === 'function' ? (_target$value = target.value).call.apply(_target$value, [tmodel].concat(instanceArgs, [getEvents().getCurrentOriginalEvent(), cycle, lastValue])) : TUtil.isDefined(target.value) ? target.value : target;
+      } else if (tmodel.val("___".concat(key))) {
+        var _target$value2;
+        return typeof target.value === 'function' ? (_target$value2 = target.value).call.apply(_target$value2, [tmodel].concat(instanceArgs, [tmodel.val("___".concat(key)), cycle, lastValue])) : TUtil.isDefined(target.value) ? target.value : target;
+      } else {
+        var _target$value3;
+        return typeof target.value === 'function' ? (_target$value3 = target.value).call.apply(_target$value3, [tmodel].concat(instanceArgs, [cycle, lastValue])) : TUtil.isDefined(target.value) ? target.value : target;
+      }
     }
   }, {
     key: "isChildrenTarget",
@@ -215,6 +250,7 @@ var TargetParser = /*#__PURE__*/function () {
     value: function getValueStepsCycles(tmodel, key) {
       var _target = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : tmodel.targets[key];
       var cycle = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : tmodel.getTargetCycle(key);
+      var instance = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : undefined;
       var valueOnly = _target && _target.valueOnly;
       var lastValue = tmodel.val(key);
       var value = null,
@@ -256,7 +292,7 @@ var TargetParser = /*#__PURE__*/function () {
 
         // Plain objects: compute value + params (steps/interval/easing/cycles)
         if (_typeof(target) === "object" && target !== null && Object.getPrototypeOf(target) === Object.prototype) {
-          var valueResult = TUtil.runTargetValue(tmodel, target, key, cycle, lastValue);
+          var valueResult = TargetParser.runTargetValue(tmodel, target, key, cycle, lastValue, instance);
           if (TargetParser.isPrimitiveArray(valueResult) && (TUtil.isDefined(target.steps) || TUtil.isDefined(target.interval) || TUtil.isDefined(target.easing) || TUtil.isDefined(target.cycles))) {
             value = {
               list: valueResult