@react-navigation/core 7.7.0 → 7.8.0

package/src/SceneView.tsx

@@ -7,6 +7,10 @@ import type {
 import * as React from 'react';
 
 import { EnsureSingleNavigator } from './EnsureSingleNavigator';
+import {
+  type FocusedRouteState,
+  NavigationFocusedRouteStateContext,
+} from './NavigationFocusedRouteStateContext';
 import { NavigationStateContext } from './NavigationStateContext';
 import { StaticContainer } from './StaticContainer';
 import type { NavigationProp, RouteConfigComponent } from './types';
@@ -122,6 +126,44 @@ export function SceneView<
 
   const getIsInitial = React.useCallback(() => isInitialRef.current, []);
 
+  const parentFocusedRouteState = React.useContext(
+    NavigationFocusedRouteStateContext
+  );
+
+  const focusedRouteState = React.useMemo(() => {
+    const state: FocusedRouteState = {
+      routes: [
+        {
+          name: route.name,
+          params: route.params,
+          path: route.path,
+        },
+      ],
+    };
+
+    // Add our state to the innermost route of the parent state
+    const addState = (
+      parent: FocusedRouteState | undefined
+    ): FocusedRouteState => {
+      const parentRoute = parent?.routes[0];
+
+      if (parentRoute) {
+        return {
+          routes: [
+            {
+              ...parentRoute,
+              state: addState(parentRoute.state),
+            },
+          ],
+        };
+      }
+
+      return state;
+    };
+
+    return addState(parentFocusedRouteState);
+  }, [parentFocusedRouteState, route.name, route.params, route.path]);
+
   const context = React.useMemo(
     () => ({
       state: routeState,
@@ -149,20 +191,22 @@ export function SceneView<
 
   return (
     <NavigationStateContext.Provider value={context}>
-      <EnsureSingleNavigator>
-        <StaticContainer
-          name={screen.name}
-          render={ScreenComponent || screen.children}
-          navigation={navigation}
-          route={route}
-        >
-          {ScreenComponent !== undefined ? (
-            <ScreenComponent navigation={navigation} route={route} />
-          ) : screen.children !== undefined ? (
-            screen.children({ navigation, route })
-          ) : null}
-        </StaticContainer>
-      </EnsureSingleNavigator>
+      <NavigationFocusedRouteStateContext.Provider value={focusedRouteState}>
+        <EnsureSingleNavigator>
+          <StaticContainer
+            name={screen.name}
+            render={ScreenComponent || screen.children}
+            navigation={navigation}
+            route={route}
+          >
+            {ScreenComponent !== undefined ? (
+              <ScreenComponent navigation={navigation} route={route} />
+            ) : screen.children !== undefined ? (
+              screen.children({ navigation, route })
+            ) : null}
+          </StaticContainer>
+        </EnsureSingleNavigator>
+      </NavigationFocusedRouteStateContext.Provider>
     </NavigationStateContext.Provider>
   );
 }

package/src/index.tsx

@@ -36,5 +36,6 @@ export { useNavigationState } from './useNavigationState';
 export { usePreventRemove } from './usePreventRemove';
 export { usePreventRemoveContext } from './usePreventRemoveContext';
 export { useRoute } from './useRoute';
+export { useStateForPath } from './useStateForPath';
 export { validatePathConfig } from './validatePathConfig';
 export * from '@react-navigation/routers';

package/src/useNavigationBuilder.tsx

@@ -49,6 +49,7 @@ import { useRegisterNavigator } from './useRegisterNavigator';
 import { useScheduleUpdate } from './useScheduleUpdate';
 
 // This is to make TypeScript compiler happy
+// eslint-disable-next-line @typescript-eslint/no-unused-expressions
 PrivateValueStore;
 
 type NavigatorRoute = {

package/src/useNavigationHelpers.tsx

@@ -13,6 +13,7 @@ import { UnhandledActionContext } from './UnhandledActionContext';
 import type { NavigationEventEmitter } from './useEventEmitter';
 
 // This is to make TypeScript compiler happy
+// eslint-disable-next-line @typescript-eslint/no-unused-expressions
 PrivateValueStore;
 
 type Options<State extends NavigationState, Action extends NavigationAction> = {

package/src/useStateForPath.tsx

@@ -0,0 +1,15 @@
+import * as React from 'react';
+
+import { NavigationFocusedRouteStateContext } from './NavigationFocusedRouteStateContext';
+
+/**
+ * Hook to get a minimal state representation for the current route.
+ * The returned state can be used with `getPathFromState` to build a path.
+ *
+ * @returns Minimal state to build a path for the current route.
+ */
+export function useStateForPath() {
+  const state = React.useContext(NavigationFocusedRouteStateContext);
+
+  return state;
+}