@react-navigation/core 6.1.1 → 6.2.2

package/lib/typescript/src/useNavigationBuilder.d.ts

@@ -85,23 +85,8 @@ export default function useNavigationBuilder<State extends NavigationState, Rout
         goBack(): void;
         isFocused(): boolean;
         canGoBack(): boolean;
-        getParent<T = import("./types").NavigationProp<ParamListBase, string, Readonly<{
-            key: string;
-            index: number;
-            routeNames: string[];
-            history?: unknown[] | undefined;
-            routes: (Readonly<{
-                key: string;
-                name: string;
-                path?: string | undefined;
-            }> & Readonly<{
-                params?: Readonly<object | undefined>;
-            }> & {
-                state?: Readonly<any> | PartialState<Readonly<any>> | undefined;
-            })[];
-            type: string;
-            stale: false;
-        }>, {}, {}> | undefined>(): T;
+        getId(): string | undefined;
+        getParent<T = import("./types").NavigationHelpers<ParamListBase, {}> | undefined>(id?: string | undefined): T;
         getState(): Readonly<{
             key: string;
             index: number;
@@ -119,58 +104,10 @@ export default function useNavigationBuilder<State extends NavigationState, Rout
             type: string;
             stale: false;
         }>;
-    } & PrivateValueStore<ParamListBase, string, {}> & import("./types").EventEmitter<EventMap> & {
+    } & PrivateValueStore<[ParamListBase, unknown, unknown]> & import("./types").EventEmitter<EventMap> & {
         setParams<RouteName_2 extends string>(params: Partial<object | undefined>): void;
-    } & {
-        dispatch(action: Readonly<{
-            type: string;
-            payload?: object | undefined;
-            source?: string | undefined;
-            target?: string | undefined;
-        }> | ((state: any) => Readonly<{
-            type: string;
-            payload?: object | undefined;
-            source?: string | undefined;
-            target?: string | undefined;
-        }>)): void;
-        navigate<RouteName extends string>(...args: [screen: RouteName] | [screen: RouteName, params: object | undefined]): void;
-        navigate<RouteName_1 extends string>(options: {
-            key: string;
-            params?: object | undefined;
-            merge?: boolean | undefined;
-        } | {
-            name: RouteName_1;
-            key?: string | undefined;
-            params: object | undefined;
-            merge?: boolean | undefined;
-        }): void;
-        reset(state: any): void;
-        goBack(): void;
-        isFocused(): boolean;
-        canGoBack(): boolean;
-        getParent<T = import("./types").NavigationProp<ParamListBase, string, Readonly<{
-            key: string;
-            index: number;
-            routeNames: string[];
-            history?: unknown[] | undefined;
-            routes: (Readonly<{
-                key: string;
-                name: string;
-                path?: string | undefined;
-            }> & Readonly<{
-                params?: Readonly<object | undefined>;
-            }> & {
-                state?: Readonly<any> | PartialState<Readonly<any>> | undefined;
-            })[];
-            type: string;
-            stale: false;
-        }>, {}, {}> | undefined>(): T;
-        getState(): any;
-    } & {
-        setParams(params: Partial<object | undefined>): void;
-        setOptions(options: Partial<any>): void;
-    } & import("./types").EventConsumer<any> & PrivateValueStore<ParamListBase, string, any> & ActionHelpers;
-    descriptors: Record<string, import("./types").Descriptor<ScreenOptions, {
+    } & ActionHelpers;
+    descriptors: Record<string, import("./types").Descriptor<ScreenOptions, Omit<{
         dispatch(action: Readonly<{
             type: string;
             payload?: object | undefined;
@@ -197,7 +134,11 @@ export default function useNavigationBuilder<State extends NavigationState, Rout
         goBack(): void;
         isFocused(): boolean;
         canGoBack(): boolean;
-        getParent<T = import("./types").NavigationProp<ParamListBase, string, Readonly<{
+        getId(): string | undefined;
+        getParent<T = import("./types").NavigationHelpers<ParamListBase, {}> | undefined>(id?: string | undefined): T;
+        getState(): State;
+    } & PrivateValueStore<[ParamListBase, unknown, unknown]>, "getParent"> & {
+        getParent<T_1 = import("./types").NavigationProp<ParamListBase, string, undefined, Readonly<{
             key: string;
             index: number;
             routeNames: string[];
@@ -213,11 +154,9 @@ export default function useNavigationBuilder<State extends NavigationState, Rout
             })[];
             type: string;
             stale: false;
-        }>, {}, {}> | undefined>(): T;
-        getState(): State;
-    } & PrivateValueStore<ParamListBase, string, {}> & {
+        }>, {}, {}> | undefined>(id?: string | undefined): T_1;
         setParams(params: Partial<object | undefined>): void;
         setOptions(options: Partial<ScreenOptions>): void;
-    } & import("./types").EventConsumer<EventMap & EventMapCore<State>> & PrivateValueStore<ParamListBase, string, EventMap> & ActionHelpers, import("./types").RouteProp<ParamListBase, string>>>;
+    } & import("./types").EventConsumer<EventMap & EventMapCore<State>> & PrivateValueStore<[ParamListBase, string, EventMap]> & ActionHelpers, import("./types").RouteProp<ParamListBase, string>>>;
     NavigationContent: (rest: Omit<React.ProviderProps<import("./types").NavigationHelpers<ParamListBase, {}> | undefined>, "value">) => JSX.Element;
 };

