Merge pull request #2163 from sjongejan/master

Ensure callback execution
inertiajs · Jan 8, 2025 · af56fba · af56fba
2 parents 3ac2fc8 + 7677aa0
commit af56fba
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/packages/core/src/history.ts b/packages/core/src/history.ts
@@ -31,10 +31,16 @@ class History {
   }
 
   public pushState(page: Page, cb: (() => void) | null = null): void {
-    if (isServer || this.preserveUrl) {
+    if (isServer) {
       return
     }
 
+    if (this.preserveUrl) {
+      cb && cb();
+
+      return;
+    }
+
     this.current = page
 
     this.addToQueue(() => {
@@ -98,10 +104,16 @@ class History {
   public replaceState(page: Page, cb: (() => void) | null = null): void {
     currentPage.merge(page)
 
-    if (isServer || this.preserveUrl) {
+    if (isServer) {
       return
     }
 
+    if (this.preserveUrl) {
+      cb && cb();
+
+      return;
+    }
+
     this.current = page
 
     this.addToQueue(() => {