chore(navigation): focus callbacks trigger post-mutation (#1102)

Moving the `onRouteFocus` callbacks post-mutation to ensure listeners receive the correct state.
Instawork · Feb 26, 2025 · a71d09e · a71d09e
1 parent cfdd14f
commit a71d09e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/core/components/hv-route/index.tsx b/src/core/components/hv-route/index.tsx
@@ -570,9 +570,6 @@ function HvRouteFC(props: Types.Props) {
 
       // Use the focus event to set the selected route
       const unsubscribeFocus: () => void = nav.addListener('focus', () => {
-        if (navigationContext.onRouteFocus && props.route) {
-          navigationContext.onRouteFocus(props.route);
-        }
         const navStateMutationsDelay =
           navigationContext.experimentalFeatures?.navStateMutationsDelay || 0;
         const updateRouteFocus = () => {
@@ -586,6 +583,9 @@ function HvRouteFC(props: Types.Props) {
             navigationContext.entrypointUrl,
             docContext?.setDoc,
           );
+          if (navigationContext.onRouteFocus && props.route) {
+            navigationContext.onRouteFocus(props.route);
+          }
         };
         if (navStateMutationsDelay > 0) {
           // The timeout ensures the processing occurs after the screen is rendered or shown