diff --git a/native/flow-typed/npm/@react-navigation/bottom-tabs_v5.x.x.js b/native/flow-typed/npm/@react-navigation/bottom-tabs_v5.x.x.js
--- a/native/flow-typed/npm/@react-navigation/bottom-tabs_v5.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/bottom-tabs_v5.x.x.js
@@ -1940,23 +1940,25 @@
     +drawerClose: {| +data: void, +canPreventDefault: false |},
   |};
 
-  declare export type InexactDrawerNavigationProp<
+  declare type DrawerExtraNavigationHelpers<
+    ParamList: ParamListBase = ParamListBase,
+  > = {|
+    +jumpTo: SimpleNavigate<ParamList>,
+    +openDrawer: () => void,
+    +closeDrawer: () => void,
+    +toggleDrawer: () => void,
+  |};
+
+  declare export type DrawerNavigationHelpers<
     ParamList: ParamListBase = ParamListBase,
-    RouteName: $Keys<ParamList> = $Keys<ParamList>,
-    Options: {...} = DrawerOptions,
     EventMap: EventMapBase = DrawerNavigationEventMap,
   > = {
-    ...$Exact<NavigationProp<
+    ...$Exact<NavigationHelpers<
       ParamList,
-      RouteName,
       DrawerNavigationState,
-      Options,
       EventMap,
     >>,
-    +jumpTo: SimpleNavigate<ParamList>,
-    +openDrawer: () => void,
-    +closeDrawer: () => void,
-    +toggleDrawer: () => void,
+    ...DrawerExtraNavigationHelpers<ParamList>,
     ...
   };
 
@@ -1965,19 +1967,23 @@
     RouteName: $Keys<ParamList> = $Keys<ParamList>,
     Options: {...} = DrawerOptions,
     EventMap: EventMapBase = DrawerNavigationEventMap,
-  > = $Exact<InexactDrawerNavigationProp<
-    ParamList,
-    RouteName,
-    Options,
-    EventMap,
-  >>;
+  > = {|
+    ...$Exact<NavigationProp<
+      ParamList,
+      RouteName,
+      DrawerNavigationState,
+      Options,
+      EventMap,
+    >>,
+    ...DrawerExtraNavigationHelpers<ParamList>,
+  |};
 
   /**
    * Miscellaneous drawer exports
    */
 
   declare export type DrawerDescriptor = Descriptor<
-    DrawerNavigationProp<>,
+    DrawerNavigationHelpers<>,
     DrawerOptions,
   >;
 
@@ -1998,7 +2004,7 @@
 
   declare type DrawerNavigationBuilderResult = {|
     +state: DrawerNavigationState,
-    +navigation: DrawerNavigationProp<>,
+    +navigation: DrawerNavigationHelpers<>,
     +descriptors: {| +[key: string]: DrawerDescriptor |},
   |};
 
@@ -2033,10 +2039,10 @@
   |};
 
   declare export type DrawerNavigatorProps<
