targetj 1.0.260 → 1.1.1

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,24 +238,6 @@ var TUtil = /*#__PURE__*/function () {
       }
       return false;
     }
-  }, {
-    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: "mergeTargets",
     value: function mergeTargets(tmodel1, tmodel2) {
@@ -336,21 +322,24 @@ var TUtil = /*#__PURE__*/function () {
           done: false
         };
       }
-      if (!targetValue.catchupAt) {
+      if (!TUtil.isDefined(targetValue.catchupAt)) {
         var _targetValue$valueLis;
+        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: !TargetUtil.isTargetUpdating(tmodel, key)
         };
       }
-      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$valueLis2 = targetValue.valueList) !== null && _targetValue$valueLis2 !== void 0 && _targetValue$valueLis2.length ? TUtil.advanceValueListTargetByElapsed(tmodel, key, elapsedMs) : TUtil.advanceSimpleTargetByElapsed(tmodel, key, elapsedMs);
+      if (!progress.done) {
+        targetValue.catchupAt = now - progress.remainingMs;
       }
+      return progress;
     }
   }, {
     key: "advanceSimpleTargetByElapsed",
@@ -360,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;
@@ -380,7 +370,8 @@ var TUtil = /*#__PURE__*/function () {
               step: steps,
               valuePointer: 0,
               cycle: cycles,
-              done: true
+              done: true,
+              remainingMs: remainingMs
             };
           }
           step = 0;
@@ -388,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 {
@@ -401,7 +394,8 @@ var TUtil = /*#__PURE__*/function () {
         steps: steps,
         valuePointer: 0,
         cycle: cycle,
-        done: cycle >= cycles
+        done: cycle >= cycles,
+        remainingMs: remainingMs
       };
     }
   }, {
@@ -416,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;
@@ -431,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 {
@@ -461,6 +465,7 @@ var TUtil = /*#__PURE__*/function () {
         steps: currentSteps,
         valuePointer: valuePointer,
         cycle: cycle,
+        remainingMs: remainingMs,
         done: cycle >= cycles
       };
     }

package/build/TargetData.js

@@ -41,8 +41,7 @@ var TargetData = /*#__PURE__*/function () {
         isIncluded: true,
         bracketThreshold: 40,
         bracketSize: 2,
-        preventDefault: undefined,
-        canDeleteDom: undefined
+        preventDefault: undefined
       };
     }
   }, {
@@ -68,9 +67,21 @@ 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));
+    }
+  }, {
+    key: "requiresDom",
+    value: function requiresDom(targetName) {
+      return TargetData.onDomTargets.has(targetName);
+    }
   }]);
 }();
 _TargetData = TargetData;
