inertiax-core 11.0.29 → 11.0.31

package/dist/index.js

@@ -369,7 +369,8 @@ var History = class {
     this.setCurrentState(page2, frameId);
     queue.add(() => {
       return this.getPageData(page2).then((data) => {
-        const doPush = () => this.doPushState({ page: data }, browserUrl ?? page2.url, frameId).then(() => cb?.());
+        const fallbackUrl = frameId === DEFAULT_FRAME_ID ? page2.url : window.location.href;
+        const doPush = () => this.doPushState({ page: data }, browserUrl ?? fallbackUrl, frameId).then(() => cb?.());
         if (isChromeIOS) {
           return new Promise((resolve) => {
             setTimeout(() => doPush().then(resolve));
@@ -468,7 +469,8 @@ var History = class {
     this.setCurrentState(page2, frameId);
     queue.add(() => {
       return this.getPageData(page2).then((data) => {
-        const doReplace = () => this.doReplaceState({ page: data }, browserUrl ?? page2.url, frameId).then(() => cb?.());
+        const fallbackUrl = frameId === DEFAULT_FRAME_ID ? page2.url : window.location.href;
+        const doReplace = () => this.doReplaceState({ page: data }, browserUrl ?? fallbackUrl, frameId).then(() => cb?.());
         if (isChromeIOS) {
           return new Promise((resolve) => {
             setTimeout(() => doReplace().then(resolve));
@@ -1378,7 +1380,16 @@ var CurrentFramePage = class {
     resolveComponent,
     onFlash
   }) {
-    this.page = { ...initialPage, flash: initialPage.flash ?? {}, rescuedProps: initialPage.rescuedProps ?? [] };
+    const prevRemembered = this.page?.rememberedState ?? {};
+    this.page = {
+      ...initialPage,
+      flash: initialPage.flash ?? {},
+      rescuedProps: initialPage.rescuedProps ?? [],
+      rememberedState: {
+        ...prevRemembered,
+        ...initialPage.rememberedState ?? {}
+      }
+    };
     this.swapComponent = swapComponent;
     this.resolveComponent = resolveComponent;
     this.onFlashCallback = onFlash;
@@ -1417,7 +1428,7 @@ var CurrentFramePage = class {
       if (componentId !== this.componentId) {
         return;
       }
-      page2.rememberedState ??= {};
+      page2.rememberedState = { ...this.page?.rememberedState ?? {}, ...page2.rememberedState ?? {} };
       const isServer3 = typeof window === "undefined";
       const location = !isServer3 ? window.location : new URL(page2.url);
       const currentFrameUrl = hrefToUrl(this.page?.url ?? page2.url);
@@ -3390,10 +3401,6 @@ var Router = class {
     this.removePageshowHandler?.();
     this.removePopstateHandler = void 0;
     this.removePageshowHandler = void 0;
-    if (this.frameId !== "_top") {
-      page.deleteFrame(this.frameId);
-      history.deleteFrame(this.frameId);
-    }
   }
   poll(interval, requestOptions = {}, options = {}) {
     return polls.add(