targetj 1.0.260 → 1.1.1

package/build/PageManager.js

@@ -1,5 +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; } }
@@ -18,10 +17,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, getRunScheduler } from "./App.js";
 import { DomInit } from "./DomInit.js";
-import { $Dom } from "./$Dom.js";
-import { TargetUtil } from "./TargetUtil.js";
 import { TModelUtil } from "./TModelUtil.js";
 
 /**
@@ -32,8 +29,7 @@ var PageManager = /*#__PURE__*/function () {
   function PageManager() {
     _classCallCheck(this, PageManager);
     this.currentLink = TUtil.getFullLink(document.URL);
-    this.lastCachedLink = undefined;
-    this.pageCache = {};
+    this.pageCache = new Map();
     this.initHistory();
   }
   return _createClass(PageManager, [{
@@ -112,39 +108,42 @@ var PageManager = /*#__PURE__*/function () {
             case 0:
               updateHistory = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : true;
               link = TUtil.getFullLink(link);
-              _context2.next = 4;
-              return this.storePage(this.currentLink);
+              if (!(link === this.currentLink)) {
+                _context2.next = 4;
+                break;
+              }
+              return _context2.abrupt("return");
             case 4:
-              this.lastCachedLink = this.currentLink;
-              _context2.next = 7;
-              return tApp.reset();
-            case 7:
+              _context2.next = 6;
+              return this.storePage(this.currentLink);
+            case 6:
               if (updateHistory) {
                 history.pushState({
                   link: link
                 }, "", link);
               }
               this.currentLink = link;
-              if (this.pageCache[link]) {
-                _context2.next = 17;
+              if (!this.pageCache.has(link)) {
+                _context2.next = 12;
                 break;
               }
+              _context2.next = 11;
+              return this.restorePage(link);
+            case 11:
+              return _context2.abrupt("return");
+            case 12:
+              // Application was already stopped and reset by storePage().
               tApp.tRoot.$dom.innerHTML("");
               App.oids = {};
               App.tmodelIdMap = {};
               tApp.tRoot = tApp.tRootFactory();
-              _context2.next = 16;
-              return tApp.start();
-            case 16:
-              return _context2.abrupt("return");
-            case 17:
-              _context2.next = 19;
-              return this.restorePage(link, {
-                shouldReset: false
+              _context2.next = 18;
+              return tApp.start({
+                skipSchedulerReset: true
               });
-            case 19:
+            case 18:
               getRunScheduler().schedule(0, "pagemanager-processOpenLink");
-            case 20:
+            case 19:
             case "end":
               return _context2.stop();
           }
@@ -160,37 +159,42 @@ 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 runSnapshot;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              runSnapshot = getRunScheduler().getSnapshot();
               link = TUtil.getFullLink(link);
+              runSnapshot = getRunScheduler().getSnapshot();
               _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),
+              this.pageCache.set(link, {
+                html: TModelUtil.getPageDom().innerHTML(),
+                tRoot: tApp.tRoot,
                 oids: _objectSpread({}, App.oids),
                 tmodelIdMap: _objectSpread({}, App.tmodelIdMap),
                 visibleOidMap: _objectSpread({}, tApp.manager.visibleOidMap),
-                scrollLeft: $Dom.getWindowScrollLeft() || 0,
-                scrollTop: $Dom.getWindowScrollTop() || 0,
-                tRoot: tApp.tRoot,
+                scrollLeft: window.scrollX,
+                scrollTop: window.scrollY,
                 runSnapshot: runSnapshot
-              };
-              return _context3.abrupt("return", this.pageCache[link]);
-            case 10:
+              });
+              _context3.next = 9;
+              return tApp.reset({
+                preserveCachedModels: true,
+                skipSchedulerReset: true
+              });
+            case 9:
             case "end":
               return _context3.stop();
           }
@@ -205,77 +209,43 @@ 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 cached, visibles, newVisibles, restored;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              cache = this.pageCache[link];
-              if (cache) {
+              cached = this.pageCache.get(TUtil.getFullLink(link));
+              if (cached) {
                 _context4.next = 3;
                 break;
               }
               return _context4.abrupt("return", false);
             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 = cached.tRoot;
+              App.oids = _objectSpread({}, cached.oids);
+              App.tmodelIdMap = _objectSpread({}, cached.tmodelIdMap);
+              TModelUtil.getPageDom().innerHTML(cached.html);
               tApp.tRoot.$dom = TModelUtil.getRootDom();
-              visibles = Object.values(cache.visibleOidMap);
+              visibles = Object.values(cached.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
+              visibles.forEach(function (tmodel) {
+                tmodel.visibilityStatus = undefined;
+              });
+              tApp.manager.visibleOidMap = _objectSpread({}, cached.visibleOidMap);
+              newVisibles.forEach(function (tmodel) {
+                tApp.manager.visibleOidMap[tmodel.oid] = tmodel;
               });
-              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:
+              restored = _toConsumableArray(new Set([].concat(visibles, _toConsumableArray(newVisibles))));
+              tApp.manager.activatePendingTargetsAfterDom(restored);
+              window.scrollTo(cached.scrollLeft, cached.scrollTop);
+              tApp.tRoot.markLayoutDirty("pageCacheRestore");
+              _context4.next = 19;
+              return tApp.start({
+                skipSchedulerReset: true
+              });
+            case 19:
+              getRunScheduler().restoreSnapshot(cached.runSnapshot);
               return _context4.abrupt("return", true);
-            case 33:
+            case 21:
             case "end":
               return _context4.stop();
           }
@@ -286,24 +256,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 };