targetj 1.0.259 → 1.1.0

package/build/LocationManager.js

@@ -28,7 +28,7 @@ import { TargetData } from "./TargetData.js";
 import { TModelUtil } from "./TModelUtil.js";
 import { ScheduleUtil } from "./ScheduleUtil.js";
 import { TargetExecutor } from "./TargetExecutor.js";
-import { getTargetManager, tRoot, getEvents, getAnimationManager } from "./App.js";
+import { getTargetManager, tRoot, getEvents, getAnimationManager, getManager } from "./App.js";
 
 /*
  * It calculates the locations and dimensions of all objects and triggers the calculation of all targets. 
@@ -85,6 +85,7 @@ var LocationManager = /*#__PURE__*/function () {
     value: function () {
       var _calculateAll = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var budgetMs,
+          continueCalculation,
           calcEpoch,
           stack,
           ctx,
@@ -93,18 +94,21 @@ var LocationManager = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               budgetMs = _args.length > 0 && _args[0] !== undefined ? _args[0] : 8;
+              continueCalculation = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
               calcEpoch = this.calcEpoch;
               if (!this.calcBusy) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
               this.calcQueued = true;
               return _context.abrupt("return");
-            case 5:
+            case 6:
               this.calcBusy = true;
-              this.hasLocationList.length = 0;
-              this.hasLocationMap = {};
-              this.locationListStats = [];
+              if (!continueCalculation) {
+                this.hasLocationList.length = 0;
+                this.hasLocationMap = {};
+                this.locationListStats = [];
+              }
               stack = [{
                 container: tRoot(),
                 stage: 'init',
@@ -117,24 +121,24 @@ var LocationManager = /*#__PURE__*/function () {
                 sliceStart: TUtil.now(),
                 calcEpoch: calcEpoch
               };
-              _context.next = 13;
+              _context.next = 12;
               return this.processStack(stack, ctx);
-            case 13:
+            case 12:
               if (!(ctx.calcEpoch !== this.calcEpoch)) {
-                _context.next = 15;
+                _context.next = 14;
                 break;
               }
               return _context.abrupt("return");
-            case 15:
+            case 14:
               this.processAfterStack();
               this.calcBusy = false;
               if (!this.calcQueued) {
-                _context.next = 20;
+                _context.next = 19;
                 break;
               }
               this.calcQueued = false;
-              return _context.abrupt("return", this.calculateAll(budgetMs));
-            case 20:
+              return _context.abrupt("return", this.calculateAll(budgetMs, true));
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -162,17 +166,22 @@ var LocationManager = /*#__PURE__*/function () {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               processAfterAllChildren = function processAfterAllChildren(job) {
+                var _container$markLayout, _container$requestPar;
                 var container = job.container;
                 container.adjustViewport();
                 container.calcContentWidthHeight();
+                (_container$markLayout = container.markLayoutComplete) === null || _container$markLayout === void 0 || _container$markLayout.call(container, job.layoutEpoch);
+                _this.retryPendingTargets(container);
+                (_container$requestPar = container.requestParticleRender) === null || _container$requestPar === void 0 || _container$requestPar.call(container);
+                container.visibilityDirty = false;
               };
               resetDirtyLayout = function resetDirtyLayout(job) {
                 var children = job.children,
                   index = job.index;
                 var child = children[index];
                 if (child) {
-                  if (child.getDirtyLayout() && child.isComplete() && !child.hasChildren()) {
-                    child.removeLayoutDirty(child, child.dirtyLayout.oids ? Object.keys(child.dirtyLayout.oids) : undefined);
+                  if (child.getDirtyLayout() && child.isComplete()) {
+                    child.removeLayoutDirty(child);
                   }
                 }
                 job.stage = 'afterChild';
@@ -236,9 +245,31 @@ var LocationManager = /*#__PURE__*/function () {
                   }
                 }
                 viewport.setCurrentChild(child);
-                if (!child.getDirtyLayout() && !child.currentStatus && child.activeTargetList.length === 0) {
+                if (child.isLightweightChild) {
+                  _this.calcNextLightweightLocation(child, container, viewport);
+                  job.index++;
+                  return;
+                }
+                if (!child.getDirtyLayout() && !child.visibilityDirty && !container.visibilityDirty && !child.hasEventDirty() && !child.currentStatus && child.activeTargetList.length === 0) {
+                  var previousAbsX = child.absX;
+                  var previousAbsY = child.absY;
                   _this.calcNextLocation(child, container, viewport);
+                  var positionChanged = child.absX !== previousAbsX || child.absY !== previousAbsY;
+                  var needsRefresh = child.visibilityDirty || child.hasChildren() && child.isVisible() && positionChanged;
+                  if (child.getDirtyLayout()) {
+                    _this.calcQueued = true;
+                  }
                   job.index++;
+                  if (needsRefresh && child.hasChildren()) {
+                    child.visibilityDirty = true;
+                    stack.push({
+                      container: child,
+                      stage: 'init',
+                      children: [],
+                      viewport: undefined,
+                      index: 0
+                    });
+                  }
                   return;
                 }
                 if (child.isDomIsland()) {
@@ -270,13 +301,18 @@ var LocationManager = /*#__PURE__*/function () {
                 if (!TModelUtil.isYDefined(child)) {
                   child.actualValues.y = child.y;
                 }
+                _this.catchupNoDomLayoutTargets(child);
                 if (!child.isDomIsland()) {
                   child.calcAbsolutePosition(child.getX(), child.getY());
                 }
                 if (!child.excludeDefaultStyling()) {
                   _this.fixLocation(child, prevX, prevY);
                 }
+                var wasVisible = child.isVisible();
                 _this.calculateVisibility(child);
+                if (container.visibilityDirty && child.hasChildren() && (wasVisible || child.isVisible())) {
+                  child.visibilityDirty = true;
+                }
                 if (((_child$getDirtyLayout = child.getDirtyLayout()) === null || _child$getDirtyLayout === void 0 ? void 0 : _child$getDirtyLayout.count) > 0) {
                   var _child$getDirtyLayout2, _child$getDirtyLayout3;
                   _this.locationListStats.push("".concat(child.oid, "|").concat((_child$getDirtyLayout2 = child.getDirtyLayout()) === null || _child$getDirtyLayout2 === void 0 ? void 0 : _child$getDirtyLayout2.count, "|").concat((_child$getDirtyLayout3 = child.getDirtyLayout()) === null || _child$getDirtyLayout3 === void 0 ? void 0 : _child$getDirtyLayout3.lastKey));
@@ -327,6 +363,7 @@ var LocationManager = /*#__PURE__*/function () {
               job = stack[stack.length - 1];
               if (job.stage === 'init') {
                 container = job.container;
+                job.layoutEpoch = container.layoutEpoch;
                 allChildrenList = this.calcChildren(container);
                 if (container.childrenUpdateFlag) {
                   container.childrenUpdateFlag = false;
@@ -413,10 +450,20 @@ var LocationManager = /*#__PURE__*/function () {
     key: "calcNextLocation",
     value: function calcNextLocation(child, container, viewport) {
       var _child$styleTargetMap;
+      if (child.isLightweightChild) {
+        this.calcNextLightweightLocation(child, container, viewport);
+        return;
+      }
+      var previousX = child.x;
+      var previousY = child.y;
       viewport.setLocation();
+      var overflowed = false;
       if (viewport.isOverflow()) {
+        overflowed = true;
         viewport.overflow();
         viewport.setLocation();
+      }
+      if (overflowed && (child.x !== previousX || child.y !== previousY)) {
         child.markLayoutDirty('overflow');
       }
       if (child.isIncluded()) {
@@ -433,6 +480,7 @@ var LocationManager = /*#__PURE__*/function () {
       if (!TModelUtil.isYDefined(child)) {
         child.actualValues.y = child.y;
       }
+      this.catchupNoDomLayoutTargets(child);
       if (!child.isDomIsland()) {
         child.calcAbsolutePosition(child.getX(), child.getY());
       }
@@ -444,6 +492,11 @@ var LocationManager = /*#__PURE__*/function () {
         this.addToLocationList(child);
       }
       this.calculateVisibility(child);
+      var registered = getManager().visibleOidMap[child.oid];
+      var shouldBeRegistered = child.isVisible() && child.isIncluded();
+      if (shouldBeRegistered ? registered !== child : registered !== undefined) {
+        this.addToLocationList(child);
+      }
       if (child.isInFlow()) {
         if (TUtil.isNumber(child.val('appendNewLine'))) {
           viewport.appendNewLine();
@@ -453,6 +506,34 @@ var LocationManager = /*#__PURE__*/function () {
         container.calcContentWidthHeight();
       }
     }
+  }, {
+    key: "calcNextLightweightLocation",
+    value: function calcNextLightweightLocation(child, container, viewport) {
+      viewport.setLocation();
+      if (viewport.isOverflow()) {
+        viewport.overflow();
+        viewport.setLocation();
+      }
+      if (!TModelUtil.isXDefined(child)) {
+        child.actualValues.x = child.x;
+      }
+      if (!TModelUtil.isYDefined(child)) {
+        child.actualValues.y = child.y;
+      }
+      this.catchupNoDomLayoutTargets(child);
+      child.calcAbsolutePosition(child.getX(), child.getY());
+      var visible = child.calcVisibility();
+      child.actualValues.isVisible = visible;
+      if (visible && child.isInFlow()) {
+        container.visibleChildren.push(child);
+      }
+      if (TUtil.isNumber(child.val("appendNewLine"))) {
+        viewport.appendNewLine();
+      } else {
+        viewport.nextLocation();
+      }
+      container.calcContentWidthHeight();
+    }
   }, {
     key: "calculateVisibility",
     value: function calculateVisibility(tmodel) {
@@ -482,10 +563,11 @@ var LocationManager = /*#__PURE__*/function () {
       }
       if (tmodel.isNowVisible || tmodel.isNowInvisible) {
         tmodel.markLayoutDirty('isNowVisible');
-      }
-      if (tmodel.isNowInvisible) {
         this.addToLocationList(tmodel);
       }
+      if (tmodel.isNowVisible && tmodel.hasChildren()) {
+        tmodel.visibilityDirty = true;
+      }
       ScheduleUtil.pauseResumeSchedule(tmodel);
       if (tmodel.type !== 'BI' && tmodel.isVisible() && tmodel.isInFlow() && tmodel.getParent()) {
         tmodel.getParent().visibleChildren.push(tmodel);
@@ -533,19 +615,58 @@ var LocationManager = /*#__PURE__*/function () {
         }
       }
       if (tmodel.isNowVisible || tmodel.hasDomNow) {
-        var pending = tmodel.pendingTargets;
-        if (pending) {
-          for (var _i = 0, _arr = _toConsumableArray(pending); _i < _arr.length; _i++) {
-            var _key2 = _arr[_i];
-            TargetUtil.cleanupTarget(tmodel, _key2);
-            TargetUtil.shouldActivateNextTarget(tmodel, _key2);
-          }
-        }
+        this.retryPendingTargets(tmodel);
       }
       tmodel.isNowVisible = false;
       tmodel.hasDomNow = false;
       tmodel.targetExecutionCount++;
     }
+  }, {
+    key: "retryPendingTargets",
+    value: function retryPendingTargets(tmodel) {
+      var pending = tmodel.pendingTargets;
+      if (!(pending !== null && pending !== void 0 && pending.size)) {
+        return;
+      }
+      for (var _i = 0, _arr = _toConsumableArray(pending); _i < _arr.length; _i++) {
+        var _tmodel$pendingTarget;
+        var key = _arr[_i];
+        if (!((_tmodel$pendingTarget = tmodel.pendingTargets) !== null && _tmodel$pendingTarget !== void 0 && _tmodel$pendingTarget.has(key))) {
+          continue;
+        }
+        TargetUtil.cleanupTarget(tmodel, key);
+        TargetUtil.shouldActivateNextTarget(tmodel, key);
+      }
+    }
+  }, {
+    key: "catchupNoDomLayoutTargets",
+    value: function catchupNoDomLayoutTargets(tmodel) {
+      var _tmodel$noDomUpdating;
+      if (!((_tmodel$noDomUpdating = tmodel.noDomUpdatingTargets) !== null && _tmodel$noDomUpdating !== void 0 && _tmodel$noDomUpdating.size)) {
+        return;
+      }
+      if (tmodel.isLightweightChild) {
+        tmodel.catchupNoDomLayoutTargets();
+        return;
+      }
+      var _iterator2 = _createForOfIteratorHelper(tmodel.noDomUpdatingTargets),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var key = _step2.value;
+          if (!TargetData.affectsVisibility(key)) {
+            continue;
+          }
+          getTargetManager().catchupTargetByElapsed(tmodel, key, {
+            fireEnd: false
+          });
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
   }, {
     key: "checkExternalEvents",
     value: function checkExternalEvents(tmodel) {
@@ -553,20 +674,20 @@ var LocationManager = /*#__PURE__*/function () {
       if ((externalEventMap === null || externalEventMap === void 0 ? void 0 : externalEventMap.size) > 0) {
         var eventTargets = [];
         var eventMap = TargetData.allEventMap;
-        var _iterator2 = _createForOfIteratorHelper(externalEventMap),
-          _step2;
+        var _iterator3 = _createForOfIteratorHelper(externalEventMap),
+          _step3;
         try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var _step2$value = _slicedToArray(_step2.value, 1),
-              targetName = _step2$value[0];
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var _step3$value = _slicedToArray(_step3.value, 1),
+              targetName = _step3$value[0];
             if (eventMap[targetName](tmodel)) {
               eventTargets.push(tmodel.allTargetMap[targetName]);
             }
           }
         } catch (err) {
-          _iterator2.e(err);
+          _iterator3.e(err);
         } finally {
-          _iterator2.f();
+          _iterator3.f();
         }
         this.runEventTargets(tmodel, eventTargets);
       }
@@ -578,20 +699,20 @@ var LocationManager = /*#__PURE__*/function () {
       var eventMap = TargetData.internalEventMap;
       var internalEventMap = tmodel.internalEventMap;
       if ((internalEventMap === null || internalEventMap === void 0 ? void 0 : internalEventMap.size) > 0) {
-        var _iterator3 = _createForOfIteratorHelper(internalEventMap),
-          _step3;
+        var _iterator4 = _createForOfIteratorHelper(internalEventMap),
+          _step4;
         try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            var _step3$value = _slicedToArray(_step3.value, 1),
-              targetName = _step3$value[0];
+          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+            var _step4$value = _slicedToArray(_step4.value, 1),
+              targetName = _step4$value[0];
             if (eventMap[targetName](tmodel)) {
               eventTargets.push(tmodel.allTargetMap[targetName]);
             }
           }
         } catch (err) {
-          _iterator3.e(err);
+          _iterator4.e(err);
         } finally {
-          _iterator3.f();
+          _iterator4.f();
         }
       }
       this.runEventTargets(tmodel, eventTargets);

package/build/PageManager.js

@@ -1,14 +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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
-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 _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
@@ -18,10 +8,8 @@ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r),
 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 { TUtil } from "./TUtil.js";
-import { tApp, App, getRunScheduler, getLocationManager, getEvents } from "./App.js";
+import { tApp, App, getLocationManager, getEvents } from "./App.js";
 import { DomInit } from "./DomInit.js";
-import { $Dom } from "./$Dom.js";
-import { TargetUtil } from "./TargetUtil.js";
 import { TModelUtil } from "./TModelUtil.js";
 
 /**
@@ -33,7 +21,6 @@ var PageManager = /*#__PURE__*/function () {
     _classCallCheck(this, PageManager);
     this.currentLink = TUtil.getFullLink(document.URL);
     this.lastCachedLink = undefined;
-    this.pageCache = {};
     this.initHistory();
   }
   return _createClass(PageManager, [{
@@ -116,35 +103,34 @@ var PageManager = /*#__PURE__*/function () {
               return this.storePage(this.currentLink);
             case 4:
               this.lastCachedLink = this.currentLink;
-              _context2.next = 7;
-              return tApp.reset();
-            case 7:
               if (updateHistory) {
                 history.pushState({
                   link: link
                 }, "", link);
               }
               this.currentLink = link;
-              if (this.pageCache[link]) {
-                _context2.next = 17;
+              if (!tApp.stateManager.has(this.getStateKey(link))) {
+                _context2.next = 11;
                 break;
               }
+              _context2.next = 10;
+              return this.restorePage(link);
+            case 10:
+              return _context2.abrupt("return");
+            case 11:
+              _context2.next = 13;
+              return tApp.stop();
+            case 13:
+              _context2.next = 15;
+              return tApp.reset();
+            case 15:
               tApp.tRoot.$dom.innerHTML("");
               App.oids = {};
               App.tmodelIdMap = {};
               tApp.tRoot = tApp.tRootFactory();
-              _context2.next = 16;
+              _context2.next = 21;
               return tApp.start();
-            case 16:
-              return _context2.abrupt("return");
-            case 17:
-              _context2.next = 19;
-              return this.restorePage(link, {
-                shouldReset: false
-              });
-            case 19:
-              getRunScheduler().schedule(0, "pagemanager-processOpenLink");
-            case 20:
+            case 21:
             case "end":
               return _context2.stop();
           }
@@ -160,37 +146,28 @@ var PageManager = /*#__PURE__*/function () {
     value: function back() {
       return history.back();
     }
+  }, {
+    key: "getStateKey",
+    value: function getStateKey(link) {
+      return "page:".concat(TUtil.getFullLink(link));
+    }
   }, {
     key: "storePage",
     value: function () {
       var _storePage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(link) {
-        var runSnapshot, $pageDom, html;
+        var key, checkpoint;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              runSnapshot = getRunScheduler().getSnapshot();
               link = TUtil.getFullLink(link);
-              _context3.next = 4;
-              return tApp.stop();
-            case 4:
-              getLocationManager().cancelCurrentCalculation();
               this.onPageClose();
-              $pageDom = TModelUtil.getPageDom();
-              html = $pageDom.innerHTML();
-              this.pageCache[link] = {
-                link: link,
-                html: html,
-                domState: TModelUtil.captureDomState($pageDom),
-                oids: _objectSpread({}, App.oids),
-                tmodelIdMap: _objectSpread({}, App.tmodelIdMap),
-                visibleOidMap: _objectSpread({}, tApp.manager.visibleOidMap),
-                scrollLeft: $Dom.getWindowScrollLeft() || 0,
-                scrollTop: $Dom.getWindowScrollTop() || 0,
-                tRoot: tApp.tRoot,
-                runSnapshot: runSnapshot
-              };
-              return _context3.abrupt("return", this.pageCache[link]);
-            case 10:
+              key = this.getStateKey(link);
+              _context3.next = 5;
+              return tApp.stateManager.store(key);
+            case 5:
+              checkpoint = _context3.sent;
+              return _context3.abrupt("return", checkpoint);
+            case 7:
             case "end":
               return _context3.stop();
           }
@@ -205,77 +182,19 @@ var PageManager = /*#__PURE__*/function () {
     key: "restorePage",
     value: function () {
       var _restorePage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(link) {
-        var cache, $pageDom, visibles, newVisibles, restored, _iterator, _step, tmodel, _iterator2, _step2, _tmodel, $restoredPageDom;
+        var key;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              cache = this.pageCache[link];
-              if (cache) {
+              key = this.getStateKey(link);
+              if (!tApp.stateManager.has(key)) {
                 _context4.next = 3;
                 break;
               }
-              return _context4.abrupt("return", false);
+              return _context4.abrupt("return", tApp.stateManager.restore(key));
             case 3:
-              tApp.tRoot = cache.tRoot;
-              App.oids = _objectSpread({}, cache.oids);
-              App.tmodelIdMap = _objectSpread({}, cache.tmodelIdMap);
-              $pageDom = TModelUtil.getPageDom();
-              $pageDom.innerHTML(cache.html);
-              TModelUtil.restoreDomState($pageDom, cache.domState);
-              tApp.tRoot.$dom = TModelUtil.getRootDom();
-              visibles = Object.values(cache.visibleOidMap);
-              newVisibles = DomInit.initCacheDoms(visibles);
-              restored = TUtil.uniqueTModels([].concat(visibles, _toConsumableArray(newVisibles)));
-              _iterator = _createForOfIteratorHelper(restored);
-              try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  tmodel = _step.value;
-                  tmodel.visibilityStatus = undefined;
-                  if (!tmodel.hasDom()) {
-                    tmodel.markLayoutDirty('pageRestoreNoDom');
-                  }
-                }
-              } catch (err) {
-                _iterator.e(err);
-              } finally {
-                _iterator.f();
-              }
-              TargetUtil.convertAnimatingTargetsToUpdating(restored);
-              tApp.manager.visibleOidMap = {};
-              _iterator2 = _createForOfIteratorHelper(restored);
-              try {
-                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                  _tmodel = _step2.value;
-                  if (_tmodel.isIncluded()) {
-                    tApp.manager.visibleOidMap[_tmodel.oid] = _tmodel;
-                  }
-                }
-              } catch (err) {
-                _iterator2.e(err);
-              } finally {
-                _iterator2.f();
-              }
-              tApp.manager.activatePendingTargetsAfterDom(restored, {
-                restoredDoneTargets: true
-              });
-              tApp.tRoot.markLayoutDirty("pageRestore");
-              _context4.next = 23;
-              return TModelUtil.restoreScroll(cache);
-            case 23:
-              _context4.next = 25;
-              return tApp.start();
-            case 25:
-              getRunScheduler().restoreSnapshot(cache.runSnapshot);
-              $restoredPageDom = TModelUtil.getPageDom();
-              TModelUtil.restoreDomState($restoredPageDom, cache.domState);
-              _context4.next = 30;
-              return TModelUtil.restoreScroll(cache);
-            case 30:
-              _context4.next = 32;
-              return TModelUtil.restoreDomInteractionState($restoredPageDom, cache.domState);
-            case 32:
-              return _context4.abrupt("return", true);
-            case 33:
+              return _context4.abrupt("return", false);
+            case 4:
             case "end":
               return _context4.stop();
           }
@@ -286,24 +205,6 @@ var PageManager = /*#__PURE__*/function () {
       }
       return restorePage;
     }()
-  }, {
-    key: "getCachedPage",
-    value: function getCachedPage() {
-      var link = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.lastCachedLink;
-      if (!link) {
-        return undefined;
-      }
-      link = TUtil.getFullLink(link);
-      return this.pageCache[link];
-    }
-  }, {
-    key: "getCachedTModel",
-    value: function getCachedTModel(id) {
-      var _page$tmodelIdMap;
-      var link = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.lastCachedLink;
-      var page = this.getCachedPage(link);
-      return page === null || page === void 0 || (_page$tmodelIdMap = page.tmodelIdMap) === null || _page$tmodelIdMap === void 0 ? void 0 : _page$tmodelIdMap[id];
-    }
   }]);
 }();
 export { PageManager };