-    NavProp: InexactDrawerNavigationProp<> = DrawerNavigationProp<>,
+    NavHelpers: DrawerNavigationHelpers<> = DrawerNavigationHelpers<>,
   > = {|
     ...ExtraDrawerNavigatorProps,
-    ...ScreenOptionsProp<DrawerOptions, NavProp>,
+    ...ScreenOptionsProp<DrawerOptions, NavHelpers>,
   |};
 
   /**
diff --git a/native/flow-typed/npm/@react-navigation/devtools_v5.x.x.js b/native/flow-typed/npm/@react-navigation/devtools_v5.x.x.js
--- a/native/flow-typed/npm/@react-navigation/devtools_v5.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/devtools_v5.x.x.js
@@ -1940,23 +1940,25 @@
     +drawerClose: {| +data: void, +canPreventDefault: false |},
   |};
 
-  declare export type InexactDrawerNavigationProp<
+  declare type DrawerExtraNavigationHelpers<
+    ParamList: ParamListBase = ParamListBase,
+  > = {|
+    +jumpTo: SimpleNavigate<ParamList>,
+    +openDrawer: () => void,
+    +closeDrawer: () => void,
+    +toggleDrawer: () => void,
+  |};
+
+  declare export type DrawerNavigationHelpers<
     ParamList: ParamListBase = ParamListBase,
-    RouteName: $Keys<ParamList> = $Keys<ParamList>,
-    Options: {...} = DrawerOptions,
     EventMap: EventMapBase = DrawerNavigationEventMap,
   > = {
-    ...$Exact<NavigationProp<
+    ...$Exact<NavigationHelpers<
       ParamList,
-      RouteName,
       DrawerNavigationState,
-      Options,
       EventMap,
     >>,
-    +jumpTo: SimpleNavigate<ParamList>,
-    +openDrawer: () => void,
-    +closeDrawer: () => void,
-    +toggleDrawer: () => void,
+    ...DrawerExtraNavigationHelpers<ParamList>,
     ...
   };
 
@@ -1965,19 +1967,23 @@
     RouteName: $Keys<ParamList> = $Keys<ParamList>,
     Options: {...} = DrawerOptions,
     EventMap: EventMapBase = DrawerNavigationEventMap,
-  > = $Exact<InexactDrawerNavigationProp<
-    ParamList,
-    RouteName,
-    Options,
-    EventMap,
-  >>;
+  > = {|
+    ...$Exact<NavigationProp<
+      ParamList,
+      RouteName,
+      DrawerNavigationState,
+      Options,
+      EventMap,
+    >>,
+    ...DrawerExtraNavigationHelpers<ParamList>,
+  |};
 
   /**
    * Miscellaneous drawer exports
    */
 
   declare export type DrawerDescriptor = Descriptor<
-    DrawerNavigationProp<>,
+    DrawerNavigationHelpers<>,
     DrawerOptions,
   >;
 
@@ -1998,7 +2004,7 @@
 
   declare type DrawerNavigationBuilderResult = {|
     +state: DrawerNavigationState,
-    +navigation: DrawerNavigationProp<>,
+    +navigation: DrawerNavigationHelpers<>,
     +descriptors: {| +[key: string]: DrawerDescriptor |},
   |};
 
@@ -2033,10 +2039,10 @@
   |};
 
   declare export type DrawerNavigatorProps<
-    NavProp: InexactDrawerNavigationProp<> = DrawerNavigationProp<>,
+    NavHelpers: DrawerNavigationHelpers<> = DrawerNavigationHelpers<>,
   > = {|
     ...ExtraDrawerNavigatorProps,
-    ...ScreenOptionsProp<DrawerOptions, NavProp>,
+    ...ScreenOptionsProp<DrawerOptions, NavHelpers>,
   |};
 
   /**
diff --git a/native/flow-typed/npm/@react-navigation/material-top-tabs_v5.x.x.js b/native/flow-typed/npm/@react-navigation/material-top-tabs_v5.x.x.js
--- a/native/flow-typed/npm/@react-navigation/material-top-tabs_v5.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/material-top-tabs_v5.x.x.js
@@ -1940,23 +1940,25 @@
     +drawerClose: {| +data: void, +canPreventDefault: false |},
   |};
 
-  declare export type InexactDrawerNavigationProp<
+  declare type DrawerExtraNavigationHelpers<
+    ParamList: ParamListBase = ParamListBase,
+  > = {|
+    +jumpTo: SimpleNavigate<ParamList>,
+    +openDrawer: () => void,
+    +closeDrawer: () => void,
+    +toggleDrawer: () => void,
+  |};
+
+  declare export type DrawerNavigationHelpers<
     ParamList: ParamListBase = ParamListBase,
-    RouteName: $Keys<ParamList> = $Keys<ParamList>,
-    Options: {...} = DrawerOptions,
     EventMap: EventMapBase = DrawerNavigationEventMap,
   > = {
-    ...$Exact<NavigationProp<
+    ...$Exact<NavigationHelpers<
       ParamList,
-      RouteName,
       DrawerNavigationState,
-      Options,
       EventMap,
     >>,
-    +jumpTo: SimpleNavigate<ParamList>,
-    +openDrawer: () => void,
-    +closeDrawer: () => void,
-    +toggleDrawer: () => void,
+    ...DrawerExtraNavigationHelpers<ParamList>,
     ...
   };
 
@@ -1965,19 +1967,23 @@
     RouteName: $Keys<ParamList> = $Keys<ParamList>,
     Options: {...} = DrawerOptions,
     EventMap: EventMapBase = DrawerNavigationEventMap,
-  > = $Exact<InexactDrawerNavigationProp<
-    ParamList,
-    RouteName,
-    Options,
-    EventMap,
-  >>;
+  > = {|
+    ...$Exact<NavigationProp<
+      ParamList,
+      RouteName,
+      DrawerNavigationState,
+      Options,
+      EventMap,
+    >>,
+    ...DrawerExtraNavigationHelpers<ParamList>,
+  |};
 
   /**
    * Miscellaneous drawer exports
    */
 
   declare export type DrawerDescriptor = Descriptor<
