@inertiajs/core 2.2.5 → 2.2.7

package/dist/index.js

@@ -45,6 +45,8 @@ __export(index_exports, {
   setupProgress: () => setupProgress,
   shouldIntercept: () => shouldIntercept,
   shouldNavigate: () => shouldNavigate,
+  urlHasProtocol: () => urlHasProtocol,
+  urlToString: () => urlToString,
   urlWithoutHash: () => urlWithoutHash,
   useInfiniteScroll: () => useInfiniteScroll
 });
@@ -404,7 +406,7 @@ var transformUrlAndData = (href, data, method, forceFormData, queryStringArrayFo
 };
 function mergeDataIntoQueryString(method, href, data, qsArrayFormat = "brackets") {
   const hasDataForQueryString = method === "get" && !isFormData(data) && Object.keys(data).length > 0;
-  const hasHost = /^[a-z][a-z0-9+.-]*:\/\//i.test(href.toString());
+  const hasHost = urlHasProtocol(href.toString());
   const hasAbsolutePath = hasHost || href.toString().startsWith("/") || href.toString() === "";
   const hasRelativePath = !hasAbsolutePath && !href.toString().startsWith("#") && !href.toString().startsWith("?");
   const hasRelativePathWithDotPrefix = /^[.]{1,2}([/]|$)/.test(href.toString());
@@ -448,6 +450,13 @@ var isSameUrlWithoutHash = (url1, url2) => {
 function isUrlMethodPair(href) {
   return href !== null && typeof href === "object" && href !== void 0 && "url" in href && "method" in href;
 }
+function urlHasProtocol(url) {
+  return /^[a-z][a-z0-9+.-]*:\/\//i.test(url);
+}
+function urlToString(url, absolute) {
+  const urlObj = typeof url === "string" ? hrefToUrl(url) : url;
+  return absolute ? `${urlObj.protocol}//${urlObj.host}${urlObj.pathname}${urlObj.search}${urlObj.hash}` : `${urlObj.pathname}${urlObj.search}${urlObj.hash}`;
+}
 
 // src/page.ts
 var CurrentPage = class {
@@ -634,15 +643,13 @@ var History = class {
     this.current = page2;
     queue.add(() => {
       return this.getPageData(page2).then((data) => {
-        const doPush = () => {
-          this.doPushState({ page: data }, page2.url);
-          cb && cb();
-        };
+        const doPush = () => this.doPushState({ page: data }, page2.url).then(() => cb?.());
         if (isChromeIOS) {
-          setTimeout(doPush);
-        } else {
-          doPush();
+          return new Promise((resolve) => {
+            setTimeout(() => doPush().then(resolve));
+          });
         }
+        return doPush();
       });
     });
   }
@@ -680,7 +687,7 @@ var History = class {
         if (!window.history.state?.page) {
           return;
         }
-        this.doReplaceState({
+        return this.doReplaceState({
           page: window.history.state.page,
           scrollRegions
         });
@@ -693,7 +700,7 @@ var History = class {
         if (!window.history.state?.page) {
           return;
         }
-        this.doReplaceState({
+        return this.doReplaceState({
           page: window.history.state.page,
           documentScrollPosition: scrollRegion
         });
@@ -718,31 +725,31 @@ var History = class {
     this.current = page2;
     queue.add(() => {
       return this.getPageData(page2).then((data) => {
-        const doReplace = () => {
-          this.doReplaceState({ page: data }, page2.url);
-          cb && cb();
-        };
+        const doReplace = () => this.doReplaceState({ page: data }, page2.url).then(() => cb?.());
         if (isChromeIOS) {
-          setTimeout(doReplace);
-        } else {
-          doReplace();
+          return new Promise((resolve) => {
+            setTimeout(() => doReplace().then(resolve));
+          });
         }
+        return doReplace();
       });
     });
   }
   doReplaceState(data, url) {
-    window.history.replaceState(
-      {
-        ...data,
-        scrollRegions: data.scrollRegions ?? window.history.state?.scrollRegions,
-        documentScrollPosition: data.documentScrollPosition ?? window.history.state?.documentScrollPosition
-      },
-      "",
-      url
+    return Promise.resolve().then(
+      () => window.history.replaceState(
+        {
+          ...data,
+          scrollRegions: data.scrollRegions ?? window.history.state?.scrollRegions,
+          documentScrollPosition: data.documentScrollPosition ?? window.history.state?.documentScrollPosition
+        },
+        "",
+        url
+      )
     );
   }
   doPushState(data, url) {
-    window.history.pushState(data, "", url);
+    return Promise.resolve().then(() => window.history.pushState(data, "", url));
   }
   getState(key, defaultValue) {
     return this.current?.[key] ?? defaultValue;
@@ -2430,33 +2437,37 @@ var useInfiniteScrollData = (options) => {
     }
     throw new Error(`The page object does not contain a scroll prop named "${options.getPropName()}".`);
   };
-  const { previousPage, nextPage, currentPage: lastLoadedPage } = getScrollPropFromCurrentPage();
   const state = {
-    component: page.get().component,
+    component: null,
     loading: false,
-    previousPage,
-    nextPage,
-    lastLoadedPage,
+    previousPage: null,
+    nextPage: null,
+    lastLoadedPage: null,
     requestCount: 0
   };
+  const resetState = () => {
+    const scrollProp = getScrollPropFromCurrentPage();
+    state.component = page.get().component;
+    state.loading = false;
+    state.previousPage = scrollProp.previousPage;
+    state.nextPage = scrollProp.nextPage;
+    state.lastLoadedPage = scrollProp.currentPage;
+    state.requestCount = 0;
+  };
   const getRememberKey = () => `inertia:infinite-scroll-data:${options.getPropName()}`;
-  const rememberedState = router.restore(getRememberKey());
-  if (rememberedState && typeof rememberedState === "object") {
-    state.previousPage = rememberedState.previousPage;
-    state.nextPage = rememberedState.nextPage;
-    state.lastLoadedPage = rememberedState.lastLoadedPage;
-    state.requestCount = rememberedState.requestCount || 0;
+  if (typeof window !== "undefined") {
+    resetState();
+    const rememberedState = router.restore(getRememberKey());
+    if (rememberedState && typeof rememberedState === "object") {
+      state.previousPage = rememberedState.previousPage;
+      state.nextPage = rememberedState.nextPage;
+      state.lastLoadedPage = rememberedState.lastLoadedPage;
+      state.requestCount = rememberedState.requestCount || 0;
+    }
   }
   const removeEventListener = router.on("success", (event) => {
-    if (state.component !== event.detail.page.component) {
-      return;
-    }
-    const scrollProp = getScrollPropFromCurrentPage();
-    if (scrollProp.reset) {
-      state.previousPage = scrollProp.previousPage;
-      state.nextPage = scrollProp.nextPage;
-      state.lastLoadedPage = scrollProp.currentPage;
-      state.requestCount = 0;
+    if (state.component === event.detail.page.component && getScrollPropFromCurrentPage().reset) {
+      resetState();
     }
   });
   const getScrollPropKeyForSide = (side) => {
@@ -2727,6 +2738,7 @@ var useInfiniteScrollElementManager = (options) => {
 var queue3 = new Queue();
 var initialUrl;
 var payloadUrl;
+var initialUrlWasAbsolute = null;
 var useInfiniteScrollQueryString = (options) => {
   let enabled = true;
   const queuePageUpdate = (page2) => {
@@ -2737,8 +2749,10 @@ var useInfiniteScrollQueryString = (options) => {
           return resolve();
         }
         if (!initialUrl || !payloadUrl) {
-          initialUrl = new URL(window.location.href);
-          payloadUrl = new URL(window.location.href);
+          const currentPageUrl = page.get().url;
+          initialUrl = hrefToUrl(currentPageUrl);
+          payloadUrl = hrefToUrl(currentPageUrl);
+          initialUrlWasAbsolute = urlHasProtocol(currentPageUrl);
         }
         const pageName = options.getPageName();
         const searchParams = payloadUrl.searchParams;
@@ -2750,14 +2764,14 @@ var useInfiniteScrollQueryString = (options) => {
         setTimeout(() => resolve());
       });
     }).finally(() => {
-      if (enabled && initialUrl && payloadUrl && initialUrl.href !== payloadUrl.href) {
+      if (enabled && initialUrl && payloadUrl && initialUrl.href !== payloadUrl.href && initialUrlWasAbsolute !== null) {
         router.replace({
-          url: payloadUrl.toString(),
+          url: urlToString(payloadUrl, initialUrlWasAbsolute),
           preserveScroll: true,
           preserveState: true
         });
       }
-      initialUrl = payloadUrl = null;
+      initialUrl = payloadUrl = initialUrlWasAbsolute = null;
     });
   };
   const onItemIntersected = debounce((itemElement) => {