inertiax-core 11.0.7 → 11.0.9

package/dist/index.js

@@ -1029,6 +1029,7 @@ var getInitialPageFromDOM = (id) => {
 // src/scroll.ts
 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);
@@ -1048,7 +1049,10 @@ var Scroll = class {
     }
     window.scrollTo(0, 0);
   }
-  static reset() {
+  static reset(frameId = DEFAULT_FRAME_ID2) {
+    if (frameId !== DEFAULT_FRAME_ID2) {
+      return;
+    }
     const anchorHash = isServer2 ? null : window.location.hash;
     if (!anchorHash) {
       this.scrollToTop();
@@ -1061,10 +1065,13 @@ var Scroll = class {
         region.scrollLeft = 0;
       }
     });
-    this.save();
-    this.scrollToAnchor();
+    this.save(frameId);
+    this.scrollToAnchor(frameId);
   }
-  static scrollToAnchor() {
+  static scrollToAnchor(frameId = DEFAULT_FRAME_ID2) {
+    if (frameId !== DEFAULT_FRAME_ID2) {
+      return;
+    }
     const anchorHash = isServer2 ? null : window.location.hash;
     if (anchorHash) {
       setTimeout(() => {
@@ -1077,6 +1084,9 @@ var Scroll = class {
     if (isServer2) {
       return;
     }
+    if (frameId !== DEFAULT_FRAME_ID2) {
+      return;
+    }
     window.requestAnimationFrame(() => {
       this.restoreDocument(frameId);
       this.restoreScrollRegions(scrollRegions);
@@ -1100,6 +1110,9 @@ var Scroll = class {
     });
   }
   static restoreDocument(frameId = "_top") {
+    if (frameId !== DEFAULT_FRAME_ID2) {
+      return;
+    }
     const scrollPosition = history.getDocumentScrollPosition(frameId);
     window.scrollTo(scrollPosition.left, scrollPosition.top);
   }
@@ -1330,7 +1343,7 @@ function urlToString(url, absolute) {
 }
 
 // src/page.ts
-var DEFAULT_FRAME_ID2 = "_top";
+var DEFAULT_FRAME_ID3 = "_top";
 var CurrentFramePage = class {
   constructor(frameId) {
     this.frameId = frameId;
@@ -1367,8 +1380,8 @@ var CurrentFramePage = class {
   }
   set(page2, {
     replace = false,
-    updateBrowserUrl = this.frameId === DEFAULT_FRAME_ID2,
-    preserveScroll = this.frameId !== DEFAULT_FRAME_ID2,
+    updateBrowserUrl = this.frameId === DEFAULT_FRAME_ID3,
+    preserveScroll = false,
     preserveState = false,
     viewTransition = false
   } = {}) {
@@ -1432,7 +1445,7 @@ var CurrentFramePage = class {
           if (preserveScroll) {
             window.requestAnimationFrame(() => Scroll.restoreScrollRegions(scrollRegions));
           } else {
-            Scroll.reset();
+            Scroll.reset(this.frameId);
           }
           if (this.pendingDeferredProps && this.pendingDeferredProps.component === page2.component && this.pendingDeferredProps.url === page2.url) {
             eventHandler.fireInternalEvent("loadDeferredProps", this.frameId, this.pendingDeferredProps.deferredProps);
@@ -1590,94 +1603,94 @@ var CurrentFramePage = class {
 };
 var PageStore = class {
   frames = /* @__PURE__ */ new Map();
-  forFrame(frameId = DEFAULT_FRAME_ID2) {
+  forFrame(frameId = DEFAULT_FRAME_ID3) {
     if (!this.frames.has(frameId)) {
       this.frames.set(frameId, new CurrentFramePage(frameId));
     }
     return this.frames.get(frameId);
   }
-  init(params, frameId = DEFAULT_FRAME_ID2) {
+  init(params, frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).init(params);
   }
-  set(page2, options, frameId = DEFAULT_FRAME_ID2) {
+  set(page2, options, frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).set(page2, options);
   }
-  setQuietly(page2, options, frameId = DEFAULT_FRAME_ID2) {
+  setQuietly(page2, options, frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).setQuietly(page2, options);
   }
-  clear(frameId = DEFAULT_FRAME_ID2) {
+  clear(frameId = DEFAULT_FRAME_ID3) {
     this.forFrame(frameId).clear();
   }
-  isCleared(frameId = DEFAULT_FRAME_ID2) {
+  isCleared(frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).isCleared();
   }
-  get(frameId = DEFAULT_FRAME_ID2) {
+  get(frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).get();
   }
-  getWithoutFlashData(frameId = DEFAULT_FRAME_ID2) {
+  getWithoutFlashData(frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).getWithoutFlashData();
   }
-  hasOnceProps(frameId = DEFAULT_FRAME_ID2) {
+  hasOnceProps(frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).hasOnceProps();
   }
-  merge(data, frameId = DEFAULT_FRAME_ID2) {
+  merge(data, frameId = DEFAULT_FRAME_ID3) {
     this.forFrame(frameId).merge(data);
   }
-  setPropsQuietly(props, frameId = DEFAULT_FRAME_ID2) {
+  setPropsQuietly(props, frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).setPropsQuietly(props);
   }
-  setFlash(flash, frameId = DEFAULT_FRAME_ID2) {
+  setFlash(flash, frameId = DEFAULT_FRAME_ID3) {
     this.forFrame(frameId).setFlash(flash);
   }
-  setUrlHash(hash, frameId = DEFAULT_FRAME_ID2) {
+  setUrlHash(hash, frameId = DEFAULT_FRAME_ID3) {
     this.forFrame(frameId).setUrlHash(hash);
   }
-  remember(data, frameId = DEFAULT_FRAME_ID2) {
+  remember(data, frameId = DEFAULT_FRAME_ID3) {
     this.forFrame(frameId).remember(data);
   }
-  swap(args, frameId = DEFAULT_FRAME_ID2) {
+  swap(args, frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).swap(args);
   }
-  resolve(component, page2, frameId = DEFAULT_FRAME_ID2) {
+  resolve(component, page2, frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).resolve(component, page2);
   }
-  nextOptimisticId(frameId = DEFAULT_FRAME_ID2) {
+  nextOptimisticId(frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).nextOptimisticId();
   }
-  setBaseline(key, value, frameId = DEFAULT_FRAME_ID2) {
+  setBaseline(key, value, frameId = DEFAULT_FRAME_ID3) {
     this.forFrame(frameId).setBaseline(key, value);
   }
-  updateBaseline(key, value, frameId = DEFAULT_FRAME_ID2) {
+  updateBaseline(key, value, frameId = DEFAULT_FRAME_ID3) {
     this.forFrame(frameId).updateBaseline(key, value);
   }
-  hasBaseline(key, frameId = DEFAULT_FRAME_ID2) {
+  hasBaseline(key, frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).hasBaseline(key);
   }
-  registerOptimistic(id, callback, frameId = DEFAULT_FRAME_ID2) {
+  registerOptimistic(id, callback, frameId = DEFAULT_FRAME_ID3) {
     this.forFrame(frameId).registerOptimistic(id, callback);
   }
-  unregisterOptimistic(id, frameId = DEFAULT_FRAME_ID2) {
+  unregisterOptimistic(id, frameId = DEFAULT_FRAME_ID3) {
     this.forFrame(frameId).unregisterOptimistic(id);
   }
-  replayOptimistics(frameId = DEFAULT_FRAME_ID2) {
+  replayOptimistics(frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).replayOptimistics();
   }
-  pendingOptimisticCount(frameId = DEFAULT_FRAME_ID2) {
+  pendingOptimisticCount(frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).pendingOptimisticCount();
   }
-  clearOptimisticState(frameId = DEFAULT_FRAME_ID2) {
+  clearOptimisticState(frameId = DEFAULT_FRAME_ID3) {
     this.forFrame(frameId).clearOptimisticState();
   }
-  isTheSame(page2, frameId = DEFAULT_FRAME_ID2) {
+  isTheSame(page2, frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).isTheSame(page2);
   }
-  on(event, callback, frameId = DEFAULT_FRAME_ID2) {
+  on(event, callback, frameId = DEFAULT_FRAME_ID3) {
     return this.forFrame(frameId).on(event, callback);
   }
-  fireEventsFor(event, frameId = DEFAULT_FRAME_ID2) {
+  fireEventsFor(event, frameId = DEFAULT_FRAME_ID3) {
     this.forFrame(frameId).fireEventsFor(event);
   }
-  mergeOncePropsIntoResponse(response, options = {}, frameId = DEFAULT_FRAME_ID2) {
+  mergeOncePropsIntoResponse(response, options = {}, frameId = DEFAULT_FRAME_ID3) {
     this.forFrame(frameId).mergeOncePropsIntoResponse(response, options);
   }
   deleteFrame(frameId) {
@@ -1846,7 +1859,7 @@ var InitialVisit = class {
       if (navigationType.isReload()) {
         Scroll.restore(history.getScrollRegions(frameId), frameId);
       } else {
-        Scroll.scrollToAnchor();
+        Scroll.scrollToAnchor(frameId);
       }
       this.fireInitialEvents(frameId);
     });
@@ -3089,7 +3102,7 @@ var RequestStream = class {
 // src/router.ts
 var noop = () => {
 };
-var DEFAULT_FRAME_ID3 = "_top";
+var DEFAULT_FRAME_ID4 = "_top";
 var Router = class {
   frameId;
   syncRequestStream = new RequestStream({
@@ -3162,7 +3175,7 @@ var Router = class {
       const url = hrefToUrl(page2.url);
       url.hash = window.location.hash;
       history.replaceState({ ...page.getWithoutFlashData(this.frameId), url: url.href }, null, this.frameId);
-      Scroll.reset();
+      Scroll.reset(this.frameId);
       return;
     }
     if (!history.isValidState(state, this.frameId)) {
@@ -3178,7 +3191,7 @@ var Router = class {
         return;
       }
       this.cancelAll({ prefetch: false });
-      page.setQuietly(data, { preserveState: this.frameId === DEFAULT_FRAME_ID3 }, this.frameId).then(() => {
+      page.setQuietly(data, { preserveState: this.frameId === DEFAULT_FRAME_ID4 }, this.frameId).then(() => {
         Scroll.restore(history.getScrollRegions(this.frameId), this.frameId);
         fireNavigateEvent(page.get(this.frameId));
         const pendingDeferred = {};
@@ -3539,7 +3552,7 @@ var Router = class {
     const preserveState = RequestParams.resolvePreserveOption(params.preserveState ?? false, page2);
     return page.set(page2, {
       replace,
-      updateBrowserUrl: params.updateBrowserUrl ?? this.frameId === DEFAULT_FRAME_ID3,
+      updateBrowserUrl: params.updateBrowserUrl ?? this.frameId === DEFAULT_FRAME_ID4,
       preserveScroll,
       preserveState,
       viewTransition
@@ -3613,7 +3626,7 @@ var Router = class {
       method: "get",
       data: {},
       replace: false,
-      updateBrowserUrl: this.frameId === DEFAULT_FRAME_ID3,
+      updateBrowserUrl: this.frameId === DEFAULT_FRAME_ID4,
       preserveScroll: false,
       preserveState: false,
       only: [],