targetj 1.0.207 → 1.0.209

package/Export.js

@@ -14,6 +14,7 @@ export * from "./build/BracketGenerator.js";
 export * from "./build/ColorUtil.js";
 export * from "./build/Easing.js";
 export * from "./build/TargetExecutor.js";
+export * from "./build/AnimationManager.js";
 
 import * as App from './build/App.js';
 import * as TModel from './build/TModel.js';
@@ -31,6 +32,7 @@ import * as BracketGenerator from './build/BracketGenerator.js';
 import * as ColorUtil from './build/ColorUtil.js';
 import * as Easing from './build/Easing.js';
 import * as TargetExecutor from './build/TargetExecutor.js';
+import * as AnimationManager from './build/AnimationManager.js';
 
 const TargetJS = {
   ...App,

package/build/AnimationManager.js

@@ -41,7 +41,7 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
     };
     this.recordMap = new Map();
     this.isShuttingDown = false;
-    this.toid = 'blank_1';
+    this.toid = 'ring_0';
   }
   return _createClass(AnimationManager, [{
     key: "getAt",
@@ -430,6 +430,15 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
       tmodel.finalRawFrame = undefined;
       tmodel.clearAnimatingMap();
     }
+  }, {
+    key: "cancelKey",
+    value: function cancelKey(tmodel, originalKey) {
+      var recId = this.getRecordId(tmodel, originalKey);
+      var rec = this.recordMap.get(recId);
+      if (rec) {
+        rec.canceled = true;
+      }
+    }
   }, {
     key: "cancelAll",
     value: function () {

package/build/EventListener.js

@@ -533,10 +533,14 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "getTModelFromEvent",
     value: function getTModelFromEvent(event) {
-      var _event$target;
-      var oid = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.id;
+      var _event$currentTarget;
+      var oid = (_event$currentTarget = event.currentTarget) === null || _event$currentTarget === void 0 ? void 0 : _event$currentTarget.id;
       if (!oid || !_App.tApp.manager.visibleOidMap[oid]) {
-        oid = _$Dom.$Dom.findNearestParentWithId(event.target);
+        var _event$target;
+        oid = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.id;
+        if (!oid || !_App.tApp.manager.visibleOidMap[oid]) {
+          oid = _$Dom.$Dom.findNearestParentWithId(event.target);
+        }
       }
       return _App.tApp.manager.visibleOidMap[oid];
     }

package/build/TModelUtil.js

@@ -370,10 +370,15 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
       }
       return base;
     }
+  }, {
+    key: "num",
+    value: function num(v, fallback) {
+      var n = Number(v);
+      return Number.isFinite(n) ? n : fallback;
+    }
   }, {
     key: "getTransformString",
     value: function getTransformString(values, transformOrderList) {
-      var _values$perspective;
       var processed = {};
       var transformMap = {};
       var hasExplicitTranslate = _TUtil.TUtil.isDefined(values.translateX) || _TUtil.TUtil.isDefined(values.translateY) || _TUtil.TUtil.isDefined(values.translateZ);
@@ -388,8 +393,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
           case 'translateY':
           case 'translateZ':
             if (values[key] !== null) {
-              var _values$key;
-              transformMap[key] = "".concat(key, "(").concat(Number((_values$key = values[key]) !== null && _values$key !== void 0 ? _values$key : 0), "px)");
+              transformMap[key] = "".concat(key, "(").concat(TModelUtil.num(values[key], 0), "px)");
               processed[key] = true;
             }
             break;
@@ -397,14 +401,13 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
           case 'y':
           case 'z':
             {
-              var _values$x, _values$y, _values$z;
               if (hasExplicitTranslate) {
                 processed.x = processed.y = processed.z = true;
                 break;
               }
-              var x = "".concat(Number((_values$x = values.x) !== null && _values$x !== void 0 ? _values$x : 0), "px");
-              var y = "".concat(Number((_values$y = values.y) !== null && _values$y !== void 0 ? _values$y : 0), "px");
-              var z = "".concat(Number((_values$z = values.z) !== null && _values$z !== void 0 ? _values$z : 0), "px");
+              var x = "".concat(TModelUtil.num(values.x, 0), "px");
+              var y = "".concat(TModelUtil.num(values.y, 0), "px");
+              var z = "".concat(TModelUtil.num(values.z, 0), "px");
               transformMap['translate3d'] = "translate3d(".concat(x, ", ").concat(y, ", ").concat(z, ")");
               processed.x = processed.y = processed.z = true;
               break;
@@ -420,12 +423,10 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
             {
               var has3D = _TUtil.TUtil.isDefined(values.rotate3DX) && _TUtil.TUtil.isDefined(values.rotate3DY) && _TUtil.TUtil.isDefined(values.rotate3DZ) && _TUtil.TUtil.isDefined(values.rotate3DAngle);
               if (has3D) {
-                var _values$rotate3DAngle;
-                transformMap['rotate3d'] = "rotate3d(".concat(values.rotate3DX, ", ").concat(values.rotate3DY, ", ").concat(values.rotate3DZ, ", ").concat(Number((_values$rotate3DAngle = values.rotate3DAngle) !== null && _values$rotate3DAngle !== void 0 ? _values$rotate3DAngle : 0), "deg)");
+                transformMap['rotate3d'] = "rotate3d(".concat(TModelUtil.num(values.rotate3DX, 0), ", ").concat(TModelUtil.num(values.rotate3DY, 0), ", ").concat(TModelUtil.num(values.rotate3DZ, 0), ", ").concat(TModelUtil.num(values.rotate3DAngle, 0), "deg)");
                 processed.rotate3DX = processed.rotate3DY = processed.rotate3DZ = processed.rotate3DAngle = true;
               } else if (values[key] !== null) {
-                var _values$key2;
-                transformMap[key] = "".concat(key, "(").concat(Number((_values$key2 = values[key]) !== null && _values$key2 !== void 0 ? _values$key2 : 0), "deg)");
+                transformMap[key] = "".concat(key, "(").concat(TModelUtil.num(values[key], 0), "deg)");
                 processed[key] = true;
               }
               break;
@@ -444,8 +445,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
                 transformMap['scale3d'] = "scale3d(".concat(Number((_values$scale3DX = values.scale3DX) !== null && _values$scale3DX !== void 0 ? _values$scale3DX : 1), ", ").concat(Number((_values$scale3DY = values.scale3DY) !== null && _values$scale3DY !== void 0 ? _values$scale3DY : 1), ", ").concat(Number((_values$scale3DZ = values.scale3DZ) !== null && _values$scale3DZ !== void 0 ? _values$scale3DZ : 1), ")");
                 processed.scale3DX = processed.scale3DY = processed.scale3DZ = true;
               } else {
-                var _values$key3;
-                transformMap[key] = "".concat(key, "(").concat(Number((_values$key3 = values[key]) !== null && _values$key3 !== void 0 ? _values$key3 : key === 'scale' ? 1 : 1), ")");
+                transformMap[key] = "".concat(key, "(").concat(TModelUtil.num(values[key], 1), ")");
                 processed[key] = true;
               }
               break;
@@ -459,14 +459,14 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
                 transformMap['skew'] = "skew(".concat(Number((_values$skewX = values.skewX) !== null && _values$skewX !== void 0 ? _values$skewX : 0), "deg, ").concat(Number((_values$skewY = values.skewY) !== null && _values$skewY !== void 0 ? _values$skewY : 0), "deg)");
                 processed.skewX = processed.skewY = true;
               } else if (values[key] !== null) {
-                var _values$key4;
-                transformMap[key] = "".concat(key, "(").concat(Number((_values$key4 = values[key]) !== null && _values$key4 !== void 0 ? _values$key4 : 0), "deg)");
+                var _values$key;
+                transformMap[key] = "".concat(key, "(").concat(Number((_values$key = values[key]) !== null && _values$key !== void 0 ? _values$key : 0), "deg)");
                 processed[key] = true;
               }
               break;
             }
           case 'perspective':
-            transformMap[key] = "perspective(".concat(Number((_values$perspective = values.perspective) !== null && _values$perspective !== void 0 ? _values$perspective : 0), "px)");
+            transformMap[key] = "perspective(".concat(TModelUtil.num(values.perspective, 0), "px)");
             processed.perspective = true;
             break;
         }

