targetj 1.1.9 → 1.1.11

package/build/TModelUtil.js

@@ -1,7 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
@@ -495,11 +492,12 @@ var TModelUtil = /*#__PURE__*/function () {
   }, {
     key: "initStyleMaps",
     value: function initStyleMaps(tmodel) {
+      var _tmodel$allStyleTarge;
       tmodel.domHeightTimestamp = 0;
       tmodel.domWidthTimestamp = 0;
       tmodel.tfMap = {};
       tmodel.styleMap = {};
-      var _iterator2 = _createForOfIteratorHelper(tmodel.allStyleTargetMap),
+      var _iterator2 = _createForOfIteratorHelper((_tmodel$allStyleTarge = tmodel.allStyleTargetMap) !== null && _tmodel$allStyleTarge !== void 0 ? _tmodel$allStyleTarge : []),
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -531,44 +529,72 @@ var TModelUtil = /*#__PURE__*/function () {
   }, {
     key: "fixStyle",
     value: function fixStyle(tmodel) {
-      if (!tmodel.styleTargetMap || !tmodel.hasDom()) {
+      var _tmodel$$dom;
+      var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+        keys = _ref2.keys,
+        frame = _ref2.frame;
+      var commit = keys !== undefined || frame !== undefined;
+      if (!((_tmodel$$dom = tmodel.$dom) !== null && _tmodel$$dom !== void 0 && _tmodel$$dom.element)) {
+        return;
+      }
+      var styleValues;
+      if (frame) {
+        var _frame$styleMap, _frame$tfMap;
+        styleValues = new Map([].concat(_toConsumableArray(Object.entries((_frame$styleMap = frame.styleMap) !== null && _frame$styleMap !== void 0 ? _frame$styleMap : {})), _toConsumableArray(Object.entries((_frame$tfMap = frame.tfMap) !== null && _frame$tfMap !== void 0 ? _frame$tfMap : {}))));
+      } else {
+        var _tmodel$styleTargetMa, _tmodel$styleTargetMa2;
+        var styleKeys = keys ? _toConsumableArray(keys).map(function (key) {
+          return TargetUtil.getTargetName(key);
+        }) : _toConsumableArray((_tmodel$styleTargetMa = (_tmodel$styleTargetMa2 = tmodel.styleTargetMap) === null || _tmodel$styleTargetMa2 === void 0 ? void 0 : _tmodel$styleTargetMa2.keys()) !== null && _tmodel$styleTargetMa !== void 0 ? _tmodel$styleTargetMa : []);
+        styleValues = new Map(styleKeys.map(function (key) {
+          return [key, tmodel.val(key)];
+        }));
+      }
+      if (!styleValues.size) {
         return;
       }
       var transformUpdate = false;
-      for (var _i = 0, _arr = _toConsumableArray(tmodel.styleTargetMap); _i < _arr.length; _i++) {
-        var _arr$_i = _slicedToArray(_arr[_i], 1),
-          key = _arr$_i[0];
-        if (tmodel.isKeyAnimating(key)) {
-          continue;
-        }
-        if (TargetData.transformMap[key]) {
-          var value = TModelUtil.getTransformValue(tmodel, key);
-          if (tmodel.tfMap[key] !== value) {
-            tmodel.tfMap[key] = value;
-            transformUpdate = true;
+      var _iterator3 = _createForOfIteratorHelper(styleValues),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _step3$value = _slicedToArray(_step3.value, 2),
+            key = _step3$value[0],
+            value = _step3$value[1];
+          if (!commit && tmodel.isKeyAnimating(key)) {
+            continue;
           }
-        } else if (key === 'dim') {
-          var dim = tmodel.val('dim');
-          TModelUtil.applyDimensionStyle(tmodel, 'width', dim);
-          TModelUtil.applyDimensionStyle(tmodel, 'height', dim);
-        } else if (key === 'width' || key === 'height') {
-          TModelUtil.applyDimensionStyle(tmodel, key, tmodel.val(key));
-        } else if (TargetData.styleWithUnitMap[key]) {
-          if (TUtil.isDefined(tmodel.val(key)) && tmodel.styleMap[key] !== tmodel.val(key)) {
-            tmodel.$dom.style(key, TUtil.isNumber(tmodel.val(key)) ? "".concat(tmodel.val(key), "px") : tmodel.val(key));
-            tmodel.styleMap[key] = tmodel.val(key);
+          if (!TUtil.isDefined(value)) {
+            continue;
           }
-        } else {
-          if (TUtil.isDefined(tmodel.val(key)) && tmodel.styleMap[key] !== tmodel.val(key)) {
-            tmodel.$dom.style(key, "".concat(tmodel.val(key)));
-            tmodel.styleMap[key] = tmodel.val(key);
+          if (TargetData.transformMap[key]) {
+            var transformValue = frame ? value : TModelUtil.getTransformValue(tmodel, key);
+            if (TUtil.isDefined(transformValue) && (commit || tmodel.tfMap[key] !== transformValue)) {
+              tmodel.tfMap[key] = transformValue;
+              transformUpdate = true;
+            }
+          } else if (key === 'dim') {
+            TModelUtil.applyDimensionStyle(tmodel, 'width', value);
+            TModelUtil.applyDimensionStyle(tmodel, 'height', value);
+          } else if (key === 'width' || key === 'height') {
+            TModelUtil.applyDimensionStyle(tmodel, key, value);
+          } else if (commit || tmodel.styleMap[key] !== value) {
+            var cssValue = typeof value === 'number' && TargetData.styleWithUnitMap[key] ? "".concat(value, "px") : "".concat(value);
+            tmodel.$dom.style(key, cssValue);
+            tmodel.styleMap[key] = value;
           }
         }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
       }
       if (transformUpdate) {
         tmodel.$dom.transform(TModelUtil.getTransformString(tmodel, tmodel.tfMap));
       }
-      tmodel.styleTargetMap.clear();
+      if (!commit) {
+        tmodel.styleTargetMap.clear();
+      }
     }
   }, {
     key: "applyDimensionStyle",
@@ -625,51 +651,12 @@ var TModelUtil = /*#__PURE__*/function () {
   }, {
     key: "commitAnimatedStyles",
     value: function commitAnimatedStyles(tmodel, originalKeys) {
-      if (!tmodel.hasDom() || !(originalKeys !== null && originalKeys !== void 0 && originalKeys.size)) {
+      if (!(originalKeys !== null && originalKeys !== void 0 && originalKeys.size)) {
         return;
       }
-      var transformChanged = false;
-      var _iterator3 = _createForOfIteratorHelper(originalKeys),
-        _step3;
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var originalKey = _step3.value;
-          var key = TargetUtil.getTargetName(originalKey);
-          var value = tmodel.val(key);
-          if (!TUtil.isDefined(value)) {
-            continue;
-          }
-          if (TargetData.transformMap[key]) {
-            var transformValue = TModelUtil.getTransformValue(tmodel, key);
-            if (TUtil.isDefined(transformValue)) {
-              tmodel.tfMap[key] = transformValue;
-              transformChanged = true;
-            }
-            continue;
-          }
-          if (key === 'dim') {
-            TModelUtil.applyDimensionStyle(tmodel, 'width', value);
-            TModelUtil.applyDimensionStyle(tmodel, 'height', value);
-            continue;
-          }
-          if (key === 'width' || key === 'height') {
-            TModelUtil.applyDimensionStyle(tmodel, key, value);
-            continue;
-          }
-          var styleValue = typeof value === "number" && TargetData.styleWithUnitMap[key] ? "".concat(value, "px") : "".concat(value);
-          tmodel.styleMap[key] = value;
-          tmodel.$dom.style(key, styleValue);
-        }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
-      }
-      if (transformChanged) {
-        var transformValues = _objectSpread(_objectSpread({}, TModelUtil.getTransformBaseFromActualValues(tmodel)), tmodel.tfMap);
-        var transform = TModelUtil.getTransformString(tmodel, transformValues);
-        tmodel.$dom.transform(transform, tmodel.val("transformOrder"));
-      }
+      TModelUtil.fixStyle(tmodel, {
+        keys: originalKeys
+      });
     }
   }, {
     key: "setWidthFromDom",
@@ -989,8 +976,8 @@ var TModelUtil = /*#__PURE__*/function () {
       var transformMap = {};
       var hasExplicitTranslate = TUtil.isDefined(values.translateX) || TUtil.isDefined(values.translateY) || TUtil.isDefined(values.translateZ);
       var keys = Object.keys(values);
-      for (var _i2 = 0, _keys = keys; _i2 < _keys.length; _i2++) {
-        var key = _keys[_i2];
+      for (var _i = 0, _keys = keys; _i < _keys.length; _i++) {
+        var key = _keys[_i];
         if (processed[key]) {
           continue;
         }

package/build/TargetData.js

@@ -58,8 +58,8 @@ var TargetData = /*#__PURE__*/function () {
       return TargetData.lifecycleMethodSet.has(name) || TargetData.lifecyclePatterns.step.test(name) || TargetData.lifecyclePatterns.end.test(name);
     }
   }, {
-    key: "isGpuPreferred",
-    value: function isGpuPreferred(key) {
+    key: "isWaapiSupported",
+    value: function isWaapiSupported(key) {
       return !!TargetData.gpuTargetMap[TargetUtil.getTargetName(key)];
     }
   }, {
@@ -697,12 +697,9 @@ _defineProperty(TargetData, "attributesToTargets", {
   onend: 'onEnd',
   onkey: 'onKey',
   onkeydown: 'onKeyDown',
-  onanykey: 'onAnyKey',
   onclick: 'onClick',
-  onanyclick: 'onAnyClick',
   onhover: 'onHover',
   onswipe: 'onSwipe',
-  onanyswipe: 'onAnySwipe',
   onpinch: 'onPinch',
   onenter: 'onEnter',
   onleave: 'onLeave',
@@ -797,14 +794,11 @@ _defineProperty(TargetData, "targetToEventsMapping", {
   onEnd: [],
   onKey: [],
   onKeyDown: [],
-  onAnyKey: [],
   onBlur: [],
   onFocus: [],
   onClick: ['clickEvents', 'touchStart', 'mouseStart'],
-  onAnyClick: ['clickEvents', 'touchStart', 'mouseStart'],
   onHover: ['moveEvents'],
   onSwipe: ['touchStart', 'mouseStart'],
-  onAnySwipe: ['touchStart', 'mouseStart'],
   onPinch: ['touchStart'],
   onEnter: ['enterEvents'],
   onLeave: ['leaveEvents'],
@@ -837,6 +831,10 @@ _defineProperty(TargetData, "internalEventMap", {
     if (!resizeLastUpdate) {
       return false;
     }
+    if (tmodel.lastResizeHandledTime === undefined) {
+      tmodel.lastResizeHandledTime = resizeLastUpdate;
+      return false;
+    }
     if (((_tmodel$lastResizeHan = tmodel.lastResizeHandledTime) !== null && _tmodel$lastResizeHan !== void 0 ? _tmodel$lastResizeHan : 0) >= resizeLastUpdate) {
       return false;
     }
@@ -851,18 +849,12 @@ _defineProperty(TargetData, "allEventMap", {
   onEnd: function onEnd(tmodel) {
     return getEvents().isEndEvent() && getEvents().isEndHandler(tmodel);
   },
-  onAnySwipe: function onAnySwipe() {
-    return getEvents().isSwipeEvent() && TUtil.isDefined(getEvents().swipeStartX);
-  },
   onHover: function onHover(tmodel) {
     return getEvents().isMoveEvent() && getEvents().isHoverHandler(tmodel);
   },
   onClick: function onClick(tmodel) {
     return getEvents().isClickEvent() && getEvents().isClickHandler(tmodel);
   },
-  onAnyClick: function onAnyClick() {
-    return getEvents().isClickEvent();
-  },
   onEnter: function onEnter(tmodel) {
     return getEvents().isEnterHandler(tmodel);
   },
@@ -887,9 +879,6 @@ _defineProperty(TargetData, "allEventMap", {
   onKeyDown: function onKeyDown(tmodel) {
     return getEvents().getEventType() === 'keydown' && getEvents().currentKey && getEvents().currentHandlers.focus === tmodel && getEvents().currentHandlers.justFocused !== tmodel;
   },
-  onAnyKey: function onAnyKey() {
-    return getEvents().getEventType() === 'key' && getEvents().currentKey;
-  },
   onScroll: function onScroll(tmodel) {
     return getEvents().isScrollLeftHandler(tmodel) && getEvents().deltaX() || getEvents().isScrollTopHandler(tmodel) && getEvents().deltaY();
   },

package/build/TargetManager.js

@@ -327,7 +327,7 @@ var TargetManager = /*#__PURE__*/function () {
       }
       var step = (_catchup$step = catchup.step) !== null && _catchup$step !== void 0 ? _catchup$step : 0;
       var valuePointer = (_catchup$valuePointer = catchup.valuePointer) !== null && _catchup$valuePointer !== void 0 ? _catchup$valuePointer : tmodel.getValueListPointer(key);
-      if (tmodel.canBeAnimated(state.cleanKey)) {
+      if (tmodel.canBeAnimated(key)) {
         this.animateActualValue(tmodel, key, targetValue, state, step, valuePointer);
       } else {
         this.updateActualValue(tmodel, key, targetValue, state, step);

package/build/TargetUtil.js

@@ -115,6 +115,9 @@ var TargetUtil = /*#__PURE__*/function () {
           target.activateNextTarget = nextTarget;
         }
       }
+      if (TargetData.allEventMap[TargetUtil.getTargetName(key)] && target.activateNextTarget) {
+        target.eventBatchable = false;
+      }
       Object.keys(target).forEach(function (method) {
         var _originalMethod$__tar;
         var originalMethod = target[method];
@@ -174,7 +177,10 @@ var TargetUtil = /*#__PURE__*/function () {
       }
       var nextTarget = target.activateNextTarget;
       var isEndTrigger = (_nextTarget$endsWith = nextTarget === null || nextTarget === void 0 ? void 0 : nextTarget.endsWith('$$')) !== null && _nextTarget$endsWith !== void 0 ? _nextTarget$endsWith : false;
-      var fetchAction = TargetUtil.hasFetchAction(tmodel, key);
+      var isSingleFetchTarget = (nextTarget === null || nextTarget === void 0 ? void 0 : nextTarget.endsWith('$')) && !isEndTrigger;
+      var loadingEntry = isSingleFetchTarget ? getLoader().isLoading(tmodel, key) : undefined;
+      var hasBufferedResults = !!loadingEntry && loadingEntry.activeIndex < loadingEntry.entryCount;
+      var fetchAction = TargetUtil.hasFetchAction(tmodel, key) || hasBufferedResults;
       if (isUpdateMode && isEndTrigger) {
         return;
       }
@@ -187,6 +193,8 @@ var TargetUtil = /*#__PURE__*/function () {
           if (targetValue.completeCount > lastTriggeredCount) {
             canActivate = true;
           }
+        } else if (fetchAction && isSingleFetchTarget) {
+          canActivate = getLoader().isNextLoadingItemSuccessful(tmodel, key);
         } else {
           var _targetValue$nextTarg;
           var nextTargetUpdateCount = (_targetValue$nextTarg = targetValue.nextTargetUpdateCount) !== null && _targetValue$nextTarg !== void 0 ? _targetValue$nextTarg : 0;
@@ -212,12 +220,10 @@ var TargetUtil = /*#__PURE__*/function () {
                 TargetUtil.markPendingTargets(tmodel, key);
               }
             } else {
-              while (getLoader().isNextLoadingItemSuccessful(tmodel, key)) {
-                if (tmodel.activatedTargets.indexOf(nextTarget) >= 0) {
-                  tmodel.activatedTargets.push(nextTarget);
-                } else {
-                  TargetUtil.activateTarget(tmodel, nextTarget);
-                }
+              var _tmodel$targetValues$3;
+              if (!((_tmodel$targetValues$3 = tmodel.targetValues[nextTarget]) !== null && _tmodel$targetValues$3 !== void 0 && _tmodel$targetValues$3.loadingSourceKey) && tmodel.canTargetBeActivated(nextTarget) && getLoader().isNextLoadingItemSuccessful(tmodel, key)) {
+                TargetUtil.activateTarget(tmodel, nextTarget);
+                tmodel.targetValues[nextTarget].loadingSourceKey = key;
                 getLoader().nextActiveItem(tmodel, key);
                 nextTargetActivated = true;
               }
@@ -231,9 +237,7 @@ var TargetUtil = /*#__PURE__*/function () {
               TargetUtil.markPendingTargets(tmodel, key);
             }
           } else {
-            if (tmodel.activatedTargets.indexOf(nextTarget) >= 0 && !tmodel.isTargetUpdating(key)) {
-              tmodel.activatedTargets.push(nextTarget);
-            } else {
+            if (tmodel.canTargetBeActivated(nextTarget)) {
               TargetUtil.activateTarget(tmodel, nextTarget);
               nextTargetActivated = true;
             }
@@ -311,6 +315,7 @@ var TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "cleanupTarget",
     value: function cleanupTarget(tmodel, key) {
+      var _tmodel$targetValues$4;
       TargetUtil.cleanupVisibleComplete(tmodel, key);
       var cannotBeCleaned = tmodel.isTargetComplete(key) || !TargetUtil.isTargetFullyCompleted(tmodel, key);
       if (cannotBeCleaned) {
@@ -329,6 +334,11 @@ var TargetUtil = /*#__PURE__*/function () {
         }
       }
       TargetUtil.bubbleInvokerCompletion(tmodel, key);
+      var sourceKey = (_tmodel$targetValues$4 = tmodel.targetValues[key]) === null || _tmodel$targetValues$4 === void 0 ? void 0 : _tmodel$targetValues$4.loadingSourceKey;
+      if (sourceKey) {
+        delete tmodel.targetValues[key].loadingSourceKey;
+        TargetUtil.shouldActivateNextTarget(tmodel, sourceKey, 0, 0, false, "update");
+      }
       return true;
     }
   }, {
@@ -400,8 +410,8 @@ var TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "getTriggeredByCompleteCount",
     value: function getTriggeredByCompleteCount(tmodel, nextTarget, key) {
-      var _tmodel$targetValues$3, _tmodel$targetValues$4;
-      return (_tmodel$targetValues$3 = (_tmodel$targetValues$4 = tmodel.targetValues[nextTarget]) === null || _tmodel$targetValues$4 === void 0 || (_tmodel$targetValues$4 = _tmodel$targetValues$4.triggeredByCompleteCountMap) === null || _tmodel$targetValues$4 === void 0 ? void 0 : _tmodel$targetValues$4.get(key)) !== null && _tmodel$targetValues$3 !== void 0 ? _tmodel$targetValues$3 : 0;
+      var _tmodel$targetValues$5, _tmodel$targetValues$6;
+      return (_tmodel$targetValues$5 = (_tmodel$targetValues$6 = tmodel.targetValues[nextTarget]) === null || _tmodel$targetValues$6 === void 0 || (_tmodel$targetValues$6 = _tmodel$targetValues$6.triggeredByCompleteCountMap) === null || _tmodel$targetValues$6 === void 0 ? void 0 : _tmodel$targetValues$6.get(key)) !== null && _tmodel$targetValues$5 !== void 0 ? _tmodel$targetValues$5 : 0;
     }
   }, {
     key: "snapshotTriggeredByCompleteCounts",
@@ -414,13 +424,13 @@ var TargetUtil = /*#__PURE__*/function () {
         return;
       }
       for (var i = 0; i < nextIndex; i++) {
-        var _tmodel$targetValues$5, _tmodel$targetValues$6;
+        var _tmodel$targetValues$7, _tmodel$targetValues$8;
         var previousKey = tmodel.functionTargetNames[i];
         var previousTarget = tmodel.targets[previousKey];
         if ((previousTarget === null || previousTarget === void 0 ? void 0 : previousTarget.activateNextTarget) !== nextTarget) {
           continue;
         }
-        var completeCount = (_tmodel$targetValues$5 = (_tmodel$targetValues$6 = tmodel.targetValues[previousKey]) === null || _tmodel$targetValues$6 === void 0 ? void 0 : _tmodel$targetValues$6.completeCount) !== null && _tmodel$targetValues$5 !== void 0 ? _tmodel$targetValues$5 : 0;
+        var completeCount = (_tmodel$targetValues$7 = (_tmodel$targetValues$8 = tmodel.targetValues[previousKey]) === null || _tmodel$targetValues$8 === void 0 ? void 0 : _tmodel$targetValues$8.completeCount) !== null && _tmodel$targetValues$7 !== void 0 ? _tmodel$targetValues$7 : 0;
         map.set(previousKey, completeCount);
       }
     }
@@ -445,7 +455,7 @@ var TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "isTModelComplete",
     value: function isTModelComplete(tmodel) {
-      var _tmodel$particleRunti, _state$updatingTarget2, _state$activeTargetLi2, _state$activatedTarge2, _state$lastChildrenUp3, _state$lastChildrenUp4;
+      var _tmodel$particleRunti, _state$updatingTarget2, _state$activeTargetLi2, _state$lastChildrenUp3, _state$lastChildrenUp4;
       var completionScope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "all";
       if (completionScope === "visible" && TargetUtil.shouldIgnoreChildForCompletion(tmodel, "visible")) {
         return true;
@@ -458,10 +468,10 @@ var TargetUtil = /*#__PURE__*/function () {
       var pendingStyles = !tmodel.isLightweightChild && TargetUtil.hasPendingStyles(tmodel);
       var needsReattach = !tmodel.isLightweightChild && getManager().needsReattach(tmodel);
       if (completionScope === "visible") {
-        var _state$updatingTarget, _state$activeTargetLi, _state$activatedTarge, _state$lastChildrenUp, _state$lastChildrenUp2;
-        return !waitingForDom && !((_state$updatingTarget = state.updatingTargetList) !== null && _state$updatingTarget !== void 0 && _state$updatingTarget.length) && !((_state$activeTargetLi = state.activeTargetList) !== null && _state$activeTargetLi !== void 0 && _state$activeTargetLi.length) && !((_state$activatedTarge = state.activatedTargets) !== null && _state$activatedTarge !== void 0 && _state$activatedTarge.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && TargetUtil.getUpdatingChildren(tmodel, undefined, "visible").size === 0 && TargetUtil.getActiveChildren(tmodel, "visible").size === 0 && !((_state$lastChildrenUp = state.lastChildrenUpdate) !== null && _state$lastChildrenUp !== void 0 && (_state$lastChildrenUp = _state$lastChildrenUp.deletions) !== null && _state$lastChildrenUp !== void 0 && _state$lastChildrenUp.length) && !((_state$lastChildrenUp2 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp2 !== void 0 && (_state$lastChildrenUp2 = _state$lastChildrenUp2.additions) !== null && _state$lastChildrenUp2 !== void 0 && _state$lastChildrenUp2.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !pendingStyles && !needsReattach;
+        var _state$updatingTarget, _state$activeTargetLi, _state$lastChildrenUp, _state$lastChildrenUp2;
+        return !waitingForDom && !((_state$updatingTarget = state.updatingTargetList) !== null && _state$updatingTarget !== void 0 && _state$updatingTarget.length) && !((_state$activeTargetLi = state.activeTargetList) !== null && _state$activeTargetLi !== void 0 && _state$activeTargetLi.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && TargetUtil.getUpdatingChildren(tmodel, undefined, "visible").size === 0 && TargetUtil.getActiveChildren(tmodel, "visible").size === 0 && !((_state$lastChildrenUp = state.lastChildrenUpdate) !== null && _state$lastChildrenUp !== void 0 && (_state$lastChildrenUp = _state$lastChildrenUp.deletions) !== null && _state$lastChildrenUp !== void 0 && _state$lastChildrenUp.length) && !((_state$lastChildrenUp2 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp2 !== void 0 && (_state$lastChildrenUp2 = _state$lastChildrenUp2.additions) !== null && _state$lastChildrenUp2 !== void 0 && _state$lastChildrenUp2.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !pendingStyles && !needsReattach;
       }
-      return !waitingForDom && !((_state$updatingTarget2 = state.updatingTargetList) !== null && _state$updatingTarget2 !== void 0 && _state$updatingTarget2.length) && !((_state$activeTargetLi2 = state.activeTargetList) !== null && _state$activeTargetLi2 !== void 0 && _state$activeTargetLi2.length) && !((_state$activatedTarge2 = state.activatedTargets) !== null && _state$activatedTarge2 !== void 0 && _state$activatedTarge2.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && !tmodel.hasAnimatingChildren() && !tmodel.hasUpdatingChildren() && !tmodel.hasActiveChildren() && !((_state$lastChildrenUp3 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp3 !== void 0 && (_state$lastChildrenUp3 = _state$lastChildrenUp3.deletions) !== null && _state$lastChildrenUp3 !== void 0 && _state$lastChildrenUp3.length) && !((_state$lastChildrenUp4 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp4 !== void 0 && (_state$lastChildrenUp4 = _state$lastChildrenUp4.additions) !== null && _state$lastChildrenUp4 !== void 0 && _state$lastChildrenUp4.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !pendingStyles && !needsReattach;
+      return !waitingForDom && !((_state$updatingTarget2 = state.updatingTargetList) !== null && _state$updatingTarget2 !== void 0 && _state$updatingTarget2.length) && !((_state$activeTargetLi2 = state.activeTargetList) !== null && _state$activeTargetLi2 !== void 0 && _state$activeTargetLi2.length) && !tmodel.hasAnimatingTargets() && TargetUtil.isFetchingComplete(tmodel) && !tmodel.hasAnimatingChildren() && !tmodel.hasUpdatingChildren() && !tmodel.hasActiveChildren() && !((_state$lastChildrenUp3 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp3 !== void 0 && (_state$lastChildrenUp3 = _state$lastChildrenUp3.deletions) !== null && _state$lastChildrenUp3 !== void 0 && _state$lastChildrenUp3.length) && !((_state$lastChildrenUp4 = state.lastChildrenUpdate) !== null && _state$lastChildrenUp4 !== void 0 && (_state$lastChildrenUp4 = _state$lastChildrenUp4.additions) !== null && _state$lastChildrenUp4 !== void 0 && _state$lastChildrenUp4.length) && !tmodel.noDomUpdatingTargets && !tmodel.pendingTargets && !pendingStyles && !needsReattach;
     }
   }, {
     key: "getCompletionBlockers",
@@ -497,7 +507,6 @@ var TargetUtil = /*#__PURE__*/function () {
       add("waitingForDom", !tmodel.isLightweightChild && getManager().shouldHaveDom(tmodel) && !tmodel.hasDom());
       add("updatingTargetList", list(state.updatingTargetList));
       add("activeTargetList", list(state.activeTargetList));
-      add("activatedTargets", list(state.activatedTargets));
       add("animatingTargets", tmodel.hasAnimatingTargets() ? list(tmodel.animatingMap) : []);
       add("fetching", !TargetUtil.isFetchingComplete(tmodel));
       if (visible) {
@@ -578,7 +587,7 @@ var TargetUtil = /*#__PURE__*/function () {
         if (tmodel.isTargetComplete(targetName)) {
           continue;
         }
-        if (tmodel.activatedTargets.indexOf(targetName) >= 0) {
+        if (tmodel.activeTargetMap[targetName]) {
           return "activated targets";
         }
         if (tmodel.hasUpdatingImperativeTargets(targetName)) {
@@ -883,9 +892,9 @@ var TargetUtil = /*#__PURE__*/function () {
     value: function getOriginalNames(tmodel, key) {
       var originalTModel, originalTargetName;
       if (tmodel.isTargetImperative(key)) {
-        var _tmodel$targetValues$7, _tmodel$targetValues$8;
-        originalTModel = (_tmodel$targetValues$7 = tmodel.targetValues[key]) === null || _tmodel$targetValues$7 === void 0 ? void 0 : _tmodel$targetValues$7.originalTModel;
-        originalTargetName = (_tmodel$targetValues$8 = tmodel.targetValues[key]) === null || _tmodel$targetValues$8 === void 0 ? void 0 : _tmodel$targetValues$8.originalTargetName;
+        var _tmodel$targetValues$9, _tmodel$targetValues$10;
+        originalTModel = (_tmodel$targetValues$9 = tmodel.targetValues[key]) === null || _tmodel$targetValues$9 === void 0 ? void 0 : _tmodel$targetValues$9.originalTModel;
+        originalTargetName = (_tmodel$targetValues$10 = tmodel.targetValues[key]) === null || _tmodel$targetValues$10 === void 0 ? void 0 : _tmodel$targetValues$10.originalTargetName;
       } else {
         var _tmodel$targets$key4, _tmodel$targets$key5;
         originalTModel = (_tmodel$targets$key4 = tmodel.targets[key]) === null || _tmodel$targets$key4 === void 0 ? void 0 : _tmodel$targets$key4.originalTModel;
@@ -1045,7 +1054,6 @@ var TargetUtil = /*#__PURE__*/function () {
     value: function resetSingleTargetState(tmodel, key) {
       TargetUtil.resetTargetStateOnly(tmodel, key);
       tmodel.cancelAnimation();
-      tmodel.activatedTargets.length = 0;
     }
   }, {
     key: "resetRemovedChildTarget",
@@ -1127,6 +1135,16 @@ var TargetUtil = /*#__PURE__*/function () {
       }
       return false;
     }
+  }, {
+    key: "disableEventBatching",
+    value: function disableEventBatching(tmodel, key) {
+      if (!tmodel || !key || !TargetData.allEventMap[TargetUtil.getTargetName(key)]) {
+        return;
+      }
+      if (tmodel.targets[key]) {
+        tmodel.targets[key].eventBatchable = false;
+      }
+    }
   }]);
 }();
 export { TargetUtil };