@inertiajs/core 2.2.2 → 2.2.4

package/dist/index.esm.js

@@ -255,25 +255,28 @@ var Scroll = class {
     }
   }
   static restore(scrollRegions) {
-    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;
-      }
+    if (typeof window === "undefined") {
+      return;
+    }
+    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;
+        }
+      });
     });
   }
   static restoreDocument() {
     const scrollPosition = history.getDocumentScrollPosition();
-    if (typeof window !== "undefined") {
-      window.scrollTo(scrollPosition.left, scrollPosition.top);
-    }
+    window.scrollTo(scrollPosition.left, scrollPosition.top);
   }
   static onScroll(event) {
     const target = event.target;
@@ -784,9 +787,7 @@ var EventHandler = class {
       }
       router.cancelAll();
       page.setQuietly(data, { preserveState: false }).then(() => {
-        window.requestAnimationFrame(() => {
-          Scroll.restore(history.getScrollRegions());
-        });
+        Scroll.restore(history.getScrollRegions());
         fireNavigateEvent(page.get());
       });
     }).catch(() => {
@@ -1613,6 +1614,12 @@ var Response = class _Response {
       pageResponse.props[prop] = deepMerge(currentProp, incomingProp, prop);
     });
     pageResponse.props = { ...page.get().props, ...pageResponse.props };
+    if (page.get().scrollProps) {
+      pageResponse.scrollProps = {
+        ...page.get().scrollProps || {},
+        ...pageResponse.scrollProps || {}
+      };
+    }
   }
   mergeOrMatchItems(existingItems, newItems, matchProp, matchPropsOn, shouldAppend = true) {
     const items = Array.isArray(existingItems) ? existingItems : [];