batch nav updates (#3159)

leptos-rs · Oct 25, 2024 · 35bb79b · 35bb79b
1 parent 76aa56b
commit 35bb79b
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/router/src/components/router.rs b/router/src/components/router.rs
@@ -322,11 +322,15 @@ impl RouterContextInner {
 
                         let resolved = resolved_to.to_string();
                         let state = options.state.clone();
-                        set_reference.update(move |r| *r = resolved);
 
-                        set_state.update({
-                            let next_state = state.clone();
-                            move |state| *state = next_state
+                        // batch these so the history update is atomic
+                        batch(|| {
+                            set_reference.update(move |r| *r = resolved);
+
+                            set_state.update({
+                                let next_state = state.clone();
+                                move |state| *state = next_state
+                            });
                         });
 
                         let global_suspense =