targetj 1.0.233 → 1.0.235

package/build/PageManager.js

@@ -57,19 +57,28 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
     key: "openPage",
     value: function () {
       var _openPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(link) {
-        var visibles, newVisibles;
+        var shouldReset,
+          visibles,
+          newVisibles,
+          _args = arguments;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
-              return _App.tApp.stop();
-            case 2:
+              shouldReset = _args.length > 1 && _args[1] !== undefined ? _args[1] : true;
+              if (!shouldReset) {
+                _context.next = 7;
+                break;
+              }
               _context.next = 4;
-              return _App.tApp.reset();
+              return _App.tApp.stop();
             case 4:
+              (0, _App.getLocationManager)().cancelCurrentCalculation();
+              _context.next = 7;
+              return _App.tApp.reset();
+            case 7:
               link = _TUtil.TUtil.getFullLink(link);
               if (this.pageCache[link]) {
-                _context.next = 15;
+                _context.next = 18;
                 break;
               }
               _App.tApp.tRoot.$dom.innerHTML("");
@@ -77,12 +86,12 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
               _App.App.tmodelIdMap = {};
               _App.tApp.tRoot = _App.tApp.tRootFactory();
               this.lastLink = link;
-              _context.next = 13;
+              _context.next = 16;
               return _App.tApp.start();
-            case 13:
-              _context.next = 30;
+            case 16:
+              _context.next = 34;
               break;
-            case 15:
+            case 18:
               _App.tApp.tRoot = this.pageCache[link].tRoot;
               _App.App.oids = this.pageCache[link].oids;
               _App.App.tmodelIdMap = this.pageCache[link].tmodelIdMap;
@@ -93,17 +102,18 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
               visibles.forEach(function (tmodel) {
                 tmodel.visibilityStatus = undefined;
               });
+              _App.tApp.manager.activatePendingTargetsAfterDom(visibles);
               _App.tApp.manager.visibleOidMap = _objectSpread({}, this.pageCache[link].visibleOidMap);
               newVisibles.forEach(function (visible) {
                 _App.tApp.manager.visibleOidMap[visible.oid] = visible;
               });
               window.scrollTo(this.pageCache[link].scrollLeft, this.pageCache[link].scrollTop);
               this.lastLink = link;
-              _context.next = 29;
+              _context.next = 33;
               return _App.tApp.start();
-            case 29:
+            case 33:
               (0, _App.getRunScheduler)().restoreSnapshot(this.pageCache[link].runSnapshot);
-            case 30:
+            case 34:
             case "end":
               return _context.stop();
           }
@@ -118,30 +128,25 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
     key: "openLinkFromHistory",
     value: function () {
       var _openLinkFromHistory = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(state) {
+        var link;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              if (!state.link) {
-                _context2.next = 6;
+              link = state.link || state.browserUrl;
+              if (link) {
+                _context2.next = 3;
                 break;
               }
-              this.onPageClose();
-              _context2.next = 4;
-              return this.openLink(state.link, false);
-            case 4:
-              _context2.next = 10;
-              break;
-            case 6:
-              if (!state.browserUrl) {
-                _context2.next = 10;
-                break;
+              return _context2.abrupt("return");
+            case 3:
+              if (state.browserUrl) {
+                history.replaceState({
+                  link: link
+                }, "", link);
               }
-              history.replaceState({
-                link: state.browserUrl
-              }, "", state.browserUrl);
-              _context2.next = 10;
-              return this.openPage(state.browserUrl);
-            case 10:
+              _context2.next = 6;
+              return this.openLink(link, false);
+            case 6:
             case "end":
               return _context2.stop();
           }
@@ -166,6 +171,7 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
     value: function () {
       var _openLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(link) {
         var updateHistory,
+          runSnapshot,
           html,
           _args3 = arguments;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
@@ -173,32 +179,42 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
             case 0:
               updateHistory = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : true;
               link = _TUtil.TUtil.getFullLink(link);
-              if (this.lastLink) {
-                _App.tApp.tRoot.$dom = _$Dom.$Dom.query('#tgjs-root') ? new _$Dom.$Dom('#tgjs-root') : new _$Dom.$Dom('body');
-                html = _App.tApp.tRoot.$dom.innerHTML();
-                this.onPageClose();
-                this.pageCache[this.lastLink] = {
-                  link: this.lastLink,
-                  html: html,
-                  oids: _objectSpread({}, _App.App.oids),
-                  tmodelIdMap: _objectSpread({}, _App.App.tmodelIdMap),
-                  visibleOidMap: _objectSpread({}, _App.tApp.manager.visibleOidMap),
-                  scrollLeft: _$Dom.$Dom.getWindowScrollLeft() || 0,
-                  scrollTop: _$Dom.$Dom.getWindowScrollTop() || 0,
-                  tRoot: _App.tApp.tRoot,
-                  runSnapshot: (0, _App.getRunScheduler)().getSnapshot()
-                };
+              if (!this.lastLink) {
+                _context3.next = 13;
+                break;
               }
+              runSnapshot = (0, _App.getRunScheduler)().getSnapshot();
+              _context3.next = 6;
+              return _App.tApp.stop();
+            case 6:
+              (0, _App.getLocationManager)().cancelCurrentCalculation();
+              this.onPageClose();
+              _App.tApp.tRoot.$dom = _$Dom.$Dom.query('#tgjs-root') ? new _$Dom.$Dom('#tgjs-root') : new _$Dom.$Dom('body');
+              html = _App.tApp.tRoot.$dom.innerHTML();
+              this.pageCache[this.lastLink] = {
+                link: this.lastLink,
+                html: html,
+                oids: _objectSpread({}, _App.App.oids),
+                tmodelIdMap: _objectSpread({}, _App.App.tmodelIdMap),
+                visibleOidMap: _objectSpread({}, _App.tApp.manager.visibleOidMap),
+                scrollLeft: _$Dom.$Dom.getWindowScrollLeft() || 0,
+                scrollTop: _$Dom.$Dom.getWindowScrollTop() || 0,
+                tRoot: _App.tApp.tRoot,
+                runSnapshot: runSnapshot
+              };
+              _context3.next = 13;
+              return _App.tApp.reset();
+            case 13:
               if (updateHistory) {
                 history.pushState({
                   link: link
                 }, "", link);
               }
-              _context3.next = 6;
-              return this.openPage(link);
-            case 6:
+              _context3.next = 16;
+              return this.openPage(link, false);
+            case 16:
               (0, _App.getRunScheduler)().schedule(0, "pagemanager-processOpenLink");
-            case 7:
+            case 17:
             case "end":
               return _context3.stop();
           }

package/build/RunScheduler.js

@@ -98,19 +98,11 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
       var insertTime = _TUtil.TUtil.now();
       this.delayRun(effectiveDelay, runId, insertTime);
     }
-  }, {
-    key: "timeSchedule",
-    value: function timeSchedule(delay, runId) {
-      if (!_App.tApp.isRunning() || this.resetting) {
-        return;
-      }
-      this.delayRun(delay, runId, _TUtil.TUtil.now());
-    }
   }, {
     key: "run",
     value: function () {
       var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(delay, runId) {
-        var _this$delayProcess;
+        var handedOff;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -133,53 +125,56 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
               this.runId = runId;
               this.runningFlag = true;
               this.runStartTime = _TUtil.TUtil.now();
-              if (_App.tApp.debugLevel === 1) {
-                _TUtil.TUtil.log(true)("Request from: ".concat(runId, " delay: ").concat(delay, " runningStep:").concat(this.runningStep, " dom:").concat(this.domProcessing, " runs:").concat(this.nextRuns.length, " D:").concat((_this$delayProcess = this.delayProcess) === null || _this$delayProcess === void 0 ? void 0 : _this$delayProcess.delay, " events:").concat((0, _App.getEvents)().eventQueue.length));
-              }
+              handedOff = false;
+              _context2.prev = 10;
               if (!(this.phase === 0)) {
-                _context2.next = 16;
+                _context2.next = 17;
                 break;
               }
               (0, _App.getEvents)().captureEvents();
               _App.tApp.targetManager.applyTargetValues((0, _App.tRoot)());
-              _context2.next = 15;
+              _context2.next = 16;
               return (0, _App.getLocationManager)().calculateAll();
-            case 15:
-              this.phase = 1;
             case 16:
+              this.phase = 1;
+            case 17:
               if (!(_TUtil.TUtil.now() - this.runStartTime > FRAME_BUDGET_MS)) {
-                _context2.next = 19;
+                _context2.next = 21;
                 break;
               }
+              handedOff = true;
               this.requestNextSlice(runId);
               return _context2.abrupt("return");
-            case 19:
+            case 21:
               if (this.phase === 1) {
                 this.runningStep = _App.tApp.manager.analyze();
                 this.phase = 2;
               }
               if (!(_TUtil.TUtil.now() - this.runStartTime > FRAME_BUDGET_MS)) {
-                _context2.next = 23;
+                _context2.next = 26;
                 break;
               }
+              handedOff = true;
               this.requestNextSlice(runId);
               return _context2.abrupt("return");
-            case 23:
+            case 26:
               if (this.phase === 2) {
                 (0, _App.getLocationManager)().calculateActivated();
                 _App.tApp.events.resetEventsOnTimeout();
                 this.phase = 3;
               }
               if (!(_TUtil.TUtil.now() - this.runStartTime > FRAME_BUDGET_MS)) {
-                _context2.next = 27;
+                _context2.next = 31;
                 break;
               }
+              handedOff = true;
               this.requestNextSlice(runId);
               return _context2.abrupt("return");
-            case 27:
+            case 31:
               if (this.phase === 3) {
                 if (this.runningStep >= 0) {
                   if (this.domProcessing === 0) {
+                    handedOff = true;
                     this.domOperations(this.runningStep);
                   } else if (!this.rerunId) {
                     this.rerunId = "domrun ".concat(runId);
@@ -191,11 +186,24 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
               if (this.domProcessing === 0) {
                 this.needsRerun();
               }
-            case 30:
+              _context2.next = 40;
+              break;
+            case 36:
+              _context2.prev = 36;
+              _context2.t0 = _context2["catch"](10);
+              this.phase = 0;
+              throw _context2.t0;
+            case 40:
+              _context2.prev = 40;
+              if (!handedOff && this.domProcessing === 0) {
+                this.runningFlag = false;
+              }
+              return _context2.finish(40);
+            case 43:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this);
+        }, _callee2, this, [[10, 36, 40, 43]]);
       }));
       function run(_x, _x2) {
         return _run.apply(this, arguments);
@@ -213,7 +221,7 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
       this.sliceQueued = true;
       requestAnimationFrame(function () {
         _this.sliceQueued = false;
-        _this.delayRun(0, "slice-".concat(runId), _TUtil.TUtil.now());
+        _this.schedule(0, "slice-".concat(runId));
       });
     }
   }, {
@@ -225,35 +233,32 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
         var id = this.rerunId;
         this.rerunId = '';
         this.schedule(0, "rerun-".concat(id));
-        return;
-      }
-      var newDelay = this.nextRuns.length > 0 ? this.nextRuns[0].delay - (_TUtil.TUtil.now() - this.nextRuns[0].insertTime) : undefined;
-      if (newDelay === undefined || (0, _App.getManager)().lists.activeTModels.length > 0 || (0, _App.getManager)().lists.updatingTModels.length > 0 || (0, _App.getManager)().lists.restyle.length > 0 || (0, _App.getManager)().lists.reasyncStyle.length > 0 || (0, _App.getEvents)().eventQueue.length > 0 || (0, _App.getLocationManager)().activatedList.length > 0) {
-        if ((0, _App.getEvents)().eventQueue.length > 0) {
-          this.schedule(1, "events-".concat((0, _App.getEvents)().eventQueue.length));
-        } else if ((0, _App.getLocationManager)().activatedList.length > 0) {
-          this.schedule(1, "getManager-locationManager-activatedList");
-        } else if ((0, _App.getManager)().lists.updatingTModels.length > 0) {
-          this.schedule(1, "getManager-needsRerun-updatingTModels");
-        } else if ((0, _App.getManager)().lists.activeTModels.length > 0) {
-          var activeTModel = (0, _App.getManager)().lists.activeTModels.find(function (tmodel) {
-            return tmodel.targetExecutionCount === 0 || tmodel.activeTargetList.filter(function (target) {
-              return !tmodel.isScheduledPending(target);
-            }).some(function (target) {
-              return tmodel.shouldScheduleRun(target);
+      } else if ((0, _App.getEvents)().eventQueue.length > 0) {
+        this.schedule(0, "events-".concat((0, _App.getEvents)().eventQueue.length));
+      } else {
+        var newDelay = this.nextRuns.length > 0 ? this.nextRuns[0].delay - (_TUtil.TUtil.now() - this.nextRuns[0].insertTime) : undefined;
+        if (newDelay === undefined || (0, _App.getManager)().lists.activeTModels.length > 0 || (0, _App.getManager)().lists.updatingTModels.length > 0 || (0, _App.getManager)().lists.restyle.length > 0 || (0, _App.getManager)().lists.reasyncStyle.length > 0 || (0, _App.getEvents)().eventQueue.length > 0 || (0, _App.getLocationManager)().activatedList.length > 0) {
+          if ((0, _App.getLocationManager)().activatedList.length > 0) {
+            this.schedule(1, "getManager-locationManager-activatedList");
+          } else if ((0, _App.getManager)().lists.updatingTModels.length > 0) {
+            this.schedule(1, "getManager-needsRerun-updatingTModels");
+          } else if ((0, _App.getManager)().lists.activeTModels.length > 0) {
+            var activeTModel = (0, _App.getManager)().lists.activeTModels.find(function (tmodel) {
+              return tmodel.targetExecutionCount === 0 || tmodel.activeTargetList.filter(function (target) {
+                return !tmodel.isScheduledPending(target);
+              }).some(function (target) {
+                return tmodel.shouldScheduleRun(target);
+              });
             });
-          });
-          if (activeTModel) {
-            var delay = !this.activeStartTime || _TUtil.TUtil.now() - this.activeStartTime > 15 ? 1 : 15;
-            this.activeStartTime = _TUtil.TUtil.now();
-            this.schedule(delay, "getManager-needsRerun-".concat(activeTModel.oid, "-").concat(activeTModel.activeTargetList));
+            if (activeTModel) {
+              var delay = !this.activeStartTime || _TUtil.TUtil.now() - this.activeStartTime > 15 ? 1 : 15;
+              this.activeStartTime = _TUtil.TUtil.now();
+              this.schedule(delay, "getManager-needsRerun-".concat(activeTModel.oid, "-").concat(activeTModel.activeTargetList));
+            }
           }
         }
       }
-      if (!this.delayProcess && this.nextRuns.length > 0) {
-        var _delay = Math.max(1, this.nextRuns[0].delay - (_TUtil.TUtil.now() - this.nextRuns[0].insertTime));
-        this.schedule(_delay, "wake-nextRun");
-      }
+      this.executeNextRun();
     }
   }, {
     key: "domOperations",
@@ -262,20 +267,23 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
       this.domProcessing = 1;
       if (runningStep === 10) {
         this.domFixStyles();
-      } else {
-        Promise.all(RunScheduler.domSteps.filter(function (_, index) {
-          return index >= runningStep;
-        }).map(function (step) {
-          return Promise.resolve().then(step);
-        })).then(function () {
-          if ((0, _App.getManager)().lists.restyle.length) {
-            _this2.domFixStyles();
-          } else {
-            _this2.domProcessing = 0;
-            _this2.needsRerun();
-          }
-        });
+        return;
       }
+      Promise.all(RunScheduler.domSteps.filter(function (_, index) {
+        return index >= runningStep;
+      }).map(function (step) {
+        return Promise.resolve().then(step);
+      })).then(function () {
+        if ((0, _App.getManager)().lists.restyle.length) {
+          _this2.domFixStyles();
+          return;
+        }
+        _this2.domProcessing = 0;
+        _this2.needsRerun();
+      }).catch(function () {
+        _this2.domProcessing = 0;
+        _this2.needsRerun();
+      });
     }
   }, {
     key: "domFixStyles",
@@ -283,16 +291,19 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
       var _this3 = this;
       this.domProcessing = 2;
       requestAnimationFrame(function () {
-        (0, _App.getManager)().fixStyles();
-        _this3.domProcessing = 0;
-        _this3.needsRerun();
+        try {
+          (0, _App.getManager)().fixStyles();
+        } finally {
+          _this3.domProcessing = 0;
+          _this3.needsRerun();
+        }
       });
     }
   }, {
     key: "clearDelayProcess",
     value: function clearDelayProcess() {
-      var _this$delayProcess2;
-      if ((_this$delayProcess2 = this.delayProcess) !== null && _this$delayProcess2 !== void 0 && _this$delayProcess2.timeoutId) {
+      var _this$delayProcess;
+      if ((_this$delayProcess = this.delayProcess) !== null && _this$delayProcess !== void 0 && _this$delayProcess.timeoutId) {
         clearTimeout(this.delayProcess.timeoutId);
         this.delayProcess.timeoutId = undefined;
       }
@@ -310,53 +321,78 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
         delay: delay,
         timeoutId: undefined
       };
-      delayProcess.timeoutId = setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              if (!(_this4.delayProcess !== delayProcess)) {
-                _context3.next = 2;
-                break;
-              }
-              return _context3.abrupt("return");
-            case 2:
-              delayProcess.timeoutId = undefined;
-              _context3.next = 5;
-              return _this4.run(delay, runId);
-            case 5:
-              if (_this4.delayProcess === delayProcess) {
+      var execute = /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                if (!(_this4.delayProcess !== delayProcess)) {
+                  _context3.next = 2;
+                  break;
+                }
+                return _context3.abrupt("return");
+              case 2:
+                _this4.clearDelayProcess();
+                _context3.prev = 3;
+                _context3.next = 6;
+                return _this4.run(delay, runId);
+              case 6:
+                _context3.prev = 6;
                 _this4.executeNextRun();
-              }
-            case 6:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3);
-      })), Math.max(0, delay));
+                return _context3.finish(6);
+              case 9:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3, null, [[3,, 6, 9]]);
+        }));
+        return function execute() {
+          return _ref.apply(this, arguments);
+        };
+      }();
       this.delayProcess = delayProcess;
