From 35bb79bb05587f83465aa69587fe67ff3837f0dd Mon Sep 17 00:00:00 2001 From: Evelyn Hobert Date: Fri, 25 Oct 2024 12:29:16 -0500 Subject: [PATCH] batch nav updates (#3159) --- router/src/components/router.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/router/src/components/router.rs b/router/src/components/router.rs index 281e3f50eb..44487dc44f 100644 --- 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 =