-    DrawerNavigationProp<>,
+    DrawerNavigationHelpers<>,
     DrawerOptions,
   >;
 
@@ -1998,7 +2004,7 @@
 
   declare type DrawerNavigationBuilderResult = {|
     +state: DrawerNavigationState,
-    +navigation: DrawerNavigationProp<>,
+    +navigation: DrawerNavigationHelpers<>,
     +descriptors: {| +[key: string]: DrawerDescriptor |},
   |};
 
@@ -2033,10 +2039,10 @@
   |};
 
   declare export type DrawerNavigatorProps<
-    NavProp: InexactDrawerNavigationProp<> = DrawerNavigationProp<>,
+    NavHelpers: DrawerNavigationHelpers<> = DrawerNavigationHelpers<>,
   > = {|
     ...ExtraDrawerNavigatorProps,
-    ...ScreenOptionsProp<DrawerOptions, NavProp>,
+    ...ScreenOptionsProp<DrawerOptions, NavHelpers>,
   |};
 
   /**
diff --git a/native/flow-typed/npm/@react-navigation/native_v5.x.x.js b/native/flow-typed/npm/@react-navigation/native_v5.x.x.js
--- a/native/flow-typed/npm/@react-navigation/native_v5.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/native_v5.x.x.js
@@ -1940,23 +1940,25 @@
     +drawerClose: {| +data: void, +canPreventDefault: false |},
   |};
 
-  declare export type InexactDrawerNavigationProp<
+  declare type DrawerExtraNavigationHelpers<
+    ParamList: ParamListBase = ParamListBase,
+  > = {|
+    +jumpTo: SimpleNavigate<ParamList>,
+    +openDrawer: () => void,
+    +closeDrawer: () => void,
+    +toggleDrawer: () => void,
+  |};
+
+  declare export type DrawerNavigationHelpers<
     ParamList: ParamListBase = ParamListBase,
-    RouteName: $Keys<ParamList> = $Keys<ParamList>,
-    Options: {...} = DrawerOptions,
     EventMap: EventMapBase = DrawerNavigationEventMap,
   > = {
-    ...$Exact<NavigationProp<
+    ...$Exact<NavigationHelpers<
       ParamList,
-      RouteName,
       DrawerNavigationState,
-      Options,
       EventMap,
     >>,
-    +jumpTo: SimpleNavigate<ParamList>,
-    +openDrawer: () => void,
-    +closeDrawer: () => void,
-    +toggleDrawer: () => void,
+    ...DrawerExtraNavigationHelpers<ParamList>,
     ...
   };
 
@@ -1965,19 +1967,23 @@
     RouteName: $Keys<ParamList> = $Keys<ParamList>,
     Options: {...} = DrawerOptions,
     EventMap: EventMapBase = DrawerNavigationEventMap,
-  > = $Exact<InexactDrawerNavigationProp<
-    ParamList,
-    RouteName,
-    Options,
-    EventMap,
-  >>;
+  > = {|
+    ...$Exact<NavigationProp<
+      ParamList,
+      RouteName,
+      DrawerNavigationState,
+      Options,
+      EventMap,
+    >>,
+    ...DrawerExtraNavigationHelpers<ParamList>,
+  |};
 
   /**
    * Miscellaneous drawer exports
    */
 
   declare export type DrawerDescriptor = Descriptor<
-    DrawerNavigationProp<>,
+    DrawerNavigationHelpers<>,
     DrawerOptions,
   >;
 
