inertiax-core 11.0.19 → 11.0.22

package/dist/index.js

@@ -419,53 +419,37 @@ var History = class {
   decryptPageData(pageData) {
     return pageData instanceof ArrayBuffer ? decryptHistory(pageData) : Promise.resolve(pageData);
   }
-  saveScrollPositions(scrollRegions, frameId = DEFAULT_FRAME_ID) {
-    queue.add(() => {
-      return Promise.resolve().then(() => {
-        const frameState = this.getFrameState(frameId);
-        if (!frameState?.page) {
-          return;
-        }
-        if (isEqual(this.getScrollRegions(frameId), scrollRegions)) {
-          return;
-        }
-        return this.doReplaceState(
-          {
-            page: frameState.page,
-            scrollRegions
-          },
-          void 0,
-          frameId
-        );
-      });
-    });
+  saveScrollPositions(scrollRegions) {
+    if (isEqual(this.getScrollRegions(), scrollRegions)) {
+      return;
+    }
+    const nextState = {
+      ...window.history.state,
+      scrollRegions
+    };
+    try {
+      window.history.replaceState(nextState, "");
+    } catch (e) {
+      if (!(e instanceof Error && e.name === "QuotaExceededError")) {
+        console.error("[Inertia] Failed to save scroll positions:", e);
+      }
+    }
   }
-  saveDocumentScrollPosition(scrollRegion, frameId = DEFAULT_FRAME_ID) {
-    queue.add(() => {
-      return Promise.resolve().then(() => {
-        const frameState = this.getFrameState(frameId);
-        if (!frameState?.page) {
-          return;
-        }
-        if (isEqual(this.getDocumentScrollPosition(frameId), scrollRegion)) {
-          return;
-        }
-        return this.doReplaceState(
-          {
-            page: frameState.page,
-            documentScrollPosition: scrollRegion
-          },
-          void 0,
-          frameId
-        );
-      });
-    });
+  saveDocumentScrollPosition(scrollRegion) {
+    if (isEqual(this.getDocumentScrollPosition(), scrollRegion)) {
+      return;
+    }
+    const nextState = {
+      ...window.history.state,
+      documentScrollPosition: scrollRegion
+    };
+    window.history.replaceState(nextState, "");
   }
-  getScrollRegions(frameId = DEFAULT_FRAME_ID) {
-    return this.getFrameState(frameId)?.scrollRegions || [];
+  getScrollRegions() {
+    return this.getWindowState().scrollRegions || [];
   }
-  getDocumentScrollPosition(frameId = DEFAULT_FRAME_ID) {
-    return this.getFrameState(frameId)?.documentScrollPosition || { top: 0, left: 0 };
+  getDocumentScrollPosition() {
+    return this.getWindowState().documentScrollPosition || { top: 0, left: 0 };
   }
   replaceState(page2, cb = null, frameId = DEFAULT_FRAME_ID, browserUrl) {
     if (isEqual(this.getCurrent(frameId), page2)) {
@@ -515,15 +499,12 @@ var History = class {
   doReplaceState(data, url, frameId = DEFAULT_FRAME_ID) {
     return this.withThrottleProtection(() => {
       const existing = this.getWindowState();
-      const previous = existing.frames[frameId] ?? {};
       const nextState = {
         ...window.history.state,
         frames: {
           ...existing.frames,
           [frameId]: {
-            page: data.page,
-            scrollRegions: data.scrollRegions ?? previous.scrollRegions ?? [],
-            documentScrollPosition: data.documentScrollPosition ?? previous.documentScrollPosition ?? { top: 0, left: 0 }
+            page: data.page
           }
         }
       };
@@ -533,15 +514,12 @@ var History = class {
   doPushState(data, url, frameId = DEFAULT_FRAME_ID) {
     return this.withThrottleProtection(() => {
       const existing = this.getWindowState();
-      const previous = existing.frames[frameId] ?? {};
       const nextState = {
         ...window.history.state,
         frames: {
           ...existing.frames,
           [frameId]: {
-            page: data.page,
-            scrollRegions: data.scrollRegions ?? previous.scrollRegions ?? [],
-            documentScrollPosition: data.documentScrollPosition ?? previous.documentScrollPosition ?? { top: 0, left: 0 }
+            page: data.page
           }
         }
       };
@@ -1042,8 +1020,8 @@ var isServer2 = typeof window === "undefined";
 var isFirefox = !isServer2 && /Firefox/i.test(window.navigator.userAgent);
 var DEFAULT_FRAME_ID2 = "_top";
 var Scroll = class {
-  static save(frameId = "_top") {
-    history.saveScrollPositions(this.getScrollRegions(), frameId);
+  static save() {
+    history.saveScrollPositions(this.getScrollRegions());
   }
   static getScrollRegions() {
     return Array.from(this.regions()).map((region) => ({
@@ -1097,7 +1075,6 @@ var Scroll = class {
         region.scrollLeft = 0;
       }
     });
-    this.save(frameId);
     if (isTopFrame) {
       this.scrollToAnchor(frameId);
     }
@@ -1118,21 +1095,11 @@ var Scroll = class {
     if (isServer2) {
       return;
     }
-    const isTopFrame = frameId === DEFAULT_FRAME_ID2;
     window.requestAnimationFrame(() => {
-      if (isTopFrame) {
+      if (frameId === DEFAULT_FRAME_ID2) {
         this.restoreDocument(frameId);
-        this.restoreScrollRegions(scrollRegions);
-      } else {
-        this.regionsForFrame(frameId).forEach((region) => {
-          if (typeof region.scrollTo === "function") {
-            region.scrollTo(0, 0);
-          } else {
-            region.scrollTop = 0;
-            region.scrollLeft = 0;
-          }
-        });
       }
+      this.restoreScrollRegions(scrollRegions);
     });
   }
   static restoreScrollRegions(scrollRegions) {
@@ -1156,7 +1123,7 @@ var Scroll = class {
     if (frameId !== DEFAULT_FRAME_ID2) {
       return;
     }
-    const scrollPosition = history.getDocumentScrollPosition(frameId);
+    const scrollPosition = history.getDocumentScrollPosition();
     window.scrollTo(scrollPosition.left, scrollPosition.top);
   }
   static onScroll(event) {
@@ -1165,11 +1132,11 @@ var Scroll = class {
       this.save();
     }
   }
-  static onWindowScroll(frameId = "_top") {
+  static onWindowScroll() {
     history.saveDocumentScrollPosition({
       top: window.scrollY,
       left: window.scrollX
-    }, frameId);
+    });
   }
 };
 
@@ -1455,7 +1422,7 @@ var CurrentFramePage = class {
       const location = !isServer3 ? window.location : new URL(page2.url);
       const currentFrameUrl = hrefToUrl(this.page?.url ?? page2.url);
       const comparisonTarget = updateBrowserUrl ? location : currentFrameUrl;
-      const scrollRegions = !isServer3 && preserveScroll ? Scroll.getScrollRegions() : [];
+      const scrollRegions = !isServer3 ? Scroll.getScrollRegions() : [];
       replace = replace || isSameUrlWithoutHash(hrefToUrl(page2.url), comparisonTarget);
       const pageForHistory = { ...page2, flash: {} };
       const browserUrl = !isServer3 && !updateBrowserUrl ? window.location.href : page2.url;
@@ -1869,7 +1836,7 @@ var InitialVisit = class {
     if (!navigationType.isBackForward() || !history.browserHasHistoryEntry(frameId)) {
       return false;
     }
-    const scrollRegions = history.getScrollRegions(frameId);
+    const scrollRegions = history.getScrollRegions();
     history.decrypt(null, frameId).then((data) => {
       const visitId = uid();
       page.set(data, { preserveScroll: true, preserveState: true, visitId }, frameId).then(() => {
@@ -1896,7 +1863,7 @@ var InitialVisit = class {
     history.decrypt(page.get(frameId), frameId).then(() => {
       const visitId = uid();
       const rememberedState = history.getState(history.rememberedState, {}, frameId);
-      const scrollRegions = history.getScrollRegions(frameId);
+      const scrollRegions = history.getScrollRegions();
       page.remember(rememberedState, frameId);
       page.set(page.get(frameId), {
         preserveScroll: locationVisit.preserveScroll,
@@ -1920,7 +1887,7 @@ var InitialVisit = class {
     const visitId = uid();
     page.set(page.get(frameId), { preserveScroll: true, preserveState: true, visitId }, frameId).then(() => {
       if (navigationType.isReload()) {
-        Scroll.restore(history.getScrollRegions(frameId), frameId);
+        Scroll.restore(history.getScrollRegions(), frameId);
       } else {
         Scroll.scrollToAnchor(frameId);
       }
@@ -3304,8 +3271,11 @@ var Router = class {
         return;
       }
       this.cancelAll({ prefetch: false });
+      if (!page.isCleared(this.frameId) && isEqual4(page.getWithoutFlashData(this.frameId), data)) {
+        return;
+      }
       page.setQuietly(data, { preserveState: this.frameId === DEFAULT_FRAME_ID4 }, this.frameId).then(() => {
-        Scroll.restore(history.getScrollRegions(this.frameId), this.frameId);
+        Scroll.restore(history.getScrollRegions(), this.frameId);
         fireNavigateEvent(page.get(this.frameId));
         const pendingDeferred = {};
         const pageProps = page.get(this.frameId).props;
@@ -3464,9 +3434,6 @@ var Router = class {
     if (options.optimistic) {
       this.applyOptimisticUpdate(options.optimistic, events);
     }
-    if (!page.isCleared(this.frameId) && !visit.preserveUrl) {
-      Scroll.save(this.frameId);
-    }
     const requestParams = {
       ...visit,
       ...events