package/lib/typescript/src/useNavigationCache.d.ts

@@ -9,7 +9,7 @@ declare type Options<State extends NavigationState, EventMap extends Record<stri
     router: Router<State, NavigationAction>;
     emitter: NavigationEventEmitter<EventMap>;
 };
-declare type NavigationCache<State extends NavigationState, ScreenOptions extends {}, EventMap extends Record<string, any>> = Record<string, NavigationProp<ParamListBase, string, State, ScreenOptions, EventMap>>;
+declare type NavigationCache<State extends NavigationState, ScreenOptions extends {}, EventMap extends Record<string, any>> = Record<string, NavigationProp<ParamListBase, string, string | undefined, State, ScreenOptions, EventMap>>;
 /**
  * Hook to cache navigation objects for each screen in the navigator.
  * It's important to cache them to make sure navigation objects don't change between renders.

package/lib/typescript/src/useNavigationHelpers.d.ts

@@ -1,7 +1,8 @@
 import { NavigationAction, NavigationState, ParamListBase, Router } from '@react-navigation/routers';
-import { NavigationProp, PrivateValueStore } from './types';
+import { NavigationHelpers, PrivateValueStore } from './types';
 import type { NavigationEventEmitter } from './useEventEmitter';
 declare type Options<State extends NavigationState, Action extends NavigationAction> = {
+    id: string | undefined;
     onAction: (action: NavigationAction) => boolean;
     getState: () => State;
     emitter: NavigationEventEmitter<any>;
@@ -11,7 +12,7 @@ declare type Options<State extends NavigationState, Action extends NavigationAct
  * 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<State extends NavigationState, ActionHelpers extends Record<string, () => void>, Action extends NavigationAction, EventMap extends Record<string, any>>({ onAction, getState, emitter, router }: Options<State, Action>): {
+export default function useNavigationHelpers<State extends NavigationState, ActionHelpers extends Record<string, () => void>, Action extends NavigationAction, EventMap extends Record<string, any>>({ id: navigatorId, onAction, getState, emitter, router, }: Options<State, Action>): {
     dispatch(action: Readonly<{
         type: string;
         payload?: object | undefined;
@@ -86,23 +87,8 @@ export default function useNavigationHelpers<State extends NavigationState, Acti
     goBack(): void;
     isFocused(): boolean;
     canGoBack(): boolean;
-    getParent<T = NavigationProp<ParamListBase, string, Readonly<{
-        key: string;
-        index: number;
-        routeNames: string[];
-        history?: unknown[] | undefined;
-        routes: (Readonly<{
-            key: string;
-            name: string;
-            path?: string | undefined;
-        }> & Readonly<{
-            params?: Readonly<object | undefined>;
-        }> & {
-            state?: Readonly<any> | import("@react-navigation/routers").PartialState<Readonly<any>> | undefined;
-        })[];
-        type: string;
-        stale: false;
-    }>, {}, {}> | undefined>(): T;
+    getId(): string | undefined;
+    getParent<T = NavigationHelpers<ParamListBase, {}> | undefined>(id?: string | undefined): T;
     getState(): Readonly<{
         key: string;
         index: number;
@@ -120,55 +106,7 @@ export default function useNavigationHelpers<State extends NavigationState, Acti
         type: string;
         stale: false;
     }>;
-} & PrivateValueStore<ParamListBase, string, {}> & import("./types").EventEmitter<EventMap> & {
+} & PrivateValueStore<[ParamListBase, unknown, unknown]> & import("./types").EventEmitter<EventMap> & {
     setParams<RouteName_2 extends string>(params: Partial<object | undefined>): void;
-} & {
-    dispatch(action: Readonly<{
-        type: string;
-        payload?: object | undefined;
-        source?: string | undefined;
-        target?: string | undefined;
-    }> | ((state: any) => Readonly<{
-        type: string;
-        payload?: object | undefined;
-        source?: string | undefined;
-        target?: string | undefined;
-    }>)): void;
-    navigate<RouteName extends string>(...args: [screen: RouteName] | [screen: RouteName, params: object | undefined]): void;
-    navigate<RouteName_1 extends string>(options: {
-        key: string;
-        params?: object | undefined;
-        merge?: boolean | undefined;
-    } | {
-        name: RouteName_1;
-        key?: string | undefined;
-        params: object | undefined;
-        merge?: boolean | undefined;
-    }): void;
-    reset(state: any): void;
-    goBack(): void;
-    isFocused(): boolean;
-    canGoBack(): boolean;
-    getParent<T = NavigationProp<ParamListBase, string, Readonly<{
-        key: string;
-        index: number;
-        routeNames: string[];
-        history?: unknown[] | undefined;
-        routes: (Readonly<{
-            key: string;
-            name: string;
-            path?: string | undefined;
-        }> & Readonly<{
-            params?: Readonly<object | undefined>;
-        }> & {
-            state?: Readonly<any> | import("@react-navigation/routers").PartialState<Readonly<any>> | undefined;
-        })[];
-        type: string;
-        stale: false;
-    }>, {}, {}> | undefined>(): T;
-    getState(): any;
-} & {
-    setParams(params: Partial<object | undefined>): void;
-    setOptions(options: Partial<any>): void;
-} & import("./types").EventConsumer<any> & PrivateValueStore<ParamListBase, string, any> & ActionHelpers;
+} & ActionHelpers;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/core",
   "description": "Core utilities for building navigators",
-  "version": "6.1.1",
+  "version": "6.2.2",
   "keywords": [
     "react",
     "react-native",
@@ -35,7 +35,7 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "@react-navigation/routers": "^6.1.0",
+    "@react-navigation/routers": "^6.1.1",
     "escape-string-regexp": "^4.0.0",
     "nanoid": "^3.1.23",
     "query-string": "^7.0.0",
@@ -43,14 +43,14 @@
   },
   "devDependencies": {
     "@testing-library/react-native": "^7.2.0",
-    "@types/react": "^17.0.9",
+    "@types/react": "^17.0.47",
     "@types/react-is": "^17.0.0",
     "del-cli": "^3.0.1",
     "immer": "^9.0.2",
-    "react": "17.0.1",
+    "react": "17.0.2",
     "react-native-builder-bob": "^0.18.1",
-    "react-test-renderer": "17.0.1",
-    "typescript": "^4.3.2"
+    "react-test-renderer": "17.0.2",
+    "typescript": "^4.7.4"
   },
   "peerDependencies": {
     "react": "*"
@@ -68,6 +68,5 @@
         }
       ]
     ]
-  },
-  "gitHead": "4c5805867ce946d99ba17f71b4d6086bb8751262"
+  }
 }

package/src/SceneView.tsx

@@ -14,7 +14,13 @@ import useOptionsGetters from './useOptionsGetters';
 
 type Props<State extends NavigationState, ScreenOptions extends {}> = {
   screen: RouteConfigComponent<ParamListBase, string> & { name: string };
-  navigation: NavigationProp<ParamListBase, string, State, ScreenOptions>;
+  navigation: NavigationProp<
+    ParamListBase,
+    string,
+    string | undefined,
+    State,
+    ScreenOptions
+  >;
   route: Route<string>;
   routeState: NavigationState | PartialState<NavigationState> | undefined;
   getState: () => State;

package/src/types.tsx

@@ -25,6 +25,10 @@ export type DefaultNavigatorOptions<
   ScreenOptions extends {},
   EventMap extends EventMapBase
 > = DefaultRouterOptions<Keyof<ParamList>> & {
+  /**
+   * Optional ID for the navigator. Can be used with `navigation.getParent(id)` to refer to a parent.
+   */
+  id?: string;
   /**
    * Children React Elements to extract the route configuration from.
    * Only `Screen`, `Group` and `React.Fragment` are supported as children.
@@ -153,7 +157,7 @@ export type EventEmitter<EventMap extends EventMapBase> = {
   >;
 };
 
-export class PrivateValueStore<A, B, C> {
+export class PrivateValueStore<T extends [any, any, any]> {
   /**
    * UGLY HACK! DO NOT USE THE TYPE!!!
    *
@@ -164,7 +168,7 @@ export class PrivateValueStore<A, B, C> {
    * Adding private keyword works, but the annotation is stripped away in declaration.
    * Turns out if we use an empty string, it doesn't show up in intelliSense.
    */
