@inertiajs/core 2.2.7 → 2.2.8

package/dist/index.js

@@ -53,7 +53,7 @@ __export(index_exports, {
 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) {
@@ -105,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) {
@@ -314,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() {
@@ -495,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));
@@ -511,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) {
@@ -687,6 +700,9 @@ var History = class {
         if (!window.history.state?.page) {
           return;
         }
+        if ((0, import_lodash_es.isEqual)(this.getScrollRegions(), scrollRegions)) {
+          return;
+        }
         return this.doReplaceState({
           page: window.history.state.page,
           scrollRegions
@@ -700,6 +716,9 @@ var History = class {
         if (!window.history.state?.page) {
           return;
         }
+        if ((0, import_lodash_es.isEqual)(this.getDocumentScrollPosition(), scrollRegion)) {
+          return;
+        }
         return this.doReplaceState({
           page: window.history.state.page,
           documentScrollPosition: scrollRegion
@@ -1028,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) => {
@@ -1245,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"];
     }
@@ -1421,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 = {
@@ -1631,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 || [],
@@ -1641,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));
@@ -2072,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 || {}
     });
@@ -2233,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;
@@ -2267,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;
@@ -2302,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;
 }