+_defineProperty(TargetData, "onDomTargets", new Set(["explodeChildren"]));
 _defineProperty(TargetData, "transformOrder", {
   perspective: 0,
   translateX: 1,
@@ -189,6 +200,7 @@ _defineProperty(TargetData, "asyncStyleTargetMap", {
   alignItems: true,
   display: true,
   cursor: true,
+  pointerEvents: true,
   fontFamily: true,
   overflow: true,
   overflowX: true,
@@ -199,11 +211,14 @@ _defineProperty(TargetData, "asyncStyleTargetMap", {
   willChange: true,
   backgroundImage: true,
   backgroundSize: true,
+  backgroundPosition: true,
+  backgroundRepeat: true,
   flexWrap: true,
   userSelect: true,
   outline: true,
   backfaceVisibility: true,
-  filter: true
+  filter: true,
+  whiteSpace: true
 });
 _defineProperty(TargetData, "scaleMap", {
   scale: true,
@@ -257,8 +272,7 @@ _defineProperty(TargetData, "mustExecuteTargets", {
   widthFromDom: true,
   fetch: true,
   fetchImage: true,
-  isVisible: true,
-  canDeleteDom: true
+  isVisible: true
 });
 _defineProperty(TargetData, "ignoreRerun", {
   isVisible: true
@@ -298,8 +312,7 @@ _defineProperty(TargetData, "controlTargetMap", {
   styling: true,
   reuseDomDefinition: true,
   useWindowFrame: true,
-  canDeleteDom: true,
-  onDomEvent: true,
+  onDomReady: true,
   canHaveDom: true
 });
 _defineProperty(TargetData, "events", {
@@ -731,6 +744,8 @@ _defineProperty(TargetData, "attributesToTargets", {
   backgroundcolor: 'backgroundColor',
   backgroundimage: 'backgroundImage',
   backgroundsize: 'backgroundSize',
+  backgroundposition: 'backgroundPosition',
+  backgroundrepeat: 'backgroundRepeat',
   bordertop: 'borderTop',
   borderleft: 'borderLeft',
   borderright: 'borderRight',
@@ -773,7 +788,9 @@ _defineProperty(TargetData, "attributesToTargets", {
   ariacurrent: 'ariaCurrent',
   ariapressed: 'ariaPressed',
   tabindex: 'tabIndex',
-  backfacevisibility: 'backfaceVisibility'
+  backfacevisibility: 'backfaceVisibility',
+  whitespace: 'whiteSpace',
+  pointerevents: 'pointerEvents'
 });
 _defineProperty(TargetData, "targetToEventsMapping", {
   onStart: ['touchStart', 'mouseStart'],
@@ -805,9 +822,6 @@ _defineProperty(TargetData, "targetToEventsMapping", {
   onSubmit: ['submitEvents']
 });
 _defineProperty(TargetData, "internalEventMap", {
-  onDomEvent: function onDomEvent(tmodel) {
-    return tmodel.hasDomNow;
-  },
   onVisible: function onVisible(tmodel) {
     return tmodel.isNowVisible;
   },
@@ -923,6 +937,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)), ['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, "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', 'explodeChildren', 'html', 'isInFlow', 'domHolder', 'domParent', 'gap', 'widthFromDom', 'heightFromDom', 'preventDefault', '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

@@ -160,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);
@@ -191,7 +195,6 @@ var TargetExecutor = /*#__PURE__*/function () {
   }, {
     key: "calculateTargetStatus",
     value: function calculateTargetStatus(tmodel, targetValue, key) {
-      var _tmodel$targets$key;
       var valuePointer = tmodel.getValueListPointer(key);
       var cycle = tmodel.getTargetCycle(key);
       var cycles = tmodel.getTargetCycles(key);
@@ -205,7 +208,7 @@ var TargetExecutor = /*#__PURE__*/function () {
         return 'updating';
       } else if (tmodel.isTargetInLoop(key) || cycle < cycles - 1) {
         return 'active';
-      } else if ((_tmodel$targets$key = tmodel.targets[key]) !== null && _tmodel$targets$key !== void 0 && _tmodel$targets$key.fetchAction && !getLoader().isLoadingSuccessful(tmodel, key)) {
+      } else if (TargetUtil.hasFetchAction(tmodel, key) && !getLoader().isLoadingSuccessful(tmodel, key)) {
         return 'fetching';
       } else {
         return 'done';
@@ -252,7 +255,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)) {
@@ -264,7 +267,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;
       }
@@ -273,7 +280,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;
       }
@@ -317,12 +324,16 @@ var TargetExecutor = /*#__PURE__*/function () {
       }
       var targetInitial = !tmodel.targetValues[key] && TUtil.isDefined(tmodel.targets[key].initialValue) ? tmodel.targets[key].initialValue : undefined;
       var target = tmodel.targets[key];
-      var hasInstances = target && _typeof(target) === 'object' && TUtil.isDefined(target.instances);
+      var isExplodeChildren = TargetParser.isExplodeChildrenTarget(key);
+      var hasInstances = !isExplodeChildren && target && _typeof(target) === "object" && TUtil.isDefined(target.instances);
       var instances = hasInstances ? TargetParser.getTargetInstances(tmodel, key, target, cycle) : 1;
+      var valueTarget = isExplodeChildren && typeof (target === null || target === void 0 ? void 0 : target.value) === "function" ? _objectSpread(_objectSpread({}, target), {}, {
+        value: {}
+      }) : target;
       var valueArray;
       if (hasInstances) {
         var values = new Array(instances);
-        valueArray = TargetParser.getValueStepsCycles(tmodel, key, target, cycle, 0);
+        valueArray = TargetParser.getValueStepsCycles(tmodel, key, valueTarget, cycle, 0);
         values[0] = valueArray[0];
         valueArray[0] = values;
         var lastValues = tmodel.val(key);
@@ -331,7 +342,7 @@ var TargetExecutor = /*#__PURE__*/function () {
           values[instance] = TargetParser.getInstanceTargetValue(tmodel, key, target, cycle, lastValue, instance);
         }
       } else {
-        valueArray = TargetParser.getValueStepsCycles(tmodel, key, target, cycle);
+        valueArray = TargetParser.getValueStepsCycles(tmodel, key, valueTarget, cycle);
       }
       var newValue = valueArray[0];
       var newSteps = valueArray[1] || 0;
@@ -350,14 +361,32 @@ var TargetExecutor = /*#__PURE__*/function () {
         interval: newInterval,
         easing: easing
       })) {
-        var _options$steps, _options$cycles, _options$interval, _options$easing;
+        var _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);
+        TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, (_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.isExplodeChildrenTarget(key)) {
+        var _target$renderer, _options$steps, _options$cycles2, _options$interval2, _options$easing2;
+        var definition = typeof (target === null || target === void 0 ? void 0 : target.value) === "function" ? {} : TargetParser.getExplodeChildrenDefinition(newValue === target ? undefined : newValue);
+        if (typeof tmodel.createExplodeChildren !== "function") {
+          throw new Error("explodeChildren requires a createExplodeChildren() implementation on the TModel.");
+        }
+        var result = tmodel.createExplodeChildren(key, definition, {
+          renderer: (_target$renderer = target === null || target === void 0 ? void 0 : target.renderer) !== null && _target$renderer !== void 0 ? _target$renderer : "gpu",
+          steps: newSteps,
+          cycles: newCycles,
+          interval: newInterval,
+          easing: easing
+        });
+        if (result === false) {
+          throw new Error("explodeChildren could not create its fragment children.");
+        }
+        var _options = result && _typeof(result) === "object" ? result : {};
+        TargetExecutor.assignSingleTarget(targetValue, definition, undefined, (_options$steps = _options.steps) !== null && _options$steps !== void 0 ? _options$steps : 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.isChildrenTarget(key, newValue)) {
-        var _options$steps2, _options$cycles2, _options$interval2, _options$easing2;
+        var _options2$steps, _options2$cycles, _options2$interval, _options2$easing;
         var _values = Array.isArray(newValue) ? newValue : newValue ? [newValue] : [];
         _values.forEach(function (child) {
           var addedChildrenCount = tmodel.addedChildren.length;
@@ -367,14 +396,14 @@ var TargetExecutor = /*#__PURE__*/function () {
             TargetUtil.markAddChild(tmodel, TargetUtil.currentTargetName, addedChild);
           }
         });
-        var result = tmodel.finalizeChildrenTarget(key, {
+        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);
+        var _options2 = _result && _typeof(_result) === "object" ? _result : {};
+        TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, (_options2$steps = _options2.steps) !== null && _options2$steps !== void 0 ? _options2$steps : 0, (_options2$cycles = _options2.cycles) !== null && _options2$cycles !== void 0 ? _options2$cycles : newCycles, (_options2$interval = _options2.interval) !== null && _options2$interval !== void 0 ? _options2$interval : newInterval, (_options2$easing = _options2.easing) !== null && _options2$easing !== void 0 ? _options2$easing : easing);
       } else if (TargetParser.isChildObjectTarget(key, tmodel.targets[key])) {
         var child = TargetExecutor.createTModel(key, tmodel.targets[key]);
         tmodel.addChild(child);
@@ -385,7 +414,7 @@ var TargetExecutor = /*#__PURE__*/function () {
         }));
         TargetExecutor.assignSingleTarget(targetValue, filteredValue, undefined, 0, newCycles, newInterval, easing);
       } else if (_typeof(newValue) === 'object' && newValue.asChild === true) {
-        var _child = new TModel(key, newValue);
+        var _child = TargetExecutor.createTModel(key, newValue);
         tmodel.addChild(_child);
         TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval, easing);
       } else if (TargetParser.isFetchTarget(key, newValue)) {
@@ -397,8 +426,8 @@ var TargetExecutor = /*#__PURE__*/function () {
       } else if (TargetParser.isListTarget(newValue)) {
         TargetExecutor.assignListTarget(tmodel, key, targetValue, newValue.list, newValue.list[0], newSteps, newInterval, easing, newCycles);
       } else {
-        var _tmodel$targets$key$d, _tmodel$targets$key2;
-        if (newSteps > 0 && !TUtil.areEqual(tmodel.val(key), newValue, (_tmodel$targets$key$d = (_tmodel$targets$key2 = tmodel.targets[key]) === null || _tmodel$targets$key2 === void 0 ? void 0 : _tmodel$targets$key2.deepEquality) !== null && _tmodel$targets$key$d !== void 0 ? _tmodel$targets$key$d : false)) {
+        var _tmodel$targets$key$d, _tmodel$targets$key;
+        if (newSteps > 0 && !TUtil.areEqual(tmodel.val(key), newValue, (_tmodel$targets$key$d = (_tmodel$targets$key = tmodel.targets[key]) === null || _tmodel$targets$key === void 0 ? void 0 : _tmodel$targets$key.deepEquality) !== null && _tmodel$targets$key$d !== void 0 ? _tmodel$targets$key$d : false)) {
           tmodel.resetTargetStep(key);
         }
         TargetExecutor.assignSingleTarget(targetValue, newValue, targetInitial, newSteps, newCycles, newInterval, easing);
@@ -407,6 +436,8 @@ var TargetExecutor = /*#__PURE__*/function () {
   }, {
     key: "createTModel",
     value: function createTModel(key, targets) {
+      var _key;
+      key = (_key = key) === null || _key === void 0 ? void 0 : _key.replace(/\${1,2}$/, '');
       return TModelFactory.create(key, targets, function (type, targets) {
         return new TModel(type, targets);
       });