-  protected ''?: { a: A; b: B; c: C };
+  protected ''?: T;
 }
 
 type NavigationHelpersCommon<
@@ -236,16 +240,26 @@ type NavigationHelpersCommon<
   canGoBack(): boolean;
 
   /**
-   * Returns the navigation prop from the parent navigator,
+   * Returns the name of the navigator specified in the `name` prop.
+   * If no name is specified, returns `undefined`.
+   */
+  getId(): string | undefined;
+
+  /**
+   * Returns the navigation helpers from a parent navigator based on the ID.
+   * If an ID is provided, the navigation helper from the parent navigator with matching ID (including current) will be returned.
+   * If no ID is provided, the navigation helper from the immediate parent navigator will be returned.
+   *
+   * @param id Optional ID of a parent navigator.
    */
-  getParent<T = NavigationProp<ParamListBase> | undefined>(): T;
+  getParent<T = NavigationHelpers<ParamListBase> | undefined>(id?: string): T;
 
   /**
    * Returns the navigator's state.
    * Note that this method doesn't re-render screen when the result changes. So don't use it in `render`.
    */
   getState(): State;
-} & PrivateValueStore<ParamList, keyof ParamList, {}>;
+} & PrivateValueStore<[ParamList, unknown, unknown]>;
 
 export type NavigationHelpers<
   ParamList extends ParamListBase,
