@react-navigation/core 7.0.0-alpha.0 → 7.0.0-alpha.2

package/src/checkSerializable.tsx

@@ -69,6 +69,6 @@ const checkSerializableWithoutCircularReference = (
   return { serializable: true };
 };
 
-export default function checkSerializable(o: { [key: string]: any }) {
+export function checkSerializable(o: { [key: string]: any }) {
   return checkSerializableWithoutCircularReference(o, new Set<any>(), []);
 }

package/src/createNavigationContainerRef.tsx

@@ -9,7 +9,7 @@ import type {
 export const NOT_INITIALIZED_ERROR =
   "The 'navigation' object hasn't been initialized yet. This might happen if you don't have a navigator mounted, or if the navigator hasn't finished mounting. See https://reactnavigation.org/docs/navigating-without-navigation-prop#handling-initialization for more details.";
 
-export default function createNavigationContainerRef<
+export function createNavigationContainerRef<
   ParamList extends {} = ReactNavigation.RootParamList
 >(): NavigationContainerRefWithCurrent<ParamList> {
   const methods = [

package/src/createNavigatorFactory.tsx

@@ -1,8 +1,8 @@
 import type { NavigationState, ParamListBase } from '@react-navigation/routers';
 import type * as React from 'react';
 
-import Group from './Group';
-import Screen from './Screen';
+import { Group } from './Group';
+import { Screen } from './Screen';
 import type { StaticConfig } from './StaticNavigation';
 import type { EventMapBase, TypedNavigator } from './types';
 
@@ -13,7 +13,7 @@ import type { EventMapBase, TypedNavigator } from './types';
  * @param Navigator The navigator component to wrap.
  * @returns Factory method to create a `Navigator` and `Screen` pair.
  */
-export default function createNavigatorFactory<
+export function createNavigatorFactory<
   State extends NavigationState,
   ScreenOptions extends {},
   EventMap extends EventMapBase,

package/src/findFocusedRoute.tsx

@@ -1,6 +1,6 @@
 import type { InitialState } from '@react-navigation/routers';
 
-export default function findFocusedRoute(state: InitialState) {
+export function findFocusedRoute(state: InitialState) {
   let current: InitialState | undefined = state;
 
   while (current?.routes[current.index ?? 0].state != null) {

package/src/getActionFromState.tsx

@@ -28,7 +28,7 @@ type NavigateAction<State extends NavigationState> = {
   };
 };
 
-export default function getActionFromState(
+export function getActionFromState(
   state: PartialState<NavigationState>,
   options?: Options
 ): NavigateAction<NavigationState> | CommonActions.Action | undefined {

package/src/getFocusedRouteNameFromRoute.tsx

@@ -2,7 +2,7 @@ import type { Route } from '@react-navigation/routers';
 
 import { CHILD_STATE } from './useRouteCache';
 
-export default function getFocusedRouteNameFromRoute(
+export function getFocusedRouteNameFromRoute(
   route: Partial<Route<string>>
 ): string | undefined {
   // @ts-expect-error: this isn't in type definitions coz we want this private

package/src/getPathFromState.tsx

@@ -5,11 +5,11 @@ import type {
 } from '@react-navigation/routers';
 import * as queryString from 'query-string';
 
-import fromEntries from './fromEntries';
 import type { PathConfig, PathConfigMap } from './types';
-import validatePathConfig from './validatePathConfig';
+import { validatePathConfig } from './validatePathConfig';
 
 type Options<ParamList extends {}> = {
+  path?: string;
   initialRouteName?: string;
   screens: PathConfigMap<ParamList>;
 };
@@ -66,7 +66,7 @@ const getActiveRoute = (state: State): { name: string; params?: object } => {
  * @param options Extra options to fine-tune how to serialize the path.
  * @returns Path representing the state, e.g. /foo/bar?count=42.
  */
-export default function getPathFromState<ParamList extends {}>(
+export function getPathFromState<ParamList extends {}>(
   state: State,
   options?: Options<ParamList>
 ): string {
@@ -115,7 +115,7 @@ export default function getPathFromState<ParamList extends {}>(
       if (route.params) {
         const stringify = currentOptions[route.name]?.stringify;
 
-        const currentParams = fromEntries(
+        const currentParams = Object.fromEntries(
           Object.entries(route.params).map(([key, value]) => [
             key,
             stringify?.[key] ? stringify[key](value) : String(value),
@@ -234,6 +234,11 @@ export default function getPathFromState<ParamList extends {}>(
   path = path.replace(/\/+/g, '/');
   path = path.length > 1 ? path.replace(/\/$/, '') : path;
 
+  // Include the root path if specified
+  if (options?.path) {
+    path = joinPaths(options.path, path);
+  }
+
   return path;
 }
 
@@ -288,7 +293,7 @@ const createNormalizedConfigs = (
   options: PathConfigMap<object>,
   pattern?: string
 ): Record<string, ConfigItem> =>
-  fromEntries(
+  Object.fromEntries(
     Object.entries(options).map(([name, c]) => {
       const result = createConfigItem(c, pattern);
 

package/src/getStateFromPath.tsx

@@ -6,11 +6,12 @@ import type {
 import escape from 'escape-string-regexp';
 import * as queryString from 'query-string';
 
-import findFocusedRoute from './findFocusedRoute';
+import { findFocusedRoute } from './findFocusedRoute';
 import type { PathConfigMap } from './types';
-import validatePathConfig from './validatePathConfig';
+import { validatePathConfig } from './validatePathConfig';
 
 type Options<ParamList extends {}> = {
+  path?: string;
   initialRouteName?: string;
   screens: PathConfigMap<ParamList>;
 };
@@ -62,7 +63,7 @@ type ParsedRoute = {
  * @param path Path string to parse and convert, e.g. /foo/bar?count=42.
  * @param options Extra options to fine-tune how to parse the path.
  */
-export default function getStateFromPath<ParamList extends {}>(
+export function getStateFromPath<ParamList extends {}>(
   path: string,
   options?: Options<ParamList>
 ): ResultState | undefined {
@@ -89,6 +90,21 @@ export default function getStateFromPath<ParamList extends {}>(
   // Make sure there is a trailing slash
   remaining = remaining.endsWith('/') ? remaining : `${remaining}/`;
 
+  const prefix = options?.path?.replace(/^\//, ''); // Remove extra leading slash
+
+  if (prefix) {
+    // Make sure there is a trailing slash
+    const normalizedPrefix = prefix.endsWith('/') ? prefix : `${prefix}/`;
+
+    // If the path doesn't start with the prefix, it's not a match
+    if (!remaining.startsWith(normalizedPrefix)) {
+      return undefined;
+    }
+
+    // Remove the prefix from the path
+    remaining = remaining.replace(normalizedPrefix, '');
+  }
+
   if (screens === undefined) {
     // When no config is specified, use the path segments as route names
     const routes = remaining

package/src/index.tsx

@@ -1,36 +1,36 @@
-export { default as BaseNavigationContainer } from './BaseNavigationContainer';
-export { default as createNavigationContainerRef } from './createNavigationContainerRef';
-export { default as createNavigatorFactory } from './createNavigatorFactory';
-export { default as CurrentRenderContext } from './CurrentRenderContext';
-export { default as findFocusedRoute } from './findFocusedRoute';
-export { default as getActionFromState } from './getActionFromState';
-export { default as getFocusedRouteNameFromRoute } from './getFocusedRouteNameFromRoute';
-export { default as getPathFromState } from './getPathFromState';
-export { default as getStateFromPath } from './getStateFromPath';
-export { default as NavigationContainerRefContext } from './NavigationContainerRefContext';
-export { default as NavigationContext } from './NavigationContext';
-export { default as NavigationHelpersContext } from './NavigationHelpersContext';
-export { default as NavigationIndependentTree } from './NavigationIndependentTree';
-export { default as NavigationRouteContext } from './NavigationRouteContext';
-export { default as PreventRemoveContext } from './PreventRemoveContext';
-export { default as PreventRemoveProvider } from './PreventRemoveProvider';
+export { BaseNavigationContainer } from './BaseNavigationContainer';
+export { createNavigationContainerRef } from './createNavigationContainerRef';
+export { createNavigatorFactory } from './createNavigatorFactory';
+export { CurrentRenderContext } from './CurrentRenderContext';
+export { findFocusedRoute } from './findFocusedRoute';
+export { getActionFromState } from './getActionFromState';
+export { getFocusedRouteNameFromRoute } from './getFocusedRouteNameFromRoute';
+export { getPathFromState } from './getPathFromState';
+export { getStateFromPath } from './getStateFromPath';
+export { NavigationContainerRefContext } from './NavigationContainerRefContext';
+export { NavigationContext } from './NavigationContext';
+export { NavigationHelpersContext } from './NavigationHelpersContext';
+export { NavigationIndependentTree } from './NavigationIndependentTree';
+export { NavigationRouteContext } from './NavigationRouteContext';
+export { PreventRemoveContext } from './PreventRemoveContext';
+export { PreventRemoveProvider } from './PreventRemoveProvider';
 export {
+  type StaticNavigation,
+  type StaticParamList,
+  type StaticScreenProps,
   createComponentForStaticNavigation,
   createPathConfigForStaticNavigation,
-  StaticNavigation,
-  StaticParamList,
-  StaticScreenProps,
 } from './StaticNavigation';
 export * from './types';
-export { default as useFocusEffect } from './useFocusEffect';
-export { default as useIsFocused } from './useIsFocused';
-export { default as useNavigation } from './useNavigation';
-export { default as useNavigationBuilder } from './useNavigationBuilder';
-export { default as useNavigationContainerRef } from './useNavigationContainerRef';
-export { default as useNavigationIndependentTree } from './useNavigationIndependentTree';
-export { default as useNavigationState } from './useNavigationState';
-export { default as UNSTABLE_usePreventRemove } from './usePreventRemove';
-export { default as usePreventRemoveContext } from './usePreventRemoveContext';
-export { default as useRoute } from './useRoute';
-export { default as validatePathConfig } from './validatePathConfig';
+export { useFocusEffect } from './useFocusEffect';
+export { useIsFocused } from './useIsFocused';
+export { useNavigation } from './useNavigation';
+export { useNavigationBuilder } from './useNavigationBuilder';
+export { useNavigationContainerRef } from './useNavigationContainerRef';
+export { useNavigationIndependentTree } from './useNavigationIndependentTree';
+export { useNavigationState } from './useNavigationState';
+export { UNSTABLE_usePreventRemove } from './usePreventRemove';
+export { usePreventRemoveContext } from './usePreventRemoveContext';
+export { useRoute } from './useRoute';
+export { validatePathConfig } from './validatePathConfig';
 export * from '@react-navigation/routers';

package/src/isArrayEqual.tsx

@@ -2,7 +2,7 @@
  * Compare two arrays with primitive values as the content.
  * We need to make sure that both values and order match.
  */
-export default function isArrayEqual(a: any[], b: any[]) {
+export function isArrayEqual(a: any[], b: any[]) {
   if (a === b) {
     return true;
   }

package/src/isRecordEqual.tsx

@@ -1,10 +1,7 @@
 /**
  * Compare two records with primitive values as the content.
  */
-export default function isRecordEqual(
-  a: Record<string, any>,
-  b: Record<string, any>
-) {
+export function isRecordEqual(a: Record<string, any>, b: Record<string, any>) {
   if (a === b) {
     return true;
   }

package/src/useChildListeners.tsx

@@ -5,7 +5,7 @@ import type { ListenerMap } from './NavigationBuilderContext';
 /**
  * Hook which lets child navigators add action listeners.
  */
-export default function useChildListeners() {
+export function useChildListeners() {
   const { current: listeners } = React.useRef<{
     [K in keyof ListenerMap]: ListenerMap[K][];
   }>({

package/src/useComponent.tsx

@@ -11,7 +11,7 @@ const NavigationContent = ({ render, children }: Props) => {
   return render(children);
 };
 
-export default function useComponent(render: Render) {
+export function useComponent(render: Render) {
   const renderRef = React.useRef<Render | null>(render);
 
   // Normally refs shouldn't be mutated in render

package/src/useCurrentRender.tsx

@@ -1,7 +1,7 @@
 import type { NavigationState, ParamListBase } from '@react-navigation/routers';
 import * as React from 'react';
 
-import CurrentRenderContext from './CurrentRenderContext';
+import { CurrentRenderContext } from './CurrentRenderContext';
 import type {
   Descriptor,
   NavigationHelpers,
@@ -22,11 +22,7 @@ type Options = {
  * Write the current options, so that server renderer can get current values
  * Mutating values like this is not safe in async mode, but it doesn't apply to SSR
  */
-export default function useCurrentRender({
-  state,
-  navigation,
-  descriptors,
-}: Options) {
+export function useCurrentRender({ state, navigation, descriptors }: Options) {
   const current = React.useContext(CurrentRenderContext);
 
   if (current && navigation.isFocused()) {

package/src/useDescriptors.tsx

@@ -6,13 +6,14 @@ import type {
 } from '@react-navigation/routers';
 import * as React from 'react';
 
-import NavigationBuilderContext, {
+import {
   AddKeyedListener,
   AddListener,
+  NavigationBuilderContext,
 } from './NavigationBuilderContext';
-import NavigationContext from './NavigationContext';
-import NavigationRouteContext from './NavigationRouteContext';
-import SceneView from './SceneView';
+import { NavigationContext } from './NavigationContext';
+import { NavigationRouteContext } from './NavigationRouteContext';
+import { SceneView } from './SceneView';
 import type {
   Descriptor,
   EventMapBase,
@@ -22,8 +23,8 @@ import type {
   RouteProp,
 } from './types';
 import type { NavigationEventEmitter } from './useEventEmitter';
-import useNavigationCache from './useNavigationCache';
-import useRouteCache from './useRouteCache';
+import { useNavigationCache } from './useNavigationCache';
+import { useRouteCache } from './useRouteCache';
 
 export type ScreenConfigWithParent<
   State extends NavigationState,
@@ -79,7 +80,7 @@ type Options<
  * - Options specified by the screen for the navigator
  * - Navigation object intended for the route
  */
-export default function useDescriptors<
+export function useDescriptors<
   State extends NavigationState,
   ActionHelpers extends Record<string, () => void>,
   ScreenOptions extends {},

package/src/useEventEmitter.tsx

@@ -12,7 +12,7 @@ type Listeners = ((e: any) => void)[];
 /**
  * Hook to manage the event system used by the navigator to notify screens of various events.
  */
-export default function useEventEmitter<T extends Record<string, any>>(
+export function useEventEmitter<T extends Record<string, any>>(
   listen?: (e: any) => void
 ): NavigationEventEmitter<T> {
   const listenRef = React.useRef(listen);

package/src/useFocusEffect.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import useNavigation from './useNavigation';
+import { useNavigation } from './useNavigation';
 
 type EffectCallback = () => undefined | void | (() => void);
 
@@ -11,7 +11,7 @@ type EffectCallback = () => undefined | void | (() => void);
  *
  * @param callback Memoized callback containing the effect, should optionally return a cleanup function.
  */
-export default function useFocusEffect(effect: EffectCallback) {
+export function useFocusEffect(effect: EffectCallback) {
   const navigation = useNavigation();
 
   if (arguments[1] !== undefined) {

package/src/useFocusEvents.tsx

@@ -1,7 +1,7 @@
 import type { NavigationState } from '@react-navigation/routers';
 import * as React from 'react';
 
-import NavigationContext from './NavigationContext';
+import { NavigationContext } from './NavigationContext';
 import type { EventMapCore } from './types';
 import type { NavigationEventEmitter } from './useEventEmitter';
 
@@ -13,7 +13,7 @@ type Options<State extends NavigationState> = {
 /**
  * Hook to take care of emitting `focus` and `blur` events.
  */
-export default function useFocusEvents<State extends NavigationState>({
+export function useFocusEvents<State extends NavigationState>({
   state,
   emitter,
 }: Options<State>) {

package/src/useFocusedListenersChildrenAdapter.tsx

@@ -1,9 +1,10 @@
 import type { ParamListBase } from '@react-navigation/routers';
 import * as React from 'react';
 
-import NavigationBuilderContext, {
+import {
   FocusedNavigationCallback,
   FocusedNavigationListener,
+  NavigationBuilderContext,
 } from './NavigationBuilderContext';
 import type { NavigationHelpers } from './types';
 
@@ -15,7 +16,7 @@ type Options = {
 /**
  * Hook for passing focus callback to children
  */
-export default function useFocusedListenersChildrenAdapter({
+export function useFocusedListenersChildrenAdapter({
   navigation,
   focusedListeners,
 }: Options) {

package/src/useIsFocused.tsx

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { useState } from 'react';
 
-import useNavigation from './useNavigation';
+import { useNavigation } from './useNavigation';
 
 /**
  * Hook to get the current focus state of the screen. Returns a `true` if screen is focused, otherwise `false`.
  * This can be used if a component needs to render something based on the focus state.
  */
-export default function useIsFocused(): boolean {
+export function useIsFocused(): boolean {
   const navigation = useNavigation();
   const [isFocused, setIsFocused] = useState(navigation.isFocused);
 

package/src/useKeyedChildListeners.tsx

@@ -5,7 +5,7 @@ import type { KeyedListenerMap } from './NavigationBuilderContext';
 /**
  * Hook which lets child navigators add getters to be called for obtaining rehydrated state.
  */
-export default function useKeyedChildListeners() {
+export function useKeyedChildListeners() {
   const { current: keyedListeners } = React.useRef<{
     [K in keyof KeyedListenerMap]: Record<
       string,

package/src/useNavigation.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 
-import NavigationContainerRefContext from './NavigationContainerRefContext';
-import NavigationContext from './NavigationContext';
+import { NavigationContainerRefContext } from './NavigationContainerRefContext';
+import { NavigationContext } from './NavigationContext';
 import type { NavigationProp } from './types';
 
 /**
@@ -9,7 +9,7 @@ import type { NavigationProp } from './types';
  *
  * @returns Navigation prop of the parent screen.
  */
-export default function useNavigation<
+export function useNavigation<
   T = NavigationProp<ReactNavigation.RootParamList>
 >(): T {
   const root = React.useContext(NavigationContainerRefContext);

package/src/useNavigationBuilder.tsx

@@ -13,14 +13,14 @@ import {
 import * as React from 'react';
 import { isValidElementType } from 'react-is';
 
-import Group from './Group';
-import isArrayEqual from './isArrayEqual';
-import isRecordEqual from './isRecordEqual';
-import NavigationHelpersContext from './NavigationHelpersContext';
-import NavigationRouteContext from './NavigationRouteContext';
-import NavigationStateContext from './NavigationStateContext';
-import PreventRemoveProvider from './PreventRemoveProvider';
-import Screen from './Screen';
+import { Group } from './Group';
+import { isArrayEqual } from './isArrayEqual';
+import { isRecordEqual } from './isRecordEqual';
+import { NavigationHelpersContext } from './NavigationHelpersContext';
+import { NavigationRouteContext } from './NavigationRouteContext';
+import { NavigationStateContext } from './NavigationStateContext';
+import { PreventRemoveProvider } from './PreventRemoveProvider';
+import { Screen } from './Screen';
 import {
   DefaultNavigatorOptions,
   EventMapBase,
@@ -30,20 +30,20 @@ import {
   RouteConfig,
   RouteProp,
 } from './types';
-import useChildListeners from './useChildListeners';
-import useComponent from './useComponent';
-import useCurrentRender from './useCurrentRender';
-import useDescriptors, { ScreenConfigWithParent } from './useDescriptors';
-import useEventEmitter from './useEventEmitter';
-import useFocusedListenersChildrenAdapter from './useFocusedListenersChildrenAdapter';
-import useFocusEvents from './useFocusEvents';
-import useKeyedChildListeners from './useKeyedChildListeners';
-import useNavigationHelpers from './useNavigationHelpers';
-import useOnAction from './useOnAction';
-import useOnGetState from './useOnGetState';
-import useOnRouteFocus from './useOnRouteFocus';
-import useRegisterNavigator from './useRegisterNavigator';
-import useScheduleUpdate from './useScheduleUpdate';
+import { useChildListeners } from './useChildListeners';
+import { useComponent } from './useComponent';
+import { useCurrentRender } from './useCurrentRender';
+import { ScreenConfigWithParent, useDescriptors } from './useDescriptors';
+import { useEventEmitter } from './useEventEmitter';
+import { useFocusedListenersChildrenAdapter } from './useFocusedListenersChildrenAdapter';
+import { useFocusEvents } from './useFocusEvents';
+import { useKeyedChildListeners } from './useKeyedChildListeners';
+import { useNavigationHelpers } from './useNavigationHelpers';
+import { useOnAction } from './useOnAction';
+import { useOnGetState } from './useOnGetState';
+import { useOnRouteFocus } from './useOnRouteFocus';
+import { useRegisterNavigator } from './useRegisterNavigator';
+import { useScheduleUpdate } from './useScheduleUpdate';
 
 // This is to make TypeScript compiler happy
 // eslint-disable-next-line babel/no-unused-expressions
@@ -252,7 +252,7 @@ const getRouteConfigsFromChildren = <
  * @param options Options object containing `children` and additional options for the router.
  * @returns An object containing `state`, `navigation`, `descriptors` objects.
  */
-export default function useNavigationBuilder<
+export function useNavigationBuilder<
   State extends NavigationState,
   RouterOptions extends DefaultRouterOptions,
   ActionHelpers extends Record<string, () => void>,

package/src/useNavigationCache.tsx

@@ -7,7 +7,7 @@ import {
 } from '@react-navigation/routers';
 import * as React from 'react';
 
-import NavigationBuilderContext from './NavigationBuilderContext';
+import { NavigationBuilderContext } from './NavigationBuilderContext';
 import type { NavigationHelpers, NavigationProp } from './types';
 import type { NavigationEventEmitter } from './useEventEmitter';
 
@@ -50,7 +50,7 @@ type NavigationCache<
  * It's important to cache them to make sure navigation objects don't change between renders.
  * This lets us apply optimizations like `React.memo` to minimize re-rendering screens.
  */
-export default function useNavigationCache<
+export function useNavigationCache<
   State extends NavigationState,
   ScreenOptions extends {},
   EventMap extends Record<string, any>

package/src/useNavigationContainerRef.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 
-import createNavigationContainerRef from './createNavigationContainerRef';
+import { createNavigationContainerRef } from './createNavigationContainerRef';
 import type { NavigationContainerRefWithCurrent } from './types';
 
-export default function useNavigationContainerRef<
+export function useNavigationContainerRef<
   ParamList extends {} = ReactNavigation.RootParamList
 >(): NavigationContainerRefWithCurrent<ParamList> {
   const navigation =

package/src/useNavigationHelpers.tsx

@@ -7,9 +7,9 @@ import {
 } from '@react-navigation/routers';
 import * as React from 'react';
 
-import NavigationContext from './NavigationContext';
+import { NavigationContext } from './NavigationContext';
 import { NavigationHelpers, PrivateValueStore } from './types';
-import UnhandledActionContext from './UnhandledActionContext';
+import { UnhandledActionContext } from './UnhandledActionContext';
 import type { NavigationEventEmitter } from './useEventEmitter';
 
 // This is to make TypeScript compiler happy
@@ -28,7 +28,7 @@ type Options<State extends NavigationState, Action extends NavigationAction> = {
  * Navigation object with helper methods to be used by a navigator.
  * This object includes methods for common actions as well as methods the parent screen's navigation object.
  */
-export default function useNavigationHelpers<
+export function useNavigationHelpers<
   State extends NavigationState,
   ActionHelpers extends Record<string, () => void>,
   Action extends NavigationAction,

package/src/useNavigationIndependentTree.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 
-import NavigationIndependentTreeContext from './NavigationIndependentTreeContext';
+import { NavigationIndependentTreeContext } from './NavigationIndependentTreeContext';
 
-export default function useNavigationIndependentTree() {
+export function useNavigationIndependentTree() {
   return React.useContext(NavigationIndependentTreeContext);
 }

package/src/useNavigationState.tsx

@@ -2,7 +2,7 @@ import type { NavigationState, ParamListBase } from '@react-navigation/routers';
 import * as React from 'react';
 
 import type { NavigationProp } from './types';
-import useNavigation from './useNavigation';
+import { useNavigation } from './useNavigation';
 
 type Selector<ParamList extends ParamListBase, T> = (
   state: NavigationState<ParamList>
@@ -13,7 +13,7 @@ type Selector<ParamList extends ParamListBase, T> = (
  *
  * @param selector Selector function to get a value from the state.
  */
-export default function useNavigationState<ParamList extends ParamListBase, T>(
+export function useNavigationState<ParamList extends ParamListBase, T>(
   selector: Selector<ParamList, T>
 ): T {
   const navigation = useNavigation<NavigationProp<ParamList>>();

package/src/useOnAction.tsx

@@ -7,14 +7,15 @@ import type {
 } from '@react-navigation/routers';
 import * as React from 'react';
 
-import DeprecatedNavigationInChildContext from './DeprecatedNavigationInChildContext';
-import NavigationBuilderContext, {
+import { DeprecatedNavigationInChildContext } from './DeprecatedNavigationInChildContext';
+import {
   ChildActionListener,
   ChildBeforeRemoveListener,
+  NavigationBuilderContext,
 } from './NavigationBuilderContext';
 import type { EventMapCore } from './types';
 import type { NavigationEventEmitter } from './useEventEmitter';
-import useOnPreventRemove, { shouldPreventRemove } from './useOnPreventRemove';
+import { shouldPreventRemove, useOnPreventRemove } from './useOnPreventRemove';
 
 type Options = {
   router: Router<NavigationState, NavigationAction>;
@@ -36,7 +37,7 @@ type Options = {
  *
  * When the action handler handles as action, it returns `true`, otherwise `false`.
  */
-export default function useOnAction({
+export function useOnAction({
   router,
   getState,
   setState,