targetj 1.1.8 → 1.1.10

package/build/AnimationManager.js

@@ -201,10 +201,8 @@ var AnimationManager = /*#__PURE__*/function () {
           tmodel.removeFromAnimatingMap(originalKey);
           this.recordMap.delete(recId);
           this.completeRecord(tmodel, rec, cleanKey, originalKey);
+          TModelUtil.commitAnimatedStyles(tmodel, new Set([originalKey]));
           if (!tmodel.hasAnimatingTargets()) {
-            if (tmodel.finalKeyframe && tmodel.hasDom()) {
-              AnimationUtil.fixStyleByAnimation(tmodel, tmodel.finalKeyframe);
-            }
             tmodel.lastBatch = undefined;
           }
           rec.status = 'complete';
@@ -263,7 +261,7 @@ var AnimationManager = /*#__PURE__*/function () {
             var ct = (_record$anim$effect = record.anim.effect) === null || _record$anim$effect === void 0 || (_record$anim$effect$g = (_record$anim$effect2 = _record$anim$effect).getComputedTiming) === null || _record$anim$effect$g === void 0 ? void 0 : _record$anim$effect$g.call(_record$anim$effect2);
             var progress = (_ct$progress = ct === null || ct === void 0 ? void 0 : ct.progress) !== null && _ct$progress !== void 0 ? _ct$progress : 0;
             var finished = ps === "finished" || ps === "idle" || progress >= 0.999999;
-            if (finished) {
+            if (finished && record.status !== 'done') {
               record.status = 'done';
               animsToFinalize.add(record.anim);
             }
@@ -425,21 +423,13 @@ var AnimationManager = /*#__PURE__*/function () {
   }, {
     key: "fixTModelStyleFromFrame",
     value: function fixTModelStyleFromFrame(tmodel, frame) {
-      if (!tmodel.hasDom() || !frame) {
+      if (!frame) {
         return;
       }
-      var out = _objectSpread({}, frame.styleMap);
-      var hasTf = Object.keys(frame.tfMap).length > 0;
-      if (hasTf) {
-        Object.keys(tmodel.tfMap).forEach(function (key) {
-          tmodel.tfMap[key] = tmodel.val(key);
-        });
-        var tfMap = _objectSpread(_objectSpread({}, tmodel.tfMap), frame.tfMap);
-        frame.tfMap = tfMap;
-        out.transform = TModelUtil.getTransformString(tmodel, tfMap);
-      }
-      AnimationUtil.addUnitsToFrame(out);
-      AnimationUtil.fixStyleByAnimation(tmodel, out);
+      TModelUtil.fixStyle(tmodel, {
+        frame: frame,
+        force: true
+      });
     }
   }, {
     key: "collectFramesForKey",

package/build/AnimationUtil.js

@@ -102,48 +102,11 @@ var AnimationUtil = /*#__PURE__*/function () {
       };
       getAnimationManager().animate(tmodel, batch, AnimationUtil.getAnimationHooks());
     }
-  }, {
-    key: "fixStyleByAnimation",
-    value: function fixStyleByAnimation(tmodel, frame) {
-      if (!tmodel.hasDom()) {
-        return;
-      }
-      var keys = Object.keys(frame);
-      for (var _i = 0, _keys = keys; _i < _keys.length; _i++) {
-        var key = _keys[_i];
-        if (key === 'offset') {
-          continue;
-        }
-        var value = frame[key];
-        if (value === null) {
-          continue;
-        }
-        var num = value;
-        if (typeof value === 'string' && value.endsWith('px')) {
-          var parsed = Number(value.slice(0, -2));
-          if (!Number.isNaN(parsed)) {
-            num = parsed;
-          }
-        }
-        if (key === 'width') {
-          tmodel.styleMap.width = num;
-          tmodel.$dom.width(value);
-        } else if (key === 'height') {
-          tmodel.styleMap.height = num;
-          tmodel.$dom.height(value);
-        } else if (key === 'transform') {
-          tmodel.$dom.transform(value, tmodel.val('transformOrder'));
-        } else if (!TargetData.transformMap[key]) {
-          tmodel.$dom.style(key, value);
-          tmodel.styleMap[key] = num;
-        }
-      }
-    }
   }, {
     key: "addUnitsToFrame",
     value: function addUnitsToFrame(out) {
-      for (var _i2 = 0, _Object$keys = Object.keys(out); _i2 < _Object$keys.length; _i2++) {
-        var k = _Object$keys[_i2];
+      for (var _i = 0, _Object$keys = Object.keys(out); _i < _Object$keys.length; _i++) {
+        var k = _Object$keys[_i];
         if (k === 'offset' || k === 'transform') {
           continue;
         }
@@ -199,9 +162,9 @@ var AnimationUtil = /*#__PURE__*/function () {
       } finally {
         _iterator.f();
       }
-      for (var _i3 = 0, _records = records; _i3 < _records.length; _i3++) {
+      for (var _i2 = 0, _records = records; _i2 < _records.length; _i2++) {
         var _tmodel$noDomUpdating, _tmodel$noDomUpdating2;
-        var record = _records[_i3];
+        var record = _records[_i2];
         var originalKey = record.originalKey;
         var targetValue = tmodel.targetValues[originalKey];
         if (!targetValue) {
@@ -239,8 +202,8 @@ var AnimationUtil = /*#__PURE__*/function () {
       } finally {
         _iterator2.f();
       }
-      for (var _i4 = 0, _records2 = records; _i4 < _records2.length; _i4++) {
-        var record = _records2[_i4];
+      for (var _i3 = 0, _records2 = records; _i3 < _records2.length; _i3++) {
+        var record = _records2[_i3];
         var originalKey = record.originalKey;
         tmodel.addToNoDomUpdatingTargets(originalKey);
       }
@@ -522,8 +485,8 @@ var AnimationUtil = /*#__PURE__*/function () {
       if (!batch || !((_batch$frames = batch.frames) !== null && _batch$frames !== void 0 && _batch$frames.length)) {
         return;
       }
-      for (var _i5 = 0, _Object$entries = Object.entries(batch.keyMap); _i5 < _Object$entries.length; _i5++) {
-        var _Object$entries$_i = _slicedToArray(_Object$entries[_i5], 2),
+      for (var _i4 = 0, _Object$entries = Object.entries(batch.keyMap); _i4 < _Object$entries.length; _i4++) {
+        var _Object$entries$_i = _slicedToArray(_Object$entries[_i4], 2),
           cleanKey = _Object$entries$_i[0],
           originalKeys = _Object$entries$_i[1];
         var _iterator8 = _createForOfIteratorHelper(originalKeys),

package/build/BaseModel.js

@@ -18,11 +18,12 @@ 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 { App, getRunScheduler, getLocationManager, getAnimationManager, getDomTModelById, getEvents } from "./App.js";
+import { App, getRunScheduler, getAnimationManager, getDomTModelById, getEvents } from "./App.js";
 import { TargetExecutor } from "./TargetExecutor.js";
 import { TUtil } from "./TUtil.js";
 import { TargetParser } from "./TargetParser.js";
 import { TargetUtil } from "./TargetUtil.js";
+import { TModelUtil } from "./TModelUtil.js";
 import { TargetData } from "./TargetData.js";
 import { $Dom } from "./$Dom.js";
 import { Easing } from "./Easing.js";
@@ -131,23 +132,17 @@ var BaseModel = /*#__PURE__*/function () {
       var _this$state8, _this$state8$fetchAct;
       return (_this$state8$fetchAct = (_this$state8 = this.state()).fetchActionTargetList) !== null && _this$state8$fetchAct !== void 0 ? _this$state8$fetchAct : _this$state8.fetchActionTargetList = [];
     }
-  }, {
-    key: "activatedTargets",
-    get: function get() {
-      var _this$state9, _this$state9$activate;
-      return (_this$state9$activate = (_this$state9 = this.state()).activatedTargets) !== null && _this$state9$activate !== void 0 ? _this$state9$activate : _this$state9.activatedTargets = [];
-    }
   }, {
     key: "targetMethodMap",
     get: function get() {
-      var _this$state10, _this$state10$targetM;
-      return (_this$state10$targetM = (_this$state10 = this.state()).targetMethodMap) !== null && _this$state10$targetM !== void 0 ? _this$state10$targetM : _this$state10.targetMethodMap = {};
+      var _this$state9, _this$state9$targetMe;
+      return (_this$state9$targetMe = (_this$state9 = this.state()).targetMethodMap) !== null && _this$state9$targetMe !== void 0 ? _this$state9$targetMe : _this$state9.targetMethodMap = {};
     }
   }, {
     key: "targetExecutionCount",
     get: function get() {
-      var _this$state11, _this$state11$targetE;
-      return (_this$state11$targetE = (_this$state11 = this.state()).targetExecutionCount) !== null && _this$state11$targetE !== void 0 ? _this$state11$targetE : _this$state11.targetExecutionCount = 0;
+      var _this$state10, _this$state10$targetE;
+      return (_this$state10$targetE = (_this$state10 = this.state()).targetExecutionCount) !== null && _this$state10$targetE !== void 0 ? _this$state10$targetE : _this$state10.targetExecutionCount = 0;
     },
     set: function set(val) {
       this.state().targetExecutionCount = val;
@@ -155,26 +150,26 @@ var BaseModel = /*#__PURE__*/function () {
   }, {
     key: "addedChildren",
     get: function get() {
-      var _this$state12, _this$state12$addedCh;
-      return (_this$state12$addedCh = (_this$state12 = this.state()).addedChildren) !== null && _this$state12$addedCh !== void 0 ? _this$state12$addedCh : _this$state12.addedChildren = [];
+      var _this$state11, _this$state11$addedCh;
+      return (_this$state11$addedCh = (_this$state11 = this.state()).addedChildren) !== null && _this$state11$addedCh !== void 0 ? _this$state11$addedCh : _this$state11.addedChildren = [];
     }
   }, {
     key: "deletedChildren",
     get: function get() {
-      var _this$state13, _this$state13$deleted;
-      return (_this$state13$deleted = (_this$state13 = this.state()).deletedChildren) !== null && _this$state13$deleted !== void 0 ? _this$state13$deleted : _this$state13.deletedChildren = [];
+      var _this$state12, _this$state12$deleted;
+      return (_this$state12$deleted = (_this$state12 = this.state()).deletedChildren) !== null && _this$state12$deleted !== void 0 ? _this$state12$deleted : _this$state12.deletedChildren = [];
     }
   }, {
     key: "movedChildren",
     get: function get() {
-      var _this$state14, _this$state14$movedCh;
-      return (_this$state14$movedCh = (_this$state14 = this.state()).movedChildren) !== null && _this$state14$movedCh !== void 0 ? _this$state14$movedCh : _this$state14.movedChildren = [];
+      var _this$state13, _this$state13$movedCh;
+      return (_this$state13$movedCh = (_this$state13 = this.state()).movedChildren) !== null && _this$state13$movedCh !== void 0 ? _this$state13$movedCh : _this$state13.movedChildren = [];
     }
   }, {
     key: "lastChildrenUpdate",
     get: function get() {
-      var _this$state15, _this$state15$lastChi;
-      return (_this$state15$lastChi = (_this$state15 = this.state()).lastChildrenUpdate) !== null && _this$state15$lastChi !== void 0 ? _this$state15$lastChi : _this$state15.lastChildrenUpdate = {
+      var _this$state14, _this$state14$lastChi;
+      return (_this$state14$lastChi = (_this$state14 = this.state()).lastChildrenUpdate) !== null && _this$state14$lastChi !== void 0 ? _this$state14$lastChi : _this$state14.lastChildrenUpdate = {
         additions: [],
         deletions: []
       };
@@ -182,14 +177,14 @@ var BaseModel = /*#__PURE__*/function () {
   }, {
     key: "visibleChildren",
     get: function get() {
-      var _this$state16, _this$state16$visible;
-      return (_this$state16$visible = (_this$state16 = this.state()).visibleChildren) !== null && _this$state16$visible !== void 0 ? _this$state16$visible : _this$state16.visibleChildren = [];
+      var _this$state15, _this$state15$visible;
+      return (_this$state15$visible = (_this$state15 = this.state()).visibleChildren) !== null && _this$state15$visible !== void 0 ? _this$state15$visible : _this$state15.visibleChildren = [];
     }
   }, {
     key: "passiveTargetList",
     get: function get() {
-      var _this$state17, _this$state17$passive;
-      return (_this$state17$passive = (_this$state17 = this.state()).passiveTargetList) !== null && _this$state17$passive !== void 0 ? _this$state17$passive : _this$state17.passiveTargetList = [];
+      var _this$state16, _this$state16$passive;
+      return (_this$state16$passive = (_this$state16 = this.state()).passiveTargetList) !== null && _this$state16$passive !== void 0 ? _this$state16$passive : _this$state16.passiveTargetList = [];
     },
     set: function set(val) {
       this.state().passiveTargetList = val;
@@ -197,8 +192,8 @@ var BaseModel = /*#__PURE__*/function () {
   }, {
     key: "passiveTargetMap",
     get: function get() {
-      var _this$state18, _this$state18$passive;
-      return (_this$state18$passive = (_this$state18 = this.state()).passiveTargetMap) !== null && _this$state18$passive !== void 0 ? _this$state18$passive : _this$state18.passiveTargetMap = {};
+      var _this$state17, _this$state17$passive;
+      return (_this$state17$passive = (_this$state17 = this.state()).passiveTargetMap) !== null && _this$state17$passive !== void 0 ? _this$state17$passive : _this$state17.passiveTargetMap = {};
     },
     set: function set(val) {
       this.state().passiveTargetMap = val;
@@ -303,7 +298,7 @@ var BaseModel = /*#__PURE__*/function () {
         if (doesNextTargetUsePrevValue || isInactiveKey || isExternalEvent || isInternalEvent || targetType === 'object' || targetType === 'function') {
           if (!TUtil.isDefined(target.value) && !TargetParser.isChildObjectTarget(key, target) && !TargetParser.isIntervalTarget(target)) {
             needsTargetExecution = true;
-            var value = _objectSpread({}, target);
+            var value = _typeof(target) === 'object' && target !== null && !Array.isArray(target) ? _objectSpread({}, target) : target;
             target = TargetUtil.wrapTarget(this, value, key);
             var _iterator = _createForOfIteratorHelper(TargetData.lifecycleCallbackSet),
               _step;
@@ -373,25 +368,6 @@ var BaseModel = /*#__PURE__*/function () {
       }
       this.functionTargetNames.push(key);
     }
-  }, {
-    key: "activate",
-    value: function activate(targetName) {
-      getLocationManager().addToActivatedList(this);
-      this.currentStatus = 'active';
-      if (targetName && this.isTargetEnabled(targetName) && this.activatedTargets.indexOf(targetName) === -1) {
-        this.activatedTargets.push(targetName);
-      }
-    }
-  }, {
-    key: "isActivated",
-    value: function isActivated() {
-      return this.currentStatus === 'active';
-    }
-  }, {
-    key: "deactivate",
-    value: function deactivate() {
-      this.currentStatus = undefined;
-    }
   }, {
     key: "excludeDefaultStyling",
     value: function excludeDefaultStyling() {
@@ -448,16 +424,17 @@ var BaseModel = /*#__PURE__*/function () {
         var _this$styleTargetMap;
         var styleFlag = true;
         if (TargetData.transformMap[key]) {
-          if (this.getParent()) {
+          if (this.getParent() && !this.isDomIsland()) {
             this.calcAbsolutePosition(this.getX(), this.getY());
           }
+          styleFlag = this.tfMap[key] !== TModelUtil.getTransformValue(this, key);
         } else if (key === 'width' || key === 'height') {
-          var dimension = Math.floor(key === 'width' ? this.val('width') : this.val('height'));
-          if (this.styleMap[key] === dimension) {
+          if (this.styleMap[key] === this.val(key)) {
             styleFlag = false;
           }
         } else if (key === 'dim') {
-          if (this.styleMap[key] === Math.floor(this.val('dim'))) {
+          var dim = this.val('dim');
+          if (this.styleMap.width === dim && this.styleMap.height === dim) {
             styleFlag = false;
           }
         } else if (TUtil.isDefined(this.val(key)) && this.styleMap[key] === this.val(key)) {
@@ -1015,9 +992,6 @@ var BaseModel = /*#__PURE__*/function () {
       }
       var originalTargetName = TargetUtil.currentTargetName;
       var originalTModel = TargetUtil.currentTModel;
-      if (originalTargetName === 'swell') {
-        console.log("setTarget: " + this.oid + ", " + originalTModel.oid + ", " + originalTargetName);
-      }
       if (originalTModel && originalTargetName && originalTModel !== this) {
         TargetUtil.markChildAction(originalTModel, originalTargetName, this);
       }
@@ -1365,6 +1339,7 @@ var BaseModel = /*#__PURE__*/function () {
         }
         targetValue.invokerTModel = invokerTModel;
         targetValue.invokerTarget = invokerTarget;
+        TargetUtil.disableEventBatching(invokerTModel, invokerTarget);
         if (this.targetValues[key]) {
           targetValue.activationTime = TUtil.now();
           targetValue.lastUpdate = TUtil.now();
@@ -1381,7 +1356,6 @@ var BaseModel = /*#__PURE__*/function () {
           targetValue.cycles = (_this$targets$key$cyc = (_this$targets$key = this.targets[key]) === null || _this$targets$key === void 0 ? void 0 : _this$targets$key.cycles) !== null && _this$targets$key$cyc !== void 0 ? _this$targets$key$cyc : targetValue.cycles;
         }
         this.setTargetStatus(key, 'active');
-        this.activate(key);
       }
       return this;
     }

package/build/EventListener.js

@@ -77,6 +77,8 @@ var EventListener = /*#__PURE__*/function () {
       hover: null
     };
     this.eventQueue = [];
+    this.priorityEventTModels = new Set();
+    this.capturedEventEpoch = 0;
     this.attachedEventMap = {};
     this.eventTargetMap = {};
     this.allEvents = {};
@@ -331,6 +333,7 @@ var EventListener = /*#__PURE__*/function () {
       this.currentHandlers.end = undefined;
       this.currentKey = this.currentTouch.key;
       if (this.eventQueue.length === 0) {
+        this.priorityEventTModels.clear();
         this.currentEventName = '';
         this.currentEventType = '';
         this.currentEventTModel = undefined;
@@ -339,6 +342,10 @@ var EventListener = /*#__PURE__*/function () {
         return;
       }
       var lastEvent = this.eventQueue.shift();
+      if (lastEvent.eventType === 'key' || lastEvent.eventType === 'keydown') {
+        var _lastEvent$originalEv, _lastEvent$originalEv2;
+        this.currentKey = ((_lastEvent$originalEv = lastEvent.originalEvent) === null || _lastEvent$originalEv === void 0 ? void 0 : _lastEvent$originalEv.which) || ((_lastEvent$originalEv2 = lastEvent.originalEvent) === null || _lastEvent$originalEv2 === void 0 ? void 0 : _lastEvent$originalEv2.keyCode) || '';
+      }
       if (this.canFindHandlers && !lastEvent.synthetic) {
         this.findEventHandlers(lastEvent);
       }
@@ -353,6 +360,8 @@ var EventListener = /*#__PURE__*/function () {
       this.currentEventTModel = lastEvent.tmodel;
       this.currentOriginalEvent = lastEvent.originalEvent;
       this.currentTouch.key = '';
+      this.priorityEventTModels.clear();
+      this.capturedEventEpoch++;
       this.markCapturedEventDirty(lastEvent);
       if (lastEvent.eventType === 'end' || lastEvent.eventType === 'click') {
         this.canFindHandlers = true;
@@ -362,12 +371,17 @@ var EventListener = /*#__PURE__*/function () {
   }, {
     key: "markCapturedEventDirty",
     value: function markCapturedEventDirty(lastEvent) {
+      var _this7 = this;
       var mark = function mark(tmodel, reason) {
+        var _tmodel$externalEvent2;
         if (!tmodel) {
           return;
         }
         tmodel.markEventDirty();
         tmodel.markLayoutDirty(reason);
+        if (lastEvent.eventType !== 'popstate' && (_tmodel$externalEvent2 = tmodel.externalEventMap) !== null && _tmodel$externalEvent2 !== void 0 && _tmodel$externalEvent2.size) {
+          _this7.priorityEventTModels.add(tmodel);
+        }
       };
       mark(lastEvent.tmodel, "".concat(lastEvent.eventType, "-event"));
       switch (lastEvent.eventType) {
@@ -385,17 +399,30 @@ var EventListener = /*#__PURE__*/function () {
           mark(this.currentHandlers.scrollLeft, "scrollleft-event");
           mark(this.currentHandlers.scrollTop, "scrolltop-event");
           mark(this.currentHandlers.pinch, "pinch-event");
+          mark(this.currentHandlers.hover, "hover-event");
+          break;
+        case "key":
+        case "keydown":
+          mark(this.currentHandlers.focus, "key-event");
           break;
         case "popstate":
           for (var _i2 = 0, _Object$values = Object.values(getManager().visibleOidMap); _i2 < _Object$values.length; _i2++) {
-            var _tmodel$externalEvent2;
+            var _tmodel$externalEvent3;
             var tmodel = _Object$values[_i2];
-            if ((_tmodel$externalEvent2 = tmodel.externalEventMap) !== null && _tmodel$externalEvent2 !== void 0 && _tmodel$externalEvent2.has("onPopState")) {
+            if ((_tmodel$externalEvent3 = tmodel.externalEventMap) !== null && _tmodel$externalEvent3 !== void 0 && _tmodel$externalEvent3.has("onPopState")) {
               mark(tmodel, "popstate-event");
             }
           }
           break;
       }
+
+      // Focus/enter/leave can change as a result of an input event.
+      if (lastEvent.eventType !== 'popstate') {
+        mark(this.currentHandlers.justFocused, 'focus-event');
+        mark(this.currentHandlers.blur, 'blur-event');
+        mark(this.currentHandlers.enter, 'enter-event');
+        mark(this.currentHandlers.leave, 'leave-event');
+      }
     }
   }, {
     key: "handleDocEvent",
@@ -419,7 +446,7 @@ var EventListener = /*#__PURE__*/function () {
         _this$currentHandlers4,
         _this$currentHandlers6,
         _this$currentHandlers7,
-        _this7 = this,
+        _this8 = this,
         _tmodel3,
         _tmodel4;
       if (!event) {
@@ -486,7 +513,12 @@ var EventListener = /*#__PURE__*/function () {
       (_tmodel2 = tmodel) === null || _tmodel2 === void 0 || _tmodel2.markLayoutDirty('event');
       this.lastEvent = newEvent;
       if (queue) {
-        this.eventQueue.push(this.lastEvent);
+        var lastQueued = this.eventQueue.at(-1);
+        if (eventType === 'move' && (lastQueued === null || lastQueued === void 0 ? void 0 : lastQueued.eventType) === 'move' && lastQueued.originalName === originalName && lastQueued.tmodel === tmodel) {
+          this.eventQueue[this.eventQueue.length - 1] = newEvent;
+        } else {
+          this.eventQueue.push(newEvent);
+        }
       }
       var touch;
       switch (eventName) {
@@ -625,9 +657,9 @@ var EventListener = /*#__PURE__*/function () {
         case 'scroll':
           clearTimeout(this.windowScrollEndTimer);
           this.windowScrollEndTimer = setTimeout(function () {
-            _this7.queueWindowScrollEndEvent('x', tmodel);
-            _this7.queueWindowScrollEndEvent('y', tmodel);
-            _this7.windowScrollEndTimer = 0;
+            _this8.queueWindowScrollEndEvent('x', tmodel);
+            _this8.queueWindowScrollEndEvent('y', tmodel);
+            _this8.windowScrollEndTimer = 0;
           }, 450);
           if (isWindowEvent) {
             this.windowEpoch++;
@@ -770,6 +802,7 @@ var EventListener = /*#__PURE__*/function () {
       this.clearEnd();
       this.clearTouch();
       this.eventQueue.length = 0;
+      this.priorityEventTModels.clear();
       this.touchCount = 0;
       this.canFindHandlers = true;
       this.lastEvent = undefined;

package/build/LoadingManager.js

@@ -283,14 +283,12 @@ var LoadingManager = /*#__PURE__*/function () {
   }, {
     key: "isNextLoadingItemSuccessful",
     value: function isNextLoadingItemSuccessful(tmodel, targetName) {
-      var key = this.getTModelKey(tmodel, targetName);
-      var modelEntry = this.tmodelKeyMap[key];
-      if (!modelEntry) {
+      var entry = this.isLoading(tmodel, targetName);
+      if (!entry || entry.activeIndex >= entry.entryCount) {
         return false;
       }
-      var loadTargetName = TUtil.getLoadTargetName(targetName);
-      var targetValue = tmodel.val(loadTargetName);
-      return Array.isArray(targetValue) && TUtil.isDefined(targetValue[modelEntry.activeIndex]) && TUtil.isDefined(targetValue[modelEntry.accessIndex]);
+      var results = tmodel.val(TUtil.getLoadTargetName(targetName));
+      return Array.isArray(results) && TUtil.isDefined(results[entry.activeIndex]);
     }
   }, {
     key: "getLoadingItemValue",