@@ -291,10 +305,20 @@ export type NavigationContainerProps = {
 export type NavigationProp<
   ParamList extends {},
   RouteName extends keyof ParamList = Keyof<ParamList>,
+  NavigatorID extends string | undefined = undefined,
   State extends NavigationState = NavigationState<ParamList>,
   ScreenOptions extends {} = {},
   EventMap extends EventMapBase = {}
-> = NavigationHelpersCommon<ParamList, State> & {
+> = Omit<NavigationHelpersCommon<ParamList, State>, 'getParent'> & {
+  /**
+   * Returns the navigation prop from a parent navigator based on the ID.
+   * If an ID is provided, the navigation prop from the parent navigator with matching ID (including current) will be returned.
+   * If no ID is provided, the navigation prop from the immediate parent navigator will be returned.
+   *
+   * @param id Optional ID of a parent navigator.
+   */
+  getParent<T = NavigationProp<ParamListBase> | undefined>(id?: NavigatorID): T;
+
   /**
    * Update the param object for the route.
    * The new params will be shallow merged with the old one.
@@ -311,7 +335,7 @@ export type NavigationProp<
    */
   setOptions(options: Partial<ScreenOptions>): void;
 } & EventConsumer<EventMap & EventMapCore<State>> &
-  PrivateValueStore<ParamList, RouteName, EventMap>;
+  PrivateValueStore<[ParamList, RouteName, EventMap]>;
 
 export type RouteProp<
   ParamList extends ParamListBase,
@@ -319,7 +343,7 @@ export type RouteProp<
 > = Route<Extract<RouteName, string>, ParamList[RouteName]>;
 
 export type CompositeNavigationProp<
-  A extends NavigationProp<ParamListBase, string, any, any>,
+  A extends NavigationProp<ParamListBase, string, any, any, any>,
   B extends NavigationHelpersCommon<ParamListBase, any>
 > = Omit<A & B, keyof NavigationProp<any>> &
   NavigationProp<
@@ -334,30 +358,42 @@ export type CompositeNavigationProp<
      * Ideally it should work for any of them, but it's not possible to infer that way
      */
     A extends NavigationProp<any, infer R> ? R : string,
+    /**
+     * ID from both navigation objects needs to be combined for `getParent`
+     */
+    | (A extends NavigationProp<any, any, infer I> ? I : never)
+    | (B extends NavigationProp<any, any, infer J> ? J : never),
     /**
      * The type of state should refer to the state specified in the first type
      */
-    A extends NavigationProp<any, any, infer S> ? S : NavigationState,
+    A extends NavigationProp<any, any, any, infer S> ? S : NavigationState,
     /**
      * Screen options from both navigation objects needs to be combined
      * This allows typechecking `setOptions`
      */
-    (A extends NavigationProp<any, any, any, infer O> ? O : {}) &
-      (B extends NavigationProp<any, any, any, infer P> ? P : {}),
+    (A extends NavigationProp<any, any, any, any, infer O> ? O : {}) &
+      (B extends NavigationProp<any, any, any, any, infer P> ? P : {}),
     /**
      * Event consumer config should refer to the config specified in the first type
      * This allows typechecking `addListener`/`removeListener`
      */
-    A extends NavigationProp<any, any, any, any, infer E> ? E : {}
+    A extends NavigationProp<any, any, any, any, any, infer E> ? E : {}
   >;
 
 export type CompositeScreenProps<
   A extends {
-    navigation: NavigationProp<ParamListBase, string, any, any>;
+    navigation: NavigationProp<
+      ParamListBase,
+      string,
+      string | undefined,
+      any,
+      any,
+      any
+    >;
     route: RouteProp<ParamListBase>;
   },
   B extends {
-    navigation: NavigationHelpersCommon<ParamListBase, any>;
+    navigation: NavigationHelpersCommon<any, any>;
   }
 > = {
   navigation: CompositeNavigationProp<A['navigation'], B['navigation']>;
@@ -366,7 +402,7 @@ export type CompositeScreenProps<
 
 export type Descriptor<
   ScreenOptions extends {},
-  Navigation extends NavigationProp<any, any, any, any, any>,
+  Navigation extends NavigationProp<any, any, any, any, any, any>,
   Route extends RouteProp<any, any>
 > = {
   /**

package/src/useChildListeners.tsx

@@ -15,14 +15,16 @@ export default function useChildListeners() {
 
   const addListener = React.useCallback(
     <T extends keyof ListenerMap>(type: T, listener: ListenerMap[T]) => {
-      // @ts-expect-error: listener should be correct type according to `type`
       listeners[type].push(listener);
 
+      let removed = false;
       return () => {
-        // @ts-expect-error: listener should be correct type according to `type`
         const index = listeners[type].indexOf(listener);
 
-        listeners[type].splice(index, 1);
+        if (!removed && index > -1) {
+          removed = true;
+          listeners[type].splice(index, 1);
+        }
       };
     },
     [listeners]

package/src/useDescriptors.tsx

@@ -143,7 +143,14 @@ export default function useDescriptors<
       string,
       Descriptor<
         ScreenOptions,
-        NavigationProp<ParamListBase, string, State, ScreenOptions, EventMap> &
+        NavigationProp<
+          ParamListBase,
+          string,
+          string | undefined,
+          State,
+          ScreenOptions,
+          EventMap
+        > &
           ActionHelpers,
         RouteProp<ParamListBase>
       >

package/src/useEventEmitter.tsx

@@ -35,7 +35,9 @@ export default function useEventEmitter<T extends Record<string, any>>(
 
       const index = callbacks.indexOf(callback);
 
-      callbacks.splice(index, 1);
+      if (index > -1) {
+        callbacks.splice(index, 1);
+      }
     };
 
     const addListener = (type: string, callback: (data: any) => void) => {
@@ -43,7 +45,14 @@ export default function useEventEmitter<T extends Record<string, any>>(
       listeners.current[type][target] = listeners.current[type][target] || [];
       listeners.current[type][target].push(callback);
 
-      return () => removeListener(type, callback);
+      let removed = false;
+      return () => {
+        // Prevent removing other listeners when unsubscribing same listener multiple times
+        if (!removed) {
+          removed = true;
+          removeListener(type, callback);
+        }
+      };
     };
 
     return {

package/src/useKeyedChildListeners.tsx

@@ -22,9 +22,11 @@ export default function useKeyedChildListeners() {
       key: string,
       listener: KeyedListenerMap[T]
     ) => {
+      // @ts-expect-error: according to ref stated above you can use `key` to index type
       keyedListeners[type][key] = listener;
 
       return () => {
+        // @ts-expect-error: according to ref stated above you can use `key` to index type
         keyedListeners[type][key] = undefined;
       };
     },

package/src/useNavigationBuilder.tsx

@@ -645,6 +645,7 @@ export default function useNavigationBuilder<
     NavigationAction,
     EventMap
   >({
+    id: options.id,
     onAction,
     getState,
     emitter,

package/src/useNavigationCache.tsx

@@ -32,7 +32,14 @@ type NavigationCache<
   EventMap extends Record<string, any>
 > = Record<
   string,
-  NavigationProp<ParamListBase, string, State, ScreenOptions, EventMap>
+  NavigationProp<
+    ParamListBase,
+    string,
+    string | undefined,
+    State,
+    ScreenOptions,
+    EventMap
+  >
 >;
 
 /**
@@ -133,6 +140,15 @@ export default function useNavigationCache<
         // FIXME: too much work to fix the types for now
         ...(emitter.create(route.key) as any),
         dispatch: (thunk: Thunk) => withStack(() => dispatch(thunk)),
+        getParent: (id?: string) => {
+          if (id !== undefined && id === rest.getId()) {
+            // If the passed id is the same as the current navigation id,
+            // we return the cached navigation object for the relevant route
+            return acc[route.key];
+          }
+
+          return rest.getParent(id);
+        },
         setOptions: (options: object) =>
           setOptions((o) => ({
             ...o,

package/src/useNavigationHelpers.tsx

@@ -8,7 +8,7 @@ import {
 import * as React from 'react';
 
 import NavigationContext from './NavigationContext';
-import { NavigationHelpers, NavigationProp, PrivateValueStore } from './types';
+import { NavigationHelpers, PrivateValueStore } from './types';
 import UnhandledActionContext from './UnhandledActionContext';
 import type { NavigationEventEmitter } from './useEventEmitter';
 
@@ -17,6 +17,7 @@ import type { NavigationEventEmitter } from './useEventEmitter';
 PrivateValueStore;
 
 type Options<State extends NavigationState, Action extends NavigationAction> = {
+  id: string | undefined;
   onAction: (action: NavigationAction) => boolean;
   getState: () => State;
   emitter: NavigationEventEmitter<any>;
@@ -32,7 +33,13 @@ export default function useNavigationHelpers<
   ActionHelpers extends Record<string, () => void>,
   Action extends NavigationAction,
   EventMap extends Record<string, any>
->({ onAction, getState, emitter, router }: Options<State, Action>) {
+>({
+  id: navigatorId,
+  onAction,
+  getState,
+  emitter,
+  router,
+}: Options<State, Action>) {
   const onUnhandledAction = React.useContext(UnhandledActionContext);
   const parentNavigationHelpers = React.useContext(NavigationContext);
 
@@ -52,16 +59,13 @@ export default function useNavigationHelpers<
       ...CommonActions,
     };
 
-    const helpers = Object.keys(actions).reduce<Record<string, () => void>>(
-      (acc, name) => {
-        // @ts-expect-error: name is a valid key, but TypeScript is dumb
-        acc[name] = (...args: any) => dispatch(actions[name](...args));
-        return acc;
-      },
-      {}
-    );
+    const helpers = Object.keys(actions).reduce((acc, name) => {
+      // @ts-expect-error: name is a valid key, but TypeScript is dumb
+      acc[name] = (...args: any) => dispatch(actions[name](...args));
+      return acc;
+    }, {} as ActionHelpers);
 
-    return {
+    const navigationHelpers = {
       ...parentNavigationHelpers,
       ...helpers,
       dispatch,
@@ -82,12 +86,26 @@ export default function useNavigationHelpers<
           false
         );
       },
-      getParent: () => parentNavigationHelpers as any,
+      getId: () => navigatorId,
+      getParent: (id?: string) => {
+        if (id !== undefined) {
+          let current = navigationHelpers;
+
+          while (current && id !== current.getId()) {
+            current = current.getParent();
+          }
+
+          return current;
+        }
+
+        return parentNavigationHelpers;
+      },
       getState,
-    } as NavigationHelpers<ParamListBase, EventMap> &
-      (NavigationProp<ParamListBase, string, any, any, any> | undefined) &
-      ActionHelpers;
+    } as NavigationHelpers<ParamListBase, EventMap> & ActionHelpers;
+
+    return navigationHelpers;
   }, [
+    navigatorId,
     emitter.emit,
     getState,
     onAction,