inertiax-core 11.0.16 → 11.0.18

package/dist/index.js

@@ -1054,6 +1054,27 @@ var Scroll = class {
   static regions() {
     return document.querySelectorAll("[scroll-region]");
   }
+  /**
+   * Returns the closest ancestor [scroll-region] of the frame's DOM anchor,
+   * or all regions if the frame is the top frame.
+   */
+  static regionsForFrame(frameId) {
+    if (frameId === DEFAULT_FRAME_ID2) {
+      return Array.from(this.regions());
+    }
+    const anchor = document.querySelector(`[data-inertia-frame="${frameId}"]`);
+    if (!anchor?.parentElement) {
+      return [];
+    }
+    let el = anchor.parentElement;
+    while (el) {
+      if (el.hasAttribute("scroll-region")) {
+        return [el];
+      }
+      el = el.parentElement;
+    }
+    return [];
+  }
   static scrollToTop() {
     if (isFirefox && getComputedStyle(document.documentElement).scrollBehavior === "smooth") {
       return requestAnimationFrame(() => window.scrollTo(0, 0), 2);
@@ -1061,14 +1082,14 @@ var Scroll = class {
     window.scrollTo(0, 0);
   }
   static reset(frameId = DEFAULT_FRAME_ID2) {
-    if (frameId !== DEFAULT_FRAME_ID2) {
-      return;
-    }
-    const anchorHash = isServer2 ? null : window.location.hash;
-    if (!anchorHash) {
-      this.scrollToTop();
+    const isTopFrame = frameId === DEFAULT_FRAME_ID2;
+    if (isTopFrame) {
+      const anchorHash = isServer2 ? null : window.location.hash;
+      if (!anchorHash) {
+        this.scrollToTop();
+      }
     }
-    this.regions().forEach((region) => {
+    this.regionsForFrame(frameId).forEach((region) => {
       if (typeof region.scrollTo === "function") {
         region.scrollTo(0, 0);
       } else {
@@ -1077,7 +1098,9 @@ var Scroll = class {
       }
     });
     this.save(frameId);
-    this.scrollToAnchor(frameId);
+    if (isTopFrame) {
+      this.scrollToAnchor(frameId);
+    }
   }
   static scrollToAnchor(frameId = DEFAULT_FRAME_ID2) {
     if (frameId !== DEFAULT_FRAME_ID2) {
@@ -1095,12 +1118,21 @@ var Scroll = class {
     if (isServer2) {
       return;
     }
-    if (frameId !== DEFAULT_FRAME_ID2) {
-      return;
-    }
+    const isTopFrame = frameId === DEFAULT_FRAME_ID2;
     window.requestAnimationFrame(() => {
-      this.restoreDocument(frameId);
-      this.restoreScrollRegions(scrollRegions);
+      if (isTopFrame) {
+        this.restoreDocument(frameId);
+        this.restoreScrollRegions(scrollRegions);
+      } else {
+        this.regionsForFrame(frameId).forEach((region) => {
+          if (typeof region.scrollTo === "function") {
+            region.scrollTo(0, 0);
+          } else {
+            region.scrollTop = 0;
+            region.scrollLeft = 0;
+          }
+        });
+      }
     });
   }
   static restoreScrollRegions(scrollRegions) {