better usage of the callback, only call immediately if preserveUrl is…

… true
inertiajs · Dec 14, 2024 · 90dff75 · 90dff75
1 parent d536f22
commit 90dff75
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/core/src/page.ts b/packages/core/src/page.ts
@@ -62,8 +62,12 @@ class CurrentPage {
       replace = replace || isSameUrlWithoutHash(hrefToUrl(page.url), location)
 
       return new Promise((resolve) => {
-        replace ? history.replaceState(page) : history.pushState(page)
-        resolve(null)
+        // resolve the promise in the callback, but if history.preserveUrl is true we need to resolve it immediately
+        // since the callback will never be called
+        replace ? history.replaceState(page, () => resolve(null)) : history.pushState(page, () => resolve(null))
+        if (history.preserveUrl) {
+          resolve(null)
+        }
       }).then(() => {
         const isNewComponent = !this.isTheSame(page)