@inertiajs/core 2.2.7 → 2.2.9

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() {
@@ -413,7 +422,11 @@ var CurrentPage = class {
     this.cleared = false;
     this.pendingDeferredProps = null;
   }
-  init({ initialPage, swapComponent, resolveComponent }) {
+  init({
+    initialPage,
+    swapComponent,
+    resolveComponent
+  }) {
     this.page = initialPage;
     this.swapComponent = swapComponent;
     this.resolveComponent = resolveComponent;
@@ -441,7 +454,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 +472,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 +650,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 +666,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
@@ -1332,8 +1355,8 @@ var RequestParams = class _RequestParams {
     return headers;
   }
   setPreserveOptions(page2) {
-    this.params.preserveScroll = this.resolvePreserveOption(this.params.preserveScroll, page2);
-    this.params.preserveState = this.resolvePreserveOption(this.params.preserveState, page2);
+    this.params.preserveScroll = _RequestParams.resolvePreserveOption(this.params.preserveScroll, page2);
+    this.params.preserveState = _RequestParams.resolvePreserveOption(this.params.preserveState, page2);
   }
   runCallbacks() {
     this.callbacks.forEach(({ name, args }) => {
@@ -1355,7 +1378,7 @@ var RequestParams = class _RequestParams {
   recordCallback(name, args) {
     this.callbacks.push({ name, args });
   }
-  resolvePreserveOption(value, page2) {
+  static resolvePreserveOption(value, page2) {
     if (typeof value === "function") {
       return value(page2);
     }
@@ -1834,7 +1857,11 @@ var Router = class {
       interruptible: false
     });
   }
-  init({ initialPage, resolveComponent, swapComponent }) {
+  init({
+    initialPage,
+    resolveComponent,
+    swapComponent
+  }) {
     page.init({
       initialPage,
       resolveComponent,
@@ -2057,18 +2084,18 @@ var Router = class {
     const current = page.get();
     const props = typeof params.props === "function" ? params.props(current.props) : params.props ?? current.props;
     const { onError, onFinish, onSuccess, ...pageParams } = params;
-    page.set(
-      {
-        ...current,
-        ...pageParams,
-        props
-      },
-      {
-        replace,
-        preserveScroll: params.preserveScroll,
-        preserveState: params.preserveState
-      }
-    ).then(() => {
+    const page2 = {
+      ...current,
+      ...pageParams,
+      props
+    };
+    const preserveScroll = RequestParams.resolvePreserveOption(params.preserveScroll ?? false, page2);
+    const preserveState = RequestParams.resolvePreserveOption(params.preserveState ?? false, page2);
+    page.set(page2, {
+      replace,
+      preserveScroll,
+      preserveState
+    }).then(() => {
       const errors = page.get().props.errors || {};
       if (Object.keys(errors).length === 0) {
         return onSuccess?.(page.get());
@@ -2179,10 +2206,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;
@@ -2883,13 +2945,16 @@ function useInfiniteScroll(options) {
 }
 
 // src/navigationEvents.ts
+function isContentEditableOrPrevented(event) {
+  return event.target instanceof HTMLElement && event.target.isContentEditable || event.defaultPrevented;
+}
 function shouldIntercept(event) {
   const isLink = event.currentTarget.tagName.toLowerCase() === "a";
-  return !(event.target && (event?.target).isContentEditable || event.defaultPrevented || isLink && event.altKey || isLink && event.ctrlKey || isLink && event.metaKey || isLink && event.shiftKey || isLink && "button" in event && event.button !== 0);
+  return !(isContentEditableOrPrevented(event) || isLink && event.altKey || isLink && event.ctrlKey || isLink && event.metaKey || isLink && event.shiftKey || isLink && "button" in event && event.button !== 0);
 }
 function shouldNavigate(event) {
   const isButton = event.currentTarget.tagName.toLowerCase() === "button";
-  return event.key === "Enter" || isButton && event.key === " ";
+  return !isContentEditableOrPrevented(event) && (event.key === "Enter" || isButton && event.key === " ");
 }
 
 // src/progress-component.ts