@inertiajs/core 2.3.14 → 2.3.15

package/dist/index.js

@@ -656,7 +656,7 @@ var getScrollableParent = (element) => {
     if (["visible", "clip"].includes(computedStyle.overflowX)) {
       return true;
     }
-    return hasDimensionConstraint(computedStyle.maxHeight, el.style.height);
+    return hasDimensionConstraint(computedStyle.maxHeight, el.style.height) || isConstrainedByLayout(el, "height");
   };
   const allowsHorizontalScroll = (el) => {
     const computedStyle = window.getComputedStyle(el);
@@ -669,7 +669,7 @@ var getScrollableParent = (element) => {
     if (["visible", "clip"].includes(computedStyle.overflowY)) {
       return true;
     }
-    return hasDimensionConstraint(computedStyle.maxWidth, el.style.width);
+    return hasDimensionConstraint(computedStyle.maxWidth, el.style.width) || isConstrainedByLayout(el, "width");
   };
   const hasDimensionConstraint = (computedMaxDimension, inlineStyleDimension) => {
     if (computedMaxDimension && computedMaxDimension !== "none" && computedMaxDimension !== "0px") {
@@ -680,6 +680,18 @@ var getScrollableParent = (element) => {
     }
     return false;
   };
+  const isConstrainedByLayout = (el, dimension) => {
+    const parent2 = el.parentElement;
+    if (!parent2) {
+      return false;
+    }
+    const parentStyle = window.getComputedStyle(parent2);
+    if (["flex", "inline-flex"].includes(parentStyle.display)) {
+      const isColumnLayout = ["column", "column-reverse"].includes(parentStyle.flexDirection);
+      return dimension === "height" ? isColumnLayout : !isColumnLayout;
+    }
+    return ["grid", "inline-grid"].includes(parentStyle.display);
+  };
   let parent = element?.parentElement;
   while (parent) {
     const allowsScroll = allowsVerticalScroll(parent) || allowsHorizontalScroll(parent);
@@ -1300,7 +1312,8 @@ var History = class {
       cb && cb();
       return;
     }
-    page.merge(page2);
+    const { flash, ...pageWithoutFlash } = page2;
+    page.merge(pageWithoutFlash);
     if (isServer2) {
       return;
     }
@@ -1408,6 +1421,7 @@ var EventHandler = class {
   init() {
     if (typeof window !== "undefined") {
       window.addEventListener("popstate", this.handlePopstateEvent.bind(this));
+      window.addEventListener("pageshow", this.handlePageshowEvent.bind(this));
       window.addEventListener("scroll", debounce(Scroll.onWindowScroll.bind(Scroll), 100), true);
     }
     if (typeof document !== "undefined") {
@@ -1440,6 +1454,14 @@ var EventHandler = class {
     document.addEventListener(type, listener);
     return () => document.removeEventListener(type, listener);
   }
+  // bfcache restores pages without firing `popstate`, so we use `pageshow` to
+  // re-validate encrypted history entries after `clearHistory` removed the keys.
+  // https://web.dev/articles/bfcache
+  handlePageshowEvent(event) {
+    if (event.persisted) {
+      history.decrypt().catch(() => this.onMissingHistoryItem());
+    }
+  }
   handlePopstateEvent(event) {
     const state = event.state || null;
     if (state === null) {