@@ -1998,7 +2004,7 @@
 
   declare type DrawerNavigationBuilderResult = {|
     +state: DrawerNavigationState,
-    +navigation: DrawerNavigationProp<>,
+    +navigation: DrawerNavigationHelpers<>,
     +descriptors: {| +[key: string]: DrawerDescriptor |},
   |};
 
@@ -2033,10 +2039,10 @@
   |};
 
   declare export type DrawerNavigatorProps<
-    NavProp: InexactDrawerNavigationProp<> = DrawerNavigationProp<>,
+    NavHelpers: DrawerNavigationHelpers<> = DrawerNavigationHelpers<>,
   > = {|
     ...ExtraDrawerNavigatorProps,
-    ...ScreenOptionsProp<DrawerOptions, NavProp>,
+    ...ScreenOptionsProp<DrawerOptions, NavHelpers>,
   |};
 
   /**
diff --git a/native/flow-typed/npm/@react-navigation/stack_v5.x.x.js b/native/flow-typed/npm/@react-navigation/stack_v5.x.x.js
--- a/native/flow-typed/npm/@react-navigation/stack_v5.x.x.js
+++ b/native/flow-typed/npm/@react-navigation/stack_v5.x.x.js
@@ -1940,23 +1940,25 @@
     +drawerClose: {| +data: void, +canPreventDefault: false |},
   |};
 
-  declare export type InexactDrawerNavigationProp<
+  declare type DrawerExtraNavigationHelpers<
+    ParamList: ParamListBase = ParamListBase,
+  > = {|
+    +jumpTo: SimpleNavigate<ParamList>,
+    +openDrawer: () => void,
+    +closeDrawer: () => void,
+    +toggleDrawer: () => void,
+  |};
+
+  declare export type DrawerNavigationHelpers<
     ParamList: ParamListBase = ParamListBase,
-    RouteName: $Keys<ParamList> = $Keys<ParamList>,
-    Options: {...} = DrawerOptions,
     EventMap: EventMapBase = DrawerNavigationEventMap,
   > = {
-    ...$Exact<NavigationProp<
+    ...$Exact<NavigationHelpers<
       ParamList,
-      RouteName,
       DrawerNavigationState,
-      Options,
       EventMap,
     >>,
-    +jumpTo: SimpleNavigate<ParamList>,
-    +openDrawer: () => void,
-    +closeDrawer: () => void,
-    +toggleDrawer: () => void,
+    ...DrawerExtraNavigationHelpers<ParamList>,
     ...
   };
 
@@ -1965,19 +1967,23 @@
     RouteName: $Keys<ParamList> = $Keys<ParamList>,
     Options: {...} = DrawerOptions,
     EventMap: EventMapBase = DrawerNavigationEventMap,
-  > = $Exact<InexactDrawerNavigationProp<
-    ParamList,
-    RouteName,
-    Options,
-    EventMap,
-  >>;
+  > = {|
+    ...$Exact<NavigationProp<
+      ParamList,
+      RouteName,
+      DrawerNavigationState,
+      Options,
+      EventMap,
+    >>,
+    ...DrawerExtraNavigationHelpers<ParamList>,
+  |};
 
   /**
    * Miscellaneous drawer exports
    */
 
   declare export type DrawerDescriptor = Descriptor<
-    DrawerNavigationProp<>,
+    DrawerNavigationHelpers<>,
     DrawerOptions,
   >;
 
@@ -1998,7 +2004,7 @@
 
   declare type DrawerNavigationBuilderResult = {|
     +state: DrawerNavigationState,
-    +navigation: DrawerNavigationProp<>,
+    +navigation: DrawerNavigationHelpers<>,
     +descriptors: {| +[key: string]: DrawerDescriptor |},
   |};
 
@@ -2033,10 +2039,10 @@
   |};
 
   declare export type DrawerNavigatorProps<
-    NavProp: InexactDrawerNavigationProp<> = DrawerNavigationProp<>,
+    NavHelpers: DrawerNavigationHelpers<> = DrawerNavigationHelpers<>,
   > = {|
     ...ExtraDrawerNavigatorProps,
-    ...ScreenOptionsProp<DrawerOptions, NavProp>,
+    ...ScreenOptionsProp<DrawerOptions, NavHelpers>,
   |};
 
   /**