+      delayProcess.timeoutId = setTimeout(execute, delay);
     }
   }, {
     key: "executeNextRun",
     value: function executeNextRun() {
-      var lastNegativeRun = null;
-      var nextValidRun = null;
+      if (this.runningFlag || this.domProcessing > 0) {
+        return;
+      }
+      if (this.delayProcess) {
+        if (this.nextRuns.length > 0) {
+          var nextRun = this.nextRuns[0];
+          var nextRunTime = nextRun.insertTime + nextRun.delay;
+          if (nextRunTime < this.delayProcess.runTime) {
+            clearTimeout(this.delayProcess.timeoutId);
+            var remaining = Math.max(0, this.delayProcess.runTime - _TUtil.TUtil.now());
+            this.insertRun(this.delayProcess.runId, _TUtil.TUtil.now(), remaining);
+            this.delayProcess = undefined;
+          } else {
+            return;
+          }
+        } else {
+          return;
+        }
+      }
+      var runToExecute = null;
       while (this.nextRuns.length > 0) {
-        var nextRun = this.nextRuns.shift();
+        var _nextRun = this.nextRuns.shift();
         var now = _TUtil.TUtil.now();
-        var newDelay = nextRun.delay - (now - nextRun.insertTime);
-        if (newDelay < 0) {
-          lastNegativeRun = nextRun;
+        var newDelay = _nextRun.delay - (now - _nextRun.insertTime);
+        if (newDelay <= 0) {
+          runToExecute = _nextRun;
         } else {
-          lastNegativeRun = null;
-          nextValidRun = nextRun;
+          this.nextRuns.unshift(_nextRun);
           break;
         }
       }
-      if (lastNegativeRun) {
-        this.setDelayProcess(lastNegativeRun.runId, lastNegativeRun.insertTime, lastNegativeRun.delay, _TUtil.TUtil.now(), 0);
-      } else if (nextValidRun) {
+      if (runToExecute) {
+        this.setDelayProcess(runToExecute.runId, runToExecute.insertTime, runToExecute.delay, _TUtil.TUtil.now(), 0);
+      } else if (this.nextRuns.length > 0) {
+        var nextValidRun = this.nextRuns[0];
         var _now = _TUtil.TUtil.now();
-        var _newDelay = Math.max(1, nextValidRun.delay - (_now - nextValidRun.insertTime));
+        var _newDelay = Math.max(0, nextValidRun.delay - (_now - nextValidRun.insertTime));
         this.setDelayProcess(nextValidRun.runId, nextValidRun.insertTime, nextValidRun.delay, _now + _newDelay, _newDelay);
       } else {
         this.clearDelayProcess();
@@ -386,7 +422,13 @@ var RunScheduler = exports.RunScheduler = /*#__PURE__*/function () {
         var r = this.nextRuns[mid];
         var diffTime = r.insertTime + r.delay - (newInsertTime + newDelay);
         if (diffTime === 0) {
-          r.runId += '-' + newRunId;
+          var _r$count;
+          r.count = ((_r$count = r.count) !== null && _r$count !== void 0 ? _r$count : 1) + 1;
+          if (r.runId.length < 500) {
+            r.runId += '-' + newRunId;
+          } else if (!r.runId.endsWith('-...')) {
+            r.runId += '-...';
+          }
           return;
         }
         if (diffTime > 0) {

package/build/TModel.js

@@ -326,6 +326,16 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       }
       return this;
     }
+  }, {
+    key: "exists",
+    value: function exists() {
+      var parent = this.getParent();
+      if (!parent) {
+        return false;
+      }
+      parent.getChildren();
+      return parent.allChildrenMap[this.oid] === this;
+    }
   }, {
     key: "addToParentVisibleChildren",
     value: function addToParentVisibleChildren() {

package/build/TModelManager.js

@@ -92,7 +92,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var tmodel = _step.value;
           lastVisibleMap[tmodel.oid] = undefined;
-          if (!_App.App.tmodelIdMap[tmodel.oid]) {
+          if (!tmodel.exists()) {
             if (tmodel.hasDom()) {
               this.addToInvisibleDom(tmodel);
             }
@@ -181,7 +181,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
         return v !== undefined;
       }).forEach(function (tmodel) {
         if (tmodel.hasDom()) {
-          if (!_App.App.tmodelIdMap[tmodel.oid] || !tmodel.isIncluded()) {
+          if (!tmodel.exists() || !tmodel.isIncluded()) {
             _this.addToInvisibleDom(tmodel);
           }
         }
@@ -467,6 +467,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
           if (pending !== null && pending !== void 0 && pending.size) {
             for (var _i = 0, _arr = _toConsumableArray(pending); _i < _arr.length; _i++) {
               var target = _arr[_i];
+              _TargetUtil.TargetUtil.cleanupTarget(tmodel, target);
               _TargetUtil.TargetUtil.shouldActivateNextTarget(tmodel, target);
             }
           }

package/build/TUtil.js

@@ -86,12 +86,12 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
       while (container && container !== (0, _App.tRoot)()) {
         if (this.shouldClipByAncestor(container)) {
           var ancestorRect = this.getAncestorViewportRect(container);
-          rect = rect ? this.intersectVisibilityRects(rect, ancestorRect) : ancestorRect;
+          rect = rect && !container.allTargetMap['onWindowScroll'] ? this.intersectVisibilityRects(rect, ancestorRect) : ancestorRect;
           if (rect.r <= rect.x || rect.b <= rect.y) {
             break;
           }
         }
-        container = container.getParent();
+        container = container.getRealParent();
       }
       return rect;
     }
@@ -297,7 +297,8 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
           var g = _step.value;
           var gtab = g.isVisible() ? tab + '|  ' : tab + 'x  ';
           if (g.type === 'BI') {
-            console.log("".concat(gtab).concat(g.oid, " v:").concat(g.isVisible(), " x:").concat(Math.floor(g.getX()), " y:").concat(Math.floor(g.getY()), ", absX:").concat(Math.floor(g.absX), ", absY:").concat(Math.floor(g.absY), "  n-e-s:").concat(Math.floor(g.viewport.yNorth), "-").concat(Math.floor(g.viewport.yEast), "-").concat(Math.floor(g.viewport.ySouth), " w:").concat(Math.floor(g.getBaseWidth()), " ww:").concat(Math.floor(g.getContentWidth()), " h:").concat(Math.floor(g.getBaseHeight()), " hh:").concat(Math.floor(g.getContentHeight())));
+            var _g$viewport, _g$viewport2, _g$viewport3;
+            console.log("".concat(gtab).concat(g.oid, " v:").concat(g.isVisible(), " x:").concat(Math.floor(g.getX()), " y:").concat(Math.floor(g.getY()), ", absX:").concat(Math.floor(g.absX), ", absY:").concat(Math.floor(g.absY), "  n-e-s:").concat(Math.floor((_g$viewport = g.viewport) === null || _g$viewport === void 0 ? void 0 : _g$viewport.yNorth), "-").concat(Math.floor((_g$viewport2 = g.viewport) === null || _g$viewport2 === void 0 ? void 0 : _g$viewport2.yEast), "-").concat(Math.floor((_g$viewport3 = g.viewport) === null || _g$viewport3 === void 0 ? void 0 : _g$viewport3.ySouth), " w:").concat(Math.floor(g.getBaseWidth()), " ww:").concat(Math.floor(g.getContentWidth()), " h:").concat(Math.floor(g.getBaseHeight()), " hh:").concat(Math.floor(g.getContentHeight())));
           } else {
             console.log("".concat(gtab).concat(g.oid, " v:").concat(g.isVisible(), " x:").concat(Math.floor(g.getX()), " y:").concat(Math.floor(g.getY()), " absX:").concat(Math.floor(g.absX), ", absY:").concat(Math.floor(g.absY), " w:").concat(Math.floor(g.getWidth()), " h:").concat(Math.floor(g.getHeight()), " hc:").concat(Math.floor(g.getContentHeight())));
           }