package/build/TargetExecutor.js

@@ -62,11 +62,16 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
   }, {
     key: "assignImperativeTargetValue",
     value: function assignImperativeTargetValue(tmodel, key, originalTargetName, originalTModel) {
+      var _tmodel$animatingMap;
       tmodel.targetValues[key] = tmodel.targetValues[key] || _TargetUtil.TargetUtil.emptyValue();
       var targetValue = tmodel.targetValues[key];
       targetValue.isImperative = true;
       targetValue.originalTargetName = originalTargetName;
       targetValue.originalTModel = originalTModel;
+      var isAnimating = (_tmodel$animatingMap = tmodel.animatingMap) === null || _tmodel$animatingMap === void 0 ? void 0 : _tmodel$animatingMap.has(key);
+      if (isAnimating && tmodel.getTargetSteps(key) > 0) {
+        (0, _App.getAnimationManager)().cancelKey(tmodel, key);
+      }
       return targetValue;
     }
   }, {
@@ -130,9 +135,7 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
       targetValue.executionFlag = true;
       tmodel.addToStyleTargetList(key, enforce);
       tmodel.setTargetMethodName(key, 'value');
-      if (!tmodel.isKeyAnimating(key)) {
-        tmodel.updateTargetStatus(key);
-      }
+      tmodel.updateTargetStatus(key);
       if (!_TargetData.TargetData.ignoreRerun[key] && tmodel.shouldScheduleRun(key)) {
         (0, _App.getRunScheduler)().schedule(30, 'updateTarget2-' + tmodel.oid + "-" + key);
       }

package/build/index.js

@@ -178,4 +178,15 @@ Object.keys(_TargetExecutor).forEach(function (key) {
       return _TargetExecutor[key];
     }
   });
+});
+var _AnimationManager = require("./AnimationManager.js");
+Object.keys(_AnimationManager).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _AnimationManager[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _AnimationManager[key];
+    }
+  });
 });