targetj 1.0.255 → 1.0.257

package/build/AnimationUtil.js

@@ -97,6 +97,7 @@ var AnimationUtil = /*#__PURE__*/function () {
       var batch = {
         frames: frames,
         keyMap: keyMap,
+        snap: true,
         totalDuration: 1
       };
       getAnimationManager().animate(tmodel, batch, AnimationUtil.getAnimationHooks());
@@ -320,12 +321,36 @@ var AnimationUtil = /*#__PURE__*/function () {
         step = result.step,
         steps = result.steps,
         cycle = result.cycle,
-        valuePointer = result.valuePointer;
+        valuePointer = result.valuePointer,
+        from = result.from,
+        to = result.to,
+        interval = result.interval,
+        easing = result.easing;
       getAnimationManager().setAt(tmodel, cleanKey, value);
       tmodel.val(originalKey, value);
       var targetValue = tmodel.targetValues[originalKey];
       if (targetValue) {
-        if (TUtil.isDefined(step) && TUtil.isDefined(steps) && steps > 0) {
+        var _targetValue$valueLis;
+        if ((_targetValue$valueLis = targetValue.valueList) !== null && _targetValue$valueLis !== void 0 && _targetValue$valueLis.length) {
+          AnimationUtil.syncListTargetSegment(targetValue, result);
+        } else {
+          if (TUtil.isDefined(from)) {
+            targetValue.initialValue = from;
+          }
+          if (TUtil.isDefined(to)) {
+            targetValue.value = to;
+          }
+          if (TUtil.isDefined(steps)) {
+            targetValue.steps = steps;
+          }
+          if (TUtil.isDefined(interval)) {
+            targetValue.interval = interval;
+          }
+          if (TUtil.isDefined(easing)) {
+            targetValue.easing = easing;
+          }
+        }
+        if (TUtil.isDefined(step)) {
           targetValue.step = step;
         }
         if (TUtil.isDefined(valuePointer)) {
@@ -334,6 +359,7 @@ var AnimationUtil = /*#__PURE__*/function () {
         if (TUtil.isDefined(cycle)) {
           targetValue.cycle = cycle;
         }
+        targetValue.lastUpdate = TUtil.now();
         tmodel.setActual(originalKey, value);
         var fireKey = "".concat(cycle, ":").concat(valuePointer, ":").concat(step);
         if (record.needsFireOnStep && step > 0 && steps > 0 && record.lastFireOnStepKey !== fireKey) {
@@ -403,6 +429,8 @@ var AnimationUtil = /*#__PURE__*/function () {
           steps: right.segmentSteps,
           from: from,
           to: to,
+          interval: right.interval,
+          easing: right.easing,
           valuePointer: (_ref = (_right$valuePointer = right.valuePointer) !== null && _right$valuePointer !== void 0 ? _right$valuePointer : left.valuePointer) !== null && _ref !== void 0 ? _ref : 0,
           cycle: (_ref2 = (_right$cycle = right.cycle) !== null && _right$cycle !== void 0 ? _right$cycle : left.cycle) !== null && _ref2 !== void 0 ? _ref2 : 0,
           status: right.done ? "finished" : "playing"
@@ -417,10 +445,12 @@ var AnimationUtil = /*#__PURE__*/function () {
         value: value,
         step: step,
         steps: segmentSteps,
-        valuePointer: (_ref3 = (_right$valuePointer2 = right.valuePointer) !== null && _right$valuePointer2 !== void 0 ? _right$valuePointer2 : left.valuePointer) !== null && _ref3 !== void 0 ? _ref3 : 0,
-        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,
+        interval: right.interval,
+        easing: right.easing,
+        valuePointer: (_ref3 = (_right$valuePointer2 = right.valuePointer) !== null && _right$valuePointer2 !== void 0 ? _right$valuePointer2 : left.valuePointer) !== null && _ref3 !== void 0 ? _ref3 : 0,
+        cycle: (_ref4 = (_right$cycle2 = right.cycle) !== null && _right$cycle2 !== void 0 ? _right$cycle2 : left.cycle) !== null && _ref4 !== void 0 ? _ref4 : 0,
         status: right.done ? "finished" : "playing"
       };
     }
@@ -577,6 +607,29 @@ var AnimationUtil = /*#__PURE__*/function () {
       })))) : 0;
       return removed;
     }
+  }, {
+    key: "syncListTargetSegment",
+    value: function syncListTargetSegment(targetValue, result) {
+      var _targetValue$valueLis2, _ref5, _result$valuePointer, _targetValue$stepList, _targetValue$interval, _targetValue$easingLi;
+      if (!(targetValue !== null && targetValue !== void 0 && (_targetValue$valueLis2 = targetValue.valueList) !== null && _targetValue$valueLis2 !== void 0 && _targetValue$valueLis2.length)) {
+        return;
+      }
+      var maxPointer = targetValue.valueList.length - 1;
+      var pointer = TUtil.limit((_ref5 = (_result$valuePointer = result.valuePointer) !== null && _result$valuePointer !== void 0 ? _result$valuePointer : targetValue.valuePointer) !== null && _ref5 !== void 0 ? _ref5 : 1, 1, maxPointer);
+      var segmentIndex = pointer - 1;
+      targetValue.valuePointer = pointer;
+      targetValue.initialValue = targetValue.valueList[segmentIndex];
+      targetValue.value = targetValue.valueList[pointer];
+      if ((_targetValue$stepList = targetValue.stepList) !== null && _targetValue$stepList !== void 0 && _targetValue$stepList.length) {
+        targetValue.steps = targetValue.stepList[segmentIndex % targetValue.stepList.length];
+      }
+      if ((_targetValue$interval = targetValue.intervalList) !== null && _targetValue$interval !== void 0 && _targetValue$interval.length) {
+        targetValue.interval = targetValue.intervalList[segmentIndex % targetValue.intervalList.length];
+      }
+      if ((_targetValue$easingLi = targetValue.easingList) !== null && _targetValue$easingLi !== void 0 && _targetValue$easingLi.length) {
+        targetValue.easing = targetValue.easingList[segmentIndex % targetValue.easingList.length];
+      }
+    }
   }, {
     key: "handleWebAnimationAPI",
     value: function handleWebAnimationAPI(tmodel, cleanKey, key, targetValue, from, to, valuePointer, step, steps, interval, timeShift) {
@@ -631,7 +684,7 @@ var AnimationUtil = /*#__PURE__*/function () {
         var cycle = (_targetValue$cycle = targetValue.cycle) !== null && _targetValue$cycle !== void 0 ? _targetValue$cycle : 0;
         var pointer = valuePointer;
         if (!skipStartFrame) {
-          var _ref5, _targetValue$cycle2;
+          var _ref6, _targetValue$cycle2;
           var frame0 = getFrameAtTime(0);
           setFrameValue(frame0, from);
           frame0.keyMeta.set(cleanKey, {
@@ -639,7 +692,7 @@ var AnimationUtil = /*#__PURE__*/function () {
             segmentSteps: steps || targetValue.steps || 0,
             interval: interval || targetValue.interval || 8,
             stepOffset: step || 0,
-            valuePointer: (_ref5 = valuePointer !== null && valuePointer !== void 0 ? valuePointer : targetValue.valuePointer) !== null && _ref5 !== void 0 ? _ref5 : 1,
+            valuePointer: (_ref6 = valuePointer !== null && valuePointer !== void 0 ? valuePointer : targetValue.valuePointer) !== null && _ref6 !== void 0 ? _ref6 : 1,
             cycle: (_targetValue$cycle2 = targetValue.cycle) !== null && _targetValue$cycle2 !== void 0 ? _targetValue$cycle2 : 0
           });
         }

package/build/App.js

@@ -15,6 +15,7 @@ import { EventListener } from "./EventListener.js";
 import { LoadingManager } from "./LoadingManager.js";
 import { LocationManager } from "./LocationManager.js";
 import { PageManager } from "./PageManager.js";
+import { StateManager } from "./StateManager.js";
 import { TModelManager } from "./TModelManager.js";
 import { RunScheduler } from "./RunScheduler.js";
 import { TargetManager } from "./TargetManager.js";
@@ -23,6 +24,7 @@ import { AnimationManager } from "./AnimationManager.js";
 import { TUtil } from "./TUtil.js";
 import { DomInit } from "./DomInit.js";
 import { SearchUtil } from "./SearchUtil.js";
+import { TModelUtil } from "./TModelUtil.js";
 var tApp;
 var queuedAppCalls = [];
 var AppFn = function AppFn() {
@@ -35,6 +37,7 @@ var AppFn = function AppFn() {
     my.$window = new $Dom(window);
     my.loader = new LoadingManager();
     my.pager = new PageManager();
+    my.stateManager = new StateManager();
     my.events = new EventListener();
     my.locationManager = new LocationManager();
     my.targetManager = new TargetManager();
@@ -71,9 +74,9 @@ var AppFn = function AppFn() {
           }
         }
       });
-      tmodel.$dom = $Dom.query('#tgjs-root') ? new $Dom('#tgjs-root') : new $Dom('body');
+      tmodel.$dom = TModelUtil.getRootDom();
       if (tmodel.$dom.getTagName() !== 'body') {
-        tmodel.$dom.attr('data-tjno-slot', 'true');
+        tmodel.$dom.attr('data-tj-no-slot', 'true');
       }
       tmodel.val('screenWidth', $Dom.getScreenWidth());
       tmodel.val('screenHeight', $Dom.getScreenHeight());
@@ -282,53 +285,57 @@ var getPager = function getPager() {
   var _tApp5;
   return (_tApp5 = tApp) === null || _tApp5 === void 0 ? void 0 : _tApp5.pager;
 };
-var getLoader = function getLoader() {
+var state = function state() {
   var _tApp6;
-  return (_tApp6 = tApp) === null || _tApp6 === void 0 ? void 0 : _tApp6.loader;
+  return (_tApp6 = tApp) === null || _tApp6 === void 0 ? void 0 : _tApp6.stateManager;
 };
-var fetch = function fetch(tmodel, url, query, cacheId) {
+var getLoader = function getLoader() {
   var _tApp7;
-  return (_tApp7 = tApp) === null || _tApp7 === void 0 || (_tApp7 = _tApp7.loader) === null || _tApp7 === void 0 ? void 0 : _tApp7.fetch(tmodel, url, query, cacheId);
+  return (_tApp7 = tApp) === null || _tApp7 === void 0 ? void 0 : _tApp7.loader;
 };
-var fetchImage = function fetchImage(tmodel, src, cacheId) {
+var fetch = function fetch(tmodel, url, query, cacheId) {
   var _tApp8;
-  return (_tApp8 = tApp) === null || _tApp8 === void 0 || (_tApp8 = _tApp8.loader) === null || _tApp8 === void 0 ? void 0 : _tApp8.fetchImage(tmodel, src, cacheId);
+  return (_tApp8 = tApp) === null || _tApp8 === void 0 || (_tApp8 = _tApp8.loader) === null || _tApp8 === void 0 ? void 0 : _tApp8.fetch(tmodel, url, query, cacheId);
 };
-var getManager = function getManager() {
+var fetchImage = function fetchImage(tmodel, src, cacheId) {
   var _tApp9;
-  return (_tApp9 = tApp) === null || _tApp9 === void 0 ? void 0 : _tApp9.manager;
+  return (_tApp9 = tApp) === null || _tApp9 === void 0 || (_tApp9 = _tApp9.loader) === null || _tApp9 === void 0 ? void 0 : _tApp9.fetchImage(tmodel, src, cacheId);
 };
-var getTargetManager = function getTargetManager() {
+var getManager = function getManager() {
   var _tApp10;
-  return (_tApp10 = tApp) === null || _tApp10 === void 0 ? void 0 : _tApp10.targetManager;
+  return (_tApp10 = tApp) === null || _tApp10 === void 0 ? void 0 : _tApp10.manager;
 };
-var getAnimationManager = function getAnimationManager() {
+var getTargetManager = function getTargetManager() {
   var _tApp11;
-  return (_tApp11 = tApp) === null || _tApp11 === void 0 ? void 0 : _tApp11.animationManager;
+  return (_tApp11 = tApp) === null || _tApp11 === void 0 ? void 0 : _tApp11.targetManager;
 };
-var getRunScheduler = function getRunScheduler() {
+var getAnimationManager = function getAnimationManager() {
   var _tApp12;
-  return (_tApp12 = tApp) === null || _tApp12 === void 0 ? void 0 : _tApp12.runScheduler;
+  return (_tApp12 = tApp) === null || _tApp12 === void 0 ? void 0 : _tApp12.animationManager;
 };
-var getLocationManager = function getLocationManager() {
+var getRunScheduler = function getRunScheduler() {
   var _tApp13;
-  return (_tApp13 = tApp) === null || _tApp13 === void 0 ? void 0 : _tApp13.locationManager;
+  return (_tApp13 = tApp) === null || _tApp13 === void 0 ? void 0 : _tApp13.runScheduler;
+};
+var getLocationManager = function getLocationManager() {
+  var _tApp14;
+  return (_tApp14 = tApp) === null || _tApp14 === void 0 ? void 0 : _tApp14.locationManager;
 };
 var getScreenWidth = function getScreenWidth() {
-  var _tApp$tRoot$val, _tApp14;
-  return (_tApp$tRoot$val = (_tApp14 = tApp) === null || _tApp14 === void 0 || (_tApp14 = _tApp14.tRoot) === null || _tApp14 === void 0 ? void 0 : _tApp14.val('screenWidth')) !== null && _tApp$tRoot$val !== void 0 ? _tApp$tRoot$val : 0;
+  var _tApp$tRoot$val, _tApp15;
+  return (_tApp$tRoot$val = (_tApp15 = tApp) === null || _tApp15 === void 0 || (_tApp15 = _tApp15.tRoot) === null || _tApp15 === void 0 ? void 0 : _tApp15.val('screenWidth')) !== null && _tApp$tRoot$val !== void 0 ? _tApp$tRoot$val : 0;
 };
 var getScreenHeight = function getScreenHeight() {
-  var _tApp$tRoot$val2, _tApp15;
-  return (_tApp$tRoot$val2 = (_tApp15 = tApp) === null || _tApp15 === void 0 || (_tApp15 = _tApp15.tRoot) === null || _tApp15 === void 0 ? void 0 : _tApp15.val('screenHeight')) !== null && _tApp$tRoot$val2 !== void 0 ? _tApp$tRoot$val2 : 0;
+  var _tApp$tRoot$val2, _tApp16;
+  return (_tApp$tRoot$val2 = (_tApp16 = tApp) === null || _tApp16 === void 0 || (_tApp16 = _tApp16.tRoot) === null || _tApp16 === void 0 ? void 0 : _tApp16.val('screenHeight')) !== null && _tApp$tRoot$val2 !== void 0 ? _tApp$tRoot$val2 : 0;
 };
 var getVisibles = function getVisibles() {
-  var _tApp16;
-  return (_tApp16 = tApp) === null || _tApp16 === void 0 || (_tApp16 = _tApp16.manager) === null || _tApp16 === void 0 ? void 0 : _tApp16.getVisibles();
+  var _tApp17;
+  return (_tApp17 = tApp) === null || _tApp17 === void 0 || (_tApp17 = _tApp17.manager) === null || _tApp17 === void 0 ? void 0 : _tApp17.getVisibles();
 };
 var getResizeLastUpdate = function getResizeLastUpdate() {
-  var _tApp17;
-  return (_tApp17 = tApp) === null || _tApp17 === void 0 ? void 0 : _tApp17.resizeLastUpdate;
+  var _tApp18;
+  return (_tApp18 = tApp) === null || _tApp18 === void 0 ? void 0 : _tApp18.resizeLastUpdate;
 };
 var getTModelById = function getTModelById(id) {
   return App.tmodelIdMap[id];
@@ -354,4 +361,4 @@ if (typeof document !== "undefined") {
     runApp();
   }
 }
-export { tApp, App, tRoot, isRunning, getEvents, getPager, getLoader, fetch, fetchImage, getManager, getTargetManager, getAnimationManager, getRunScheduler, getLocationManager, getScreenWidth, getScreenHeight, getVisibles, getResizeLastUpdate, getTModelById, getDomTModelById };
+export { tApp, App, tRoot, isRunning, getEvents, getPager, state, getLoader, fetch, fetchImage, getManager, getTargetManager, getAnimationManager, getRunScheduler, getLocationManager, getScreenWidth, getScreenHeight, getVisibles, getResizeLastUpdate, getTModelById, getDomTModelById };

package/build/BaseModel.js

@@ -30,11 +30,15 @@ import { $Dom } from "./$Dom.js";
 var BaseModel = /*#__PURE__*/function () {
   function BaseModel(type, targets, oid) {
     var _targets;
+    var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     _classCallCheck(this, BaseModel);
     if (_typeof(type) === 'object' && typeof targets === 'undefined') {
       targets = type;
       type = "";
     }
+    this.restoringRuntime = options.restoringRuntime === true;
+    this.restoredUsesExistingDom = options.usesExistingDom === true;
+    this.targetDefinitions = TUtil.cloneTargetDefinition(targets);
     this.targets = Object.assign({}, targets);
     oid = oid || this.targets.id;
     if (!TUtil.isDefined(oid)) {
@@ -211,7 +215,7 @@ var BaseModel = /*#__PURE__*/function () {
       });
       this.functionTargetNames = [];
       this.allTargetMap = {};
-      if (TUtil.isDefined(this.originalId) && getDomTModelById(this.originalId)) {
+      if (!this.restoringRuntime && TUtil.isDefined(this.originalId) && getDomTModelById(this.originalId)) {
         TUtil.mergeTargets(getDomTModelById(this.originalId), this);
         this.toDiscard = true;
         return;
@@ -225,7 +229,8 @@ var BaseModel = /*#__PURE__*/function () {
       }).map(function (key) {
         return key.startsWith('_') ? key.slice(1) : key;
       });
-      var domExists = $Dom.query("#".concat(this.oid)) || this.originalTargetNames.indexOf('$dom') >= 0;
+      var hasDomTarget = this.originalTargetNames.includes('$dom');
+      var domExists = this.restoringRuntime ? this.restoredUsesExistingDom || hasDomTarget : Boolean($Dom.query("#".concat(this.oid)) || hasDomTarget);
       if (!domExists && !this.excludeDefaultStyling()) {
         Object.entries(TargetData.defaultTargetStyles).forEach(function (_ref) {
           var _ref2 = _slicedToArray(_ref, 2),
@@ -235,25 +240,25 @@ var BaseModel = /*#__PURE__*/function () {
             _this.targets[key] = value;
           }
         });
-        if (this.targets['canHaveDom'] !== false && !TUtil.isDefined(this.targets['domHolder'])) {
-          this.targets['domHolder'] = true;
+        if (this.targets.canHaveDom !== false && !TUtil.isDefined(this.targets.domHolder)) {
+          this.targets.domHolder = true;
         }
       } else if (domExists) {
-        this.targets['domIsland'] = true;
-        if (!TUtil.isDefined(this.targets['reuseDomDefinition'])) {
-          this.targets['reuseDomDefinition'] = true;
-          this.targets['domHolder'] = true;
-          if (!TUtil.isDefined(this.targets['excludeXYCalc'])) {
-            this.targets['excludeXYCalc'] = true;
+        this.targets.domIsland = true;
+        if (!TUtil.isDefined(this.targets.reuseDomDefinition)) {
+          this.targets.reuseDomDefinition = true;
+          this.targets.domHolder = true;
+          if (!TUtil.isDefined(this.targets.excludeXYCalc)) {
+            this.targets.excludeXYCalc = true;
           }
-          if (!TUtil.isDefined(this.targets['x'])) {
-            this.targets['excludeX'] = true;
+          if (!TUtil.isDefined(this.targets.x)) {
+            this.targets.excludeX = true;
           }
-          if (!TUtil.isDefined(this.targets['y'])) {
-            this.targets['excludeY'] = true;
+          if (!TUtil.isDefined(this.targets.y)) {
+            this.targets.excludeY = true;
           }
-          if (!TUtil.isDefined(this.targets['position'])) {
-            this.targets['position'] = 'relative';
+          if (!TUtil.isDefined(this.targets.position)) {
+            this.targets.position = 'relative';
           }
         }
       }
@@ -434,6 +439,7 @@ var BaseModel = /*#__PURE__*/function () {
   }, {
     key: "removeTarget",
     value: function removeTarget(key) {
+      delete this.targetDefinitions[key];
       delete this.targets[key];
       this.removeFromActiveTargets(key);
       this.removeFromUpdatingTargets(key);
@@ -449,6 +455,11 @@ var BaseModel = /*#__PURE__*/function () {
     value: function addTargets(targets) {
       var _this2 = this,
         _getRunScheduler;
+      var definitions = TUtil.cloneTargetDefinition(targets);
+      for (var _i = 0, _Object$keys = Object.keys(definitions); _i < _Object$keys.length; _i++) {
+        var key = _Object$keys[_i];
+        this.targetDefinitions[key] = definitions[key];
+      }
       Object.keys(targets).forEach(function (key) {
         _this2.targets[key] = targets[key];
         _this2.removeFromUpdatingTargets(key);
@@ -461,7 +472,7 @@ var BaseModel = /*#__PURE__*/function () {
       if (this.hasDom()) {
         getEvents().attachEvents([this]);
       }
-      (_getRunScheduler = getRunScheduler()) === null || _getRunScheduler === void 0 || _getRunScheduler.schedule(1, 'addTargets-' + this.oid);
+      (_getRunScheduler = getRunScheduler()) === null || _getRunScheduler === void 0 || _getRunScheduler.schedule(1, "addTargets-".concat(this.oid));
     }
   }, {
     key: "getTargetStepPercent",
@@ -963,25 +974,15 @@ var BaseModel = /*#__PURE__*/function () {
   }, {
     key: "cancelAnimation",
     value: function cancelAnimation() {
-      if (!this.hasAnimatingTargets()) {
-        return;
-      }
-      var _iterator2 = _createForOfIteratorHelper(this.animatingMap),
-        _step2;
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _step2$value = _slicedToArray(_step2.value, 1),
-            key = _step2$value[0];
-          if (this.targetValues[key]) {
-            this.addTargetToStatusList(key);
-          }
-        }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
-      }
-      getAnimationManager().deleteAnimation(this);
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var _options$mode = options.mode,
+        mode = _options$mode === void 0 ? "hold" : _options$mode,
+        _options$commitStyle = options.commitStyle,
+        commitStyle = _options$commitStyle === void 0 ? true : _options$commitStyle;
+      return getAnimationManager().cancelTModelAnimation(this, {
+        mode: mode,
+        commitStyle: commitStyle
+      });
     }
   }, {
     key: "hasTargetUpdates",
@@ -1046,39 +1047,49 @@ var BaseModel = /*#__PURE__*/function () {
     value: function hasUpdatingImperativeTargets(originalTargetName) {
       var _this$updatingTargetL;
       var updatingList = [].concat(_toConsumableArray((_this$updatingTargetL = this.updatingTargetList) !== null && _this$updatingTargetL !== void 0 ? _this$updatingTargetL : []), _toConsumableArray(this.hasAnimatingTargets() ? _toConsumableArray(this.animatingMap.keys()) : []));
-      var _iterator3 = _createForOfIteratorHelper(updatingList),
-        _step3;
+      var _iterator2 = _createForOfIteratorHelper(updatingList),
+        _step2;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var target = _step3.value;
-          if (this.isTargetImperative(target) && (this.targetValues[target].originalTargetName === originalTargetName || TargetUtil.getTargetName(target) === originalTargetName)) {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var _this$targetValues$ta;
+          var target = _step2.value;
+          if (!this.isTargetImperative(target)) {
+            continue;
+          }
+          if (((_this$targetValues$ta = this.targetValues[target]) === null || _this$targetValues$ta === void 0 ? void 0 : _this$targetValues$ta.originalTargetName) === originalTargetName) {
             return true;
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator3.f();
+        _iterator2.f();
       }
       return false;
     }
   }, {
     key: "getUpdatingImperativeTargets",
     value: function getUpdatingImperativeTargets(originalTargetName) {
+      var _this$updatingTargetL2;
+      var updatingList = [].concat(_toConsumableArray((_this$updatingTargetL2 = this.updatingTargetList) !== null && _this$updatingTargetL2 !== void 0 ? _this$updatingTargetL2 : []), _toConsumableArray(this.hasAnimatingTargets() ? _toConsumableArray(this.animatingMap.keys()) : []));
       var targets = [];
-      var _iterator4 = _createForOfIteratorHelper(this.updatingTargetList),
-        _step4;
+      var _iterator3 = _createForOfIteratorHelper(updatingList),
+        _step3;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var target = _step4.value;
-          if (this.isTargetImperative(target) && this.targetValues[target].originalTargetName === originalTargetName) {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _this$targetValues$ta2;
+          var target = _step3.value;
+          if (!this.isTargetImperative(target)) {
+            continue;
+          }
+          if (((_this$targetValues$ta2 = this.targetValues[target]) === null || _this$targetValues$ta2 === void 0 ? void 0 : _this$targetValues$ta2.originalTargetName) === originalTargetName) {
             targets.push(target);
           }
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator4.f();
+        _iterator3.f();
       }
       return targets;
     }

package/build/EventListener.js

@@ -59,6 +59,7 @@ var EventListener = /*#__PURE__*/function () {
     this.currentOriginalEvent = undefined;
     this.currentKey = '';
     this.currentHandlers = {
+      gestureTarget: null,
       touch: null,
       click: null,
       scrollLeft: null,
@@ -71,6 +72,7 @@ var EventListener = /*#__PURE__*/function () {
       leave: null,
       enter: null,
       start: null,
+      endCandidate: null,
       end: null,
       hover: null
     };
@@ -267,10 +269,21 @@ var EventListener = /*#__PURE__*/function () {
     value: function findEventHandlers(_ref) {
       var tmodel = _ref.tmodel,
         eventType = _ref.eventType;
-      var clickHandler, swipeHandler, scrollLeftHandler, scrollTopHandler, pinchHandler, focusHandler, enterHandler, leaveHandler;
+      var clickHandler;
+      var swipeHandler;
+      var scrollLeftHandler;
+      var scrollTopHandler;
+      var pinchHandler;
+      var focusHandler;
+      var enterHandler;
+      var leaveHandler;
+      var startHandler;
+      var endHandler;
       if (tmodel) {
         clickHandler = SearchUtil.findFirstClickHandler(tmodel);
         swipeHandler = SearchUtil.findFirstSwipeHandler(tmodel);
+        startHandler = SearchUtil.findFirstStartHandler(tmodel);
+        endHandler = SearchUtil.findFirstEndHandler(tmodel);
         enterHandler = SearchUtil.findFirstEnterHandler(tmodel);
         leaveHandler = SearchUtil.findFirstLeaveHandler(tmodel);
         scrollLeftHandler = SearchUtil.findFirstScrollLeftHandler(tmodel, eventType);
@@ -288,6 +301,8 @@ var EventListener = /*#__PURE__*/function () {
       this.currentHandlers.hover = tmodel !== null && tmodel !== void 0 && tmodel.canHandleEvent('onHover') ? tmodel : undefined;
       this.currentHandlers.click = clickHandler;
       this.currentHandlers.swipe = swipeHandler;
+      this.currentHandlers.start = startHandler;
+      this.currentHandlers.endCandidate = endHandler;
       this.currentHandlers.scrollLeft = scrollLeftHandler;
       this.currentHandlers.scrollTop = scrollTopHandler;
       this.currentHandlers.pinch = pinchHandler;
@@ -319,8 +334,10 @@ var EventListener = /*#__PURE__*/function () {
         this.findEventHandlers(lastEvent);
       }
       if (lastEvent.eventType === 'end') {
-        this.currentHandlers.end = this.currentHandlers.start;
+        this.currentHandlers.end = this.currentHandlers.endCandidate;
         this.currentHandlers.start = undefined;
+        this.currentHandlers.endCandidate = undefined;
+        this.currentHandlers.gestureTarget = undefined;
       }
       this.currentEventName = lastEvent.eventName;
       this.currentEventType = lastEvent.eventType;
@@ -331,6 +348,7 @@ var EventListener = /*#__PURE__*/function () {
       if (lastEvent.eventType === 'end' || lastEvent.eventType === 'click') {
         this.canFindHandlers = true;
       }
+      return lastEvent;
     }
   }, {
     key: "markCapturedEventDirty",
@@ -401,8 +419,8 @@ var EventListener = /*#__PURE__*/function () {
         rateLimit = eventItem.rateLimit;
       var now = TUtil.now();
       var tmodel;
-      if (eventType === 'move' && this.touchCount > 0 && this.currentHandlers.start) {
-        tmodel = this.currentHandlers.start;
+      if (eventType === 'move' && this.touchCount > 0 && this.currentHandlers.gestureTarget) {
+        tmodel = this.currentHandlers.gestureTarget;
       } else {
         tmodel = this.getTModelFromEvent(event);
       }
@@ -468,7 +486,7 @@ var EventListener = /*#__PURE__*/function () {
           this.start1 = this.getTouch(event, 1);
           this.cursor.x = this.start0.x;
           this.cursor.y = this.start0.y;
-          this.currentHandlers.start = tmodel;
+          this.currentHandlers.gestureTarget = tmodel;
           this.findEventHandlers(newEvent);
           this.canFindHandlers = false;
           this.swipeStartX = this.start0.x - ((_this$currentHandlers = (_this$currentHandlers2 = this.currentHandlers.swipe) === null || _this$currentHandlers2 === void 0 ? void 0 : _this$currentHandlers2.getX()) !== null && _this$currentHandlers !== void 0 ? _this$currentHandlers : 0);
@@ -851,7 +869,7 @@ var EventListener = /*#__PURE__*/function () {
   }, {
     key: "isSwipeEvent",
     value: function isSwipeEvent() {
-      return this.hasDelta() && this.touchCount === 1;
+      return this.isMoveEvent() && this.hasDelta() && this.touchCount === 1;
     }
   }, {
     key: "isScrollEvent",