@inertiajs/core 2.2.7 → 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() {
@@ -441,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));
@@ -457,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) {
@@ -633,6 +646,9 @@ var History = class {
         if (!window.history.state?.page) {
           return;
         }
+        if (isEqual(this.getScrollRegions(), scrollRegions)) {
+          return;
+        }
         return this.doReplaceState({
           page: window.history.state.page,
           scrollRegions
@@ -646,6 +662,9 @@ var History = class {
         if (!window.history.state?.page) {
           return;
         }
+        if (isEqual(this.getDocumentScrollPosition(), scrollRegion)) {
+          return;
+        }
         return this.doReplaceState({
           page: window.history.state.page,
           documentScrollPosition: scrollRegion
@@ -2179,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;