@inertiajs/core 2.2.6 → 2.2.8

package/dist/index.js

@@ -45,13 +45,15 @@ __export(index_exports, {
   setupProgress: () => setupProgress,
   shouldIntercept: () => shouldIntercept,
   shouldNavigate: () => shouldNavigate,
+  urlHasProtocol: () => urlHasProtocol,
+  urlToString: () => urlToString,
   urlWithoutHash: () => urlWithoutHash,
   useInfiniteScroll: () => useInfiniteScroll
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/router.ts
-var import_lodash_es3 = require("lodash-es");
+var import_lodash_es4 = require("lodash-es");
 
 // src/debounce.ts
 function debounce(fn, delay) {
@@ -103,6 +105,9 @@ var firePrefetchingEvent = (visit) => {
   return fireEvent("prefetching", { detail: { visit } });
 };
 
+// src/history.ts
+var import_lodash_es = require("lodash-es");
+
 // src/sessionStorage.ts
 var SessionStorage = class {
   static set(key, value) {
@@ -312,18 +317,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() {
@@ -404,7 +415,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 +459,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 {
@@ -486,7 +504,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));
@@ -502,7 +522,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) {
@@ -634,15 +656,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 +700,10 @@ var History = class {
         if (!window.history.state?.page) {
           return;
         }
-        this.doReplaceState({
+        if ((0, import_lodash_es.isEqual)(this.getScrollRegions(), scrollRegions)) {
+          return;
+        }
+        return this.doReplaceState({
           page: window.history.state.page,
           scrollRegions
         });
@@ -693,7 +716,10 @@ var History = class {
         if (!window.history.state?.page) {
           return;
         }
-        this.doReplaceState({
+        if ((0, import_lodash_es.isEqual)(this.getDocumentScrollPosition(), scrollRegion)) {
+          return;
+        }
+        return this.doReplaceState({
           page: window.history.state.page,
           documentScrollPosition: scrollRegion
         });
@@ -718,31 +744,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;
@@ -1021,7 +1047,7 @@ var Polls = class {
 var polls = new Polls();
 
 // src/prefetched.ts
-var import_lodash_es = require("lodash-es");
+var import_lodash_es2 = require("lodash-es");
 
 // src/objectUtils.ts
 var objectsAreEqual = (obj1, obj2, excludeKeys) => {
@@ -1238,7 +1264,7 @@ var PrefetchedRequests = class {
     }) || null;
   }
   withoutPurposePrefetchHeader(params) {
-    const newParams = (0, import_lodash_es.cloneDeep)(params);
+    const newParams = (0, import_lodash_es2.cloneDeep)(params);
     if (newParams.headers["Purpose"] === "prefetch") {
       delete newParams.headers["Purpose"];
     }
@@ -1414,7 +1440,7 @@ var RequestParams = class _RequestParams {
 };
 
 // src/response.ts
-var import_lodash_es2 = require("lodash-es");
+var import_lodash_es3 = require("lodash-es");
 
 // src/modal.ts
 var modal_default = {
@@ -1624,8 +1650,8 @@ var Response = class _Response {
     const propsToDeepMerge = pageResponse.deepMergeProps || [];
     const matchPropsOn = pageResponse.matchPropsOn || [];
     const mergeProp = (prop, shouldAppend) => {
-      const currentProp = (0, import_lodash_es2.get)(page.get().props, prop);
-      const incomingProp = (0, import_lodash_es2.get)(pageResponse.props, prop);
+      const currentProp = (0, import_lodash_es3.get)(page.get().props, prop);
+      const incomingProp = (0, import_lodash_es3.get)(pageResponse.props, prop);
       if (Array.isArray(incomingProp)) {
         const newArray = this.mergeOrMatchItems(
           currentProp || [],
@@ -1634,13 +1660,13 @@ var Response = class _Response {
           matchPropsOn,
           shouldAppend
         );
-        (0, import_lodash_es2.set)(pageResponse.props, prop, newArray);
+        (0, import_lodash_es3.set)(pageResponse.props, prop, newArray);
       } else if (typeof incomingProp === "object" && incomingProp !== null) {
         const newObject = {
           ...currentProp || {},
           ...incomingProp
         };
-        (0, import_lodash_es2.set)(pageResponse.props, prop, newObject);
+        (0, import_lodash_es3.set)(pageResponse.props, prop, newObject);
       }
     };
     propsToAppend.forEach((prop) => mergeProp(prop, true));
@@ -2065,8 +2091,8 @@ var Router = class {
       preserveScroll: true,
       preserveState: true,
       props(currentProps) {
-        const newValue = typeof value === "function" ? value((0, import_lodash_es3.get)(currentProps, name), currentProps) : value;
-        return (0, import_lodash_es3.set)((0, import_lodash_es3.cloneDeep)(currentProps), name, newValue);
+        const newValue = typeof value === "function" ? value((0, import_lodash_es4.get)(currentProps, name), currentProps) : value;
+        return (0, import_lodash_es4.set)((0, import_lodash_es4.cloneDeep)(currentProps), name, newValue);
       },
       ...options || {}
     });
@@ -2226,10 +2252,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;
@@ -2260,7 +2321,7 @@ var getElementsInViewportFromCollection = (referenceElement, elements) => {
 };
 
 // src/formObject.ts
-var import_lodash_es4 = require("lodash-es");
+var import_lodash_es5 = require("lodash-es");
 function undotKey(key) {
   if (!key.includes(".")) {
     return key;
@@ -2295,15 +2356,15 @@ function formDataToObject(source) {
     const path = parseKey(undotKey(key));
     if (path[path.length - 1] === "") {
       const arrayPath = path.slice(0, -1);
-      const existing = (0, import_lodash_es4.get)(form, arrayPath);
+      const existing = (0, import_lodash_es5.get)(form, arrayPath);
       if (Array.isArray(existing)) {
         existing.push(value);
       } else {
-        (0, import_lodash_es4.set)(form, arrayPath, [value]);
+        (0, import_lodash_es5.set)(form, arrayPath, [value]);
       }
       continue;
     }
-    (0, import_lodash_es4.set)(form, path, value);
+    (0, import_lodash_es5.set)(form, path, value);
   }
   return form;
 }
@@ -2731,6 +2792,7 @@ var useInfiniteScrollElementManager = (options) => {
 var queue3 = new Queue();
 var initialUrl;
 var payloadUrl;
+var initialUrlWasAbsolute = null;
 var useInfiniteScrollQueryString = (options) => {
   let enabled = true;
   const queuePageUpdate = (page2) => {
@@ -2741,8 +2803,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;
@@ -2754,14 +2818,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) => {