targetj 1.0.247 → 1.0.248

package/build/AnimationManager.js

@@ -77,7 +77,6 @@ var AnimationManager = /*#__PURE__*/function () {
         return;
       }
       var el = tmodel.$dom.getElement();
-      this.cancelElementAnimationsForKeys(el, Object.keys(batch.keyMap));
       var totalDuration = Math.max(batch.totalDuration, 1);
       var originalKeys = _toConsumableArray(new Set(Object.values(batch.keyMap).flatMap(function (set) {
         return _toConsumableArray(set);
@@ -149,7 +148,7 @@ var AnimationManager = /*#__PURE__*/function () {
           var targetValue = tmodel.targetValues[_originalKey];
           if (targetValue) {
             tmodel.addToAnimatingMap(_originalKey);
-            targetValue.status = !targetValue.snapAnimation ? 'updating' : targetValue.status;
+            targetValue.status = !targetValue.snapAnimation ? 'updating' : 'done';
           }
           this.recordMap.set(recId, rec);
         }
@@ -612,7 +611,8 @@ var AnimationManager = /*#__PURE__*/function () {
     }()
   }, {
     key: "fillCutFrameFromRecords",
-    value: function fillCutFrameFromRecords(tmodel, cutFrame) {
+    value: function fillCutFrameFromRecords(tmodel, cutFrame, cutTime, totalDuration) {
+      var progress = totalDuration > 0 ? TUtil.limit(cutTime / totalDuration, 0, 1) : 1;
       var _iterator11 = _createForOfIteratorHelper(this.recordMap),
         _step11;
       try {
@@ -626,7 +626,7 @@ var AnimationManager = /*#__PURE__*/function () {
           if (record.status === 'canceled' || record.status === 'detached') {
             continue;
           }
-          var result = AnimationUtil.getValueFromAnim(record);
+          var result = AnimationUtil.getValueFromFrames(record, progress);
           if (!result) {
             continue;
           }
@@ -643,6 +643,15 @@ var AnimationManager = /*#__PURE__*/function () {
             cycle: result.cycle,
             done: result.status === 'finished'
           });
+          this.setAt(tmodel, cleanKey, result.value);
+          tmodel.val(originalKey, result.value);
+          if (targetValue) {
+            targetValue.value = result.value;
+            targetValue.step = result.step;
+            targetValue.valuePointer = result.valuePointer;
+            targetValue.cycle = result.cycle;
+            tmodel.setActual(originalKey, result.value);
+          }
         }
       } catch (err) {
         _iterator11.e(err);
@@ -657,6 +666,7 @@ var AnimationManager = /*#__PURE__*/function () {
       while (i < batch.frames.length && batch.frames[i].keyTime <= cutTime) {
         i++;
       }
+      var originalDuration = batch.totalDuration;
       var needsInsert = i < batch.frames.length && cutTime !== batch.frames[i].keyTime;
       if (needsInsert) {
         var cutFrame = {
@@ -666,7 +676,7 @@ var AnimationManager = /*#__PURE__*/function () {
           keyMeta: new Map()
         };
         batch.frames.splice(i, 0, cutFrame);
-        this.fillCutFrameFromRecords(tmodel, cutFrame);
+        this.fillCutFrameFromRecords(tmodel, cutFrame, cutTime, originalDuration);
         var originalKeys = _toConsumableArray(new Set(Object.values(batch.keyMap).flatMap(function (set) {
           return _toConsumableArray(set);
         })));
@@ -852,48 +862,24 @@ var AnimationManager = /*#__PURE__*/function () {
       return filtered;
     }
   }, {
-    key: "cancelElementAnimationsForKeys",
-    value: function cancelElementAnimationsForKeys(el, cleanKeys) {
-      if (!el.getAnimations) {
-        return;
+    key: "rebaseAutoLayoutTransform",
+    value: function rebaseAutoLayoutTransform(tmodel, tfUpdates) {
+      if (!tmodel.lastBatch) {
+        return false;
       }
-      var keySet = new Set(cleanKeys);
-      var _iterator18 = _createForOfIteratorHelper(el.getAnimations()),
+      var cutTime = Math.min(TUtil.now() - tmodel.lastBatch.startTime, tmodel.lastBatch.totalDuration);
+      var batch = this.cutLastBatch(tmodel, tmodel.lastBatch, cutTime);
+      AnimationUtil.rebaseCutBatchMeta(tmodel, batch);
+      var _iterator18 = _createForOfIteratorHelper(batch.frames),
         _step18;
       try {
         for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var anim = _step18.value;
-          var effect = anim.effect;
-          if (!(effect !== null && effect !== void 0 && effect.getKeyframes)) {
-            continue;
-          }
-          var kfs = effect.getKeyframes();
-          var touches = false;
-          var _iterator19 = _createForOfIteratorHelper(kfs),
-            _step19;
-          try {
-            for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-              var kf = _step19.value;
-              for (var _i6 = 0, _Object$keys2 = Object.keys(kf); _i6 < _Object$keys2.length; _i6++) {
-                var k = _Object$keys2[_i6];
-                if (keySet.has(k)) {
-                  touches = true;
-                  break;
-                }
-              }
-              if (touches) {
-                break;
-              }
-            }
-          } catch (err) {
-            _iterator19.e(err);
-          } finally {
-            _iterator19.f();
-          }
-          if (touches) {
-            try {
-              anim.cancel();
-            } catch (_unused) {}
+          var frame = _step18.value;
+          for (var _i7 = 0, _Object$entries3 = Object.entries(tfUpdates); _i7 < _Object$entries3.length; _i7++) {
+            var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i7], 2),
+              _key2 = _Object$entries3$_i[0],
+              _value = _Object$entries3$_i[1];
+            frame.tfMap[_key2] = _value;
           }
         }
       } catch (err) {
@@ -901,6 +887,17 @@ var AnimationManager = /*#__PURE__*/function () {
       } finally {
         _iterator18.f();
       }
+      for (var _i6 = 0, _Object$entries2 = Object.entries(tfUpdates); _i6 < _Object$entries2.length; _i6++) {
+        var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i6], 2),
+          key = _Object$entries2$_i[0],
+          value = _Object$entries2$_i[1];
+        tmodel.tfMap[key] = value;
+        tmodel.val(key, value);
+        tmodel.actualValues[key] = value;
+      }
+      this.deleteAnimation(tmodel);
+      this.animate(tmodel, batch, AnimationUtil.getAnimationHooks());
+      return true;
     }
   }]);
 }();

package/build/AnimationUtil.js

@@ -349,18 +349,24 @@ var AnimationUtil = /*#__PURE__*/function () {
   }, {
     key: "getValueFromAnim",
     value: function getValueFromAnim(record) {
-      var _anim$effect, _anim$effect$getCompu, _right$segmentSteps, _ref3, _right$valuePointer2, _ref4, _right$cycle2;
-      var originalKey = record.originalKey,
-        anim = record.anim,
-        frames = record.frames;
-      if (!frames) {
+      var _record$anim$effect, _record$anim$effect$g;
+      var ct = (_record$anim$effect = record.anim.effect) === null || _record$anim$effect === void 0 || (_record$anim$effect$g = _record$anim$effect.getComputedTiming) === null || _record$anim$effect$g === void 0 ? void 0 : _record$anim$effect$g.call(_record$anim$effect);
+      if (!ct) {
         return;
       }
-      var ct = (_anim$effect = anim.effect) === null || _anim$effect === void 0 || (_anim$effect$getCompu = _anim$effect.getComputedTiming) === null || _anim$effect$getCompu === void 0 ? void 0 : _anim$effect$getCompu.call(_anim$effect);
-      if (!ct) {
+      var progress = TUtil.isDefined(ct.progress) ? TUtil.limit(ct.progress, 0, 1) : 1;
+      return AnimationUtil.getValueFromFrames(record, progress);
+    }
+  }, {
+    key: "getValueFromFrames",
+    value: function getValueFromFrames(record, progress) {
+      var _right$segmentSteps, _ref3, _right$valuePointer2, _ref4, _right$cycle2;
+      var originalKey = record.originalKey,
+        frames = record.frames;
+      if (!frames || frames.length < 2) {
         return;
       }
-      var p = TUtil.isDefined(ct.progress) ? TUtil.limit(ct.progress, 0, 1) : 1;
+      var p = TUtil.limit(progress, 0, 1);
       var last = frames.length - 1;
       var framePointer = 0;
       if (p <= frames[0].offset) {
@@ -407,7 +413,6 @@ var AnimationUtil = /*#__PURE__*/function () {
       var stepOffset = right.stepOffset || 0;
       var segmentSteps = (_right$segmentSteps = right.segmentSteps) !== null && _right$segmentSteps !== void 0 ? _right$segmentSteps : stepOffset + remainingSteps;
       var step = TUtil.limit(stepOffset + localStep, 0, segmentSteps);
-      var status = right.done ? "finished" : "playing";
       return {
         value: value,
         step: step,
@@ -416,7 +421,7 @@ var AnimationUtil = /*#__PURE__*/function () {
         cycle: (_ref4 = (_right$cycle2 = right.cycle) !== null && _right$cycle2 !== void 0 ? _right$cycle2 : left.cycle) !== null && _ref4 !== void 0 ? _ref4 : 0,
         from: from,
         to: to,
-        status: status
+        status: right.done ? "finished" : "playing"
       };
     }
   }, {

package/build/BaseModel.js

@@ -1118,6 +1118,11 @@ var BaseModel = /*#__PURE__*/function () {
       this.animatingMap.set(key, true);
       (_this$getParent8 = this.getParent()) === null || _this$getParent8 === void 0 || _this$getParent8.addToAnimatingChildren(this);
     }
+  }, {
+    key: "getAnimatingTargets",
+    value: function getAnimatingTargets() {
+      return this.animatingMap ? _toConsumableArray(this.animatingMap.keys()) : [];
+    }
   }, {
     key: "isKeyAnimating",
     value: function isKeyAnimating(key) {

package/build/LocationManager.js

@@ -23,9 +23,8 @@ import { TargetUtil } from "./TargetUtil.js";
 import { TargetData } from "./TargetData.js";
 import { TModelUtil } from "./TModelUtil.js";
 import { ScheduleUtil } from "./ScheduleUtil.js";
-import { AnimationUtil } from "./AnimationUtil.js";
 import { TargetExecutor } from "./TargetExecutor.js";
-import { getTargetManager, tRoot, getEvents } from "./App.js";
+import { getTargetManager, tRoot, getEvents, getAnimationManager } from "./App.js";
 
 /*
  * It calculates the locations and dimensions of all objects and triggers the calculation of all targets. 
@@ -247,8 +246,8 @@ var LocationManager = /*#__PURE__*/function () {
                   viewport.setLocation();
                   child.markLayoutDirty('overflow');
                 }
-                var prevX = child.actualValues.x;
-                var prevY = child.actualValues.y;
+                var prevX = Math.floor(child.actualValues.x);
+                var prevY = Math.floor(child.actualValues.y);
                 if (child.isIncluded()) {
                   _this.calculateTargets(child);
                 }
@@ -626,20 +625,17 @@ var LocationManager = /*#__PURE__*/function () {
     key: "fixLocation",
     value: function fixLocation(tmodel, prevX, prevY) {
       if (tmodel.hasValidAnimation()) {
-        var keysToSnap = [];
-        var valuesToSnap = [];
-        var xChanged = tmodel.actualValues.x !== prevX;
-        var yChanged = tmodel.actualValues.y !== prevY;
+        var xChanged = Math.floor(tmodel.actualValues.x) !== prevX;
+        var yChanged = Math.floor(tmodel.actualValues.y) !== prevY;
+        var autoTfUpdates = {};
         if (xChanged && tmodel.getTargetStatus(tmodel.allTargetMap['x']) !== 'updating') {
-          keysToSnap.push('x');
-          valuesToSnap.push(tmodel.val('x'));
+          autoTfUpdates.x = tmodel.actualValues.x;
         }
         if (yChanged && tmodel.getTargetStatus(tmodel.allTargetMap['y']) !== 'updating') {
-          keysToSnap.push('y');
-          valuesToSnap.push(tmodel.val('y'));
+          autoTfUpdates.y = tmodel.actualValues.y;
         }
-        if (keysToSnap.length > 0) {
-          AnimationUtil.overrideAnimatedKeyWithSnap(tmodel, keysToSnap, valuesToSnap);
+        if (Object.keys(autoTfUpdates).length) {
+          getAnimationManager().rebaseAutoLayoutTransform(tmodel, autoTfUpdates);
           return;
         }
       }

package/build/TModel.js

@@ -571,11 +571,17 @@ var TModel = /*#__PURE__*/function (_BaseModel) {
     value: function debug() {
       var _this6 = this;
       return [{
+        oid: this.oid
+      }, {
         visible: this.isVisible()
       }, {
         visibilityStatus: this.visibilityStatus
       }, {
         hasDom: this.hasDom()
+      }, {
+        shouldCalculateChildren: this.shouldCalculateChildren()
+      }, {
+        dirtyLayout: this.getDirtyLayout()
       }, {
         x: this.getX()
       }, {