@inertiajs/core 2.2.6 → 2.2.8

package/dist/index.esm.js

@@ -51,6 +51,9 @@ var firePrefetchingEvent = (visit) => {
   return fireEvent("prefetching", { detail: { visit } });
 };
 
+// src/history.ts
+import { isEqual } from "lodash-es";
+
 // src/sessionStorage.ts
 var SessionStorage = class {
   static set(key, value) {
@@ -260,18 +263,24 @@ var Scroll = class {
     }
     window.requestAnimationFrame(() => {
       this.restoreDocument();
-      this.regions().forEach((region, index) => {
-        const scrollPosition = scrollRegions[index];
-        if (!scrollPosition) {
-          return;
-        }
-        if (typeof region.scrollTo === "function") {
-          region.scrollTo(scrollPosition.left, scrollPosition.top);
-        } else {
-          region.scrollTop = scrollPosition.top;
-          region.scrollLeft = scrollPosition.left;
-        }
-      });
+      this.restoreScrollRegions(scrollRegions);
+    });
+  }
+  static restoreScrollRegions(scrollRegions) {
+    if (typeof window === "undefined") {
+      return;
+    }
+    this.regions().forEach((region, index) => {
+      const scrollPosition = scrollRegions[index];
+      if (!scrollPosition) {
+        return;
+      }
+      if (typeof region.scrollTo === "function") {
+        region.scrollTo(scrollPosition.left, scrollPosition.top);
+      } else {
+        region.scrollTop = scrollPosition.top;
+        region.scrollLeft = scrollPosition.left;
+      }
     });
   }
   static restoreDocument() {
@@ -352,7 +361,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());
@@ -396,6 +405,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 {
@@ -434,7 +450,9 @@ var CurrentPage = class {
         return;
       }
       page2.rememberedState ?? (page2.rememberedState = {});
-      const location = typeof window !== "undefined" ? window.location : new URL(page2.url);
+      const isServer2 = typeof window === "undefined";
+      const location = !isServer2 ? window.location : new URL(page2.url);
+      const scrollRegions = !isServer2 && preserveScroll ? history.getScrollRegions() : [];
       replace = replace || isSameUrlWithoutHash(hrefToUrl(page2.url), location);
       return new Promise((resolve) => {
         replace ? history.replaceState(page2, () => resolve(null)) : history.pushState(page2, () => resolve(null));
@@ -450,7 +468,9 @@ var CurrentPage = class {
         }
         this.isFirstPageLoad = false;
         return this.swap({ component, page: page2, preserveState }).then(() => {
-          if (!preserveScroll) {
+          if (preserveScroll) {
+            window.requestAnimationFrame(() => Scroll.restoreScrollRegions(scrollRegions));
+          } else {
             Scroll.reset();
           }
           if (this.pendingDeferredProps && this.pendingDeferredProps.component === page2.component && this.pendingDeferredProps.url === page2.url) {
@@ -582,15 +602,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();
       });
     });
   }
@@ -628,7 +646,10 @@ var History = class {
         if (!window.history.state?.page) {
           return;
         }
-        this.doReplaceState({
+        if (isEqual(this.getScrollRegions(), scrollRegions)) {
+          return;
+        }
+        return this.doReplaceState({
           page: window.history.state.page,
           scrollRegions
         });
@@ -641,7 +662,10 @@ var History = class {
         if (!window.history.state?.page) {
           return;
         }
-        this.doReplaceState({
+        if (isEqual(this.getDocumentScrollPosition(), scrollRegion)) {
+          return;
+        }
+        return this.doReplaceState({
           page: window.history.state.page,
           documentScrollPosition: scrollRegion
         });
@@ -666,31 +690,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;
@@ -2174,10 +2198,45 @@ var elementInViewport = (el) => {
   return verticallyVisible && horizontallyVisible;
 };
 var getScrollableParent = (element) => {
+  const allowsVerticalScroll = (el) => {
+    const computedStyle = window.getComputedStyle(el);
+    if (["scroll", "overlay"].includes(computedStyle.overflowY)) {
+      return true;
+    }
+    if (computedStyle.overflowY !== "auto") {
+      return false;
+    }
+    if (["visible", "clip"].includes(computedStyle.overflowX)) {
+      return true;
+    }
+    return hasDimensionConstraint(computedStyle.maxHeight, el.style.height);
+  };
+  const allowsHorizontalScroll = (el) => {
+    const computedStyle = window.getComputedStyle(el);
+    if (["scroll", "overlay"].includes(computedStyle.overflowX)) {
+      return true;
+    }
+    if (computedStyle.overflowX !== "auto") {
+      return false;
+    }
+    if (["visible", "clip"].includes(computedStyle.overflowY)) {
+      return true;
+    }
+    return hasDimensionConstraint(computedStyle.maxWidth, el.style.width);
+  };
+  const hasDimensionConstraint = (computedMaxDimension, inlineStyleDimension) => {
+    if (computedMaxDimension && computedMaxDimension !== "none" && computedMaxDimension !== "0px") {
+      return true;
+    }
+    if (inlineStyleDimension && inlineStyleDimension !== "auto" && inlineStyleDimension !== "0") {
+      return true;
+    }
+    return false;
+  };
   let parent = element?.parentElement;
   while (parent) {
-    const overflowY = window.getComputedStyle(parent).overflowY;
-    if (overflowY === "auto" || overflowY === "scroll") {
+    const allowsScroll = allowsVerticalScroll(parent) || allowsHorizontalScroll(parent);
+    if (window.getComputedStyle(parent).display !== "contents" && allowsScroll) {
       return parent;
     }
     parent = parent.parentElement;
@@ -2679,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) => {
@@ -2689,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;
@@ -2702,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) => {
@@ -3398,6 +3460,8 @@ export {
   setupProgress,
   shouldIntercept,
   shouldNavigate,
+  urlHasProtocol,
+  urlToString,
   urlWithoutHash,
   useInfiniteScroll
 };