Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3249362
D5403.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
35 KB
Referenced Files
None
Subscribers
None
D5403.diff
View Options
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
@@ -1492,53 +1492,47 @@
+tabLongPress: {| +data: void, +canPreventDefault: false |},
|};
- declare type InexactTabNavigationProp<
- ParamList: ParamListBase,
- RouteName: $Keys<ParamList>,
- Options: {...},
- EventMap: EventMapBase,
+ declare type TabExtraNavigationHelpers<
+ ParamList: ParamListBase = ParamListBase,
+ > = {|
+ +jumpTo: SimpleNavigate<ParamList>,
+ |};
+
+ declare export type BottomTabNavigationHelpers<
+ ParamList: ParamListBase = ParamListBase,
+ EventMap: EventMapBase = BottomTabNavigationEventMap,
> = {
- ...$Exact<NavigationProp<
+ ...$Exact<NavigationHelpers<
ParamList,
- RouteName,
TabNavigationState,
- Options,
EventMap,
>>,
- +jumpTo: SimpleNavigate<ParamList>,
+ ...TabExtraNavigationHelpers<ParamList>,
...
};
- declare export type InexactBottomTabNavigationProp<
- ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = BottomTabOptions,
- EventMap: EventMapBase = BottomTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
-
declare export type BottomTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = BottomTabOptions,
EventMap: EventMapBase = BottomTabNavigationEventMap,
- > = $Exact<InexactBottomTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous bottom tab exports
*/
declare export type BottomTabDescriptor = Descriptor<
- BottomTabNavigationProp<>,
+ BottomTabNavigationHelpers<>,
BottomTabOptions,
>;
@@ -1562,7 +1556,7 @@
declare type BottomTabNavigationBuilderResult = {|
+state: TabNavigationState,
- +navigation: BottomTabNavigationProp<>,
+ +navigation: BottomTabNavigationHelpers<>,
+descriptors: {| +[key: string]: BottomTabDescriptor |},
|};
@@ -1585,10 +1579,10 @@
|};
declare export type BottomTabNavigatorProps<
- NavProp: InexactBottomTabNavigationProp<> = BottomTabNavigationProp<>,
+ NavHelpers: BottomTabNavigationHelpers<> = BottomTabNavigationHelpers<>,
> = {|
...ExtraBottomTabNavigatorProps,
- ...ScreenOptionsProp<BottomTabOptions, NavProp>,
+ ...ScreenOptionsProp<BottomTabOptions, NavHelpers>,
|};
/**
@@ -1616,29 +1610,34 @@
+tabPress: {| +data: void, +canPreventDefault: true |},
|};
- declare export type InexactMaterialBottomTabNavigationProp<
+ declare export type MaterialBottomTabNavigationHelpers<
ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = MaterialBottomTabOptions,
EventMap: EventMapBase = MaterialBottomTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
+ > = {
+ ...$Exact<NavigationHelpers<
+ ParamList,
+ TabNavigationState,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ ...
+ };
declare export type MaterialBottomTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = MaterialBottomTabOptions,
EventMap: EventMapBase = MaterialBottomTabNavigationEventMap,
- > = $Exact<InexactMaterialBottomTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous material bottom tab exports
@@ -1731,11 +1730,11 @@
|};
declare export type MaterialBottomTabNavigatorProps<
- NavProp: InexactMaterialBottomTabNavigationProp<> =
- MaterialBottomTabNavigationProp<>,
+ NavHelpers: MaterialBottomTabNavigationHelpers<> =
+ MaterialBottomTabNavigationHelpers<>,
> = {|
...ExtraMaterialBottomTabNavigatorProps,
- ...ScreenOptionsProp<MaterialBottomTabOptions, NavProp>,
+ ...ScreenOptionsProp<MaterialBottomTabOptions, NavHelpers>,
|};
/**
@@ -1764,29 +1763,34 @@
+swipeEnd: {| +data: void, +canPreventDefault: false |},
|};
- declare export type InexactMaterialTopTabNavigationProp<
+ declare export type MaterialTopTabNavigationHelpers<
ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = MaterialTopTabOptions,
EventMap: EventMapBase = MaterialTopTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
+ > = {
+ ...$Exact<NavigationHelpers<
+ ParamList,
+ TabNavigationState,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ ...
+ };
declare export type MaterialTopTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = MaterialTopTabOptions,
EventMap: EventMapBase = MaterialTopTabNavigationEventMap,
- > = $Exact<InexactMaterialTopTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous material top tab exports
@@ -1858,13 +1862,13 @@
|}>;
declare export type MaterialTopTabDescriptor = Descriptor<
- MaterialBottomTabNavigationProp<>,
+ MaterialBottomTabNavigationHelpers<>,
MaterialBottomTabOptions,
>;
declare type MaterialTopTabNavigationBuilderResult = {|
+state: TabNavigationState,
- +navigation: MaterialTopTabNavigationProp<>,
+ +navigation: MaterialTopTabNavigationHelpers<>,
+descriptors: {| +[key: string]: MaterialTopTabDescriptor |},
|};
@@ -1900,11 +1904,11 @@
|};
declare export type MaterialTopTabNavigatorProps<
- NavProp: InexactMaterialTopTabNavigationProp<> =
- MaterialTopTabNavigationProp<>,
+ NavHelpers: MaterialTopTabNavigationHelpers<> =
+ MaterialTopTabNavigationHelpers<>,
> = {|
...ExtraMaterialTopTabNavigatorProps,
- ...ScreenOptionsProp<MaterialTopTabOptions, NavProp>,
+ ...ScreenOptionsProp<MaterialTopTabOptions, 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
@@ -1492,53 +1492,47 @@
+tabLongPress: {| +data: void, +canPreventDefault: false |},
|};
- declare type InexactTabNavigationProp<
- ParamList: ParamListBase,
- RouteName: $Keys<ParamList>,
- Options: {...},
- EventMap: EventMapBase,
+ declare type TabExtraNavigationHelpers<
+ ParamList: ParamListBase = ParamListBase,
+ > = {|
+ +jumpTo: SimpleNavigate<ParamList>,
+ |};
+
+ declare export type BottomTabNavigationHelpers<
+ ParamList: ParamListBase = ParamListBase,
+ EventMap: EventMapBase = BottomTabNavigationEventMap,
> = {
- ...$Exact<NavigationProp<
+ ...$Exact<NavigationHelpers<
ParamList,
- RouteName,
TabNavigationState,
- Options,
EventMap,
>>,
- +jumpTo: SimpleNavigate<ParamList>,
+ ...TabExtraNavigationHelpers<ParamList>,
...
};
- declare export type InexactBottomTabNavigationProp<
- ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = BottomTabOptions,
- EventMap: EventMapBase = BottomTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
-
declare export type BottomTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = BottomTabOptions,
EventMap: EventMapBase = BottomTabNavigationEventMap,
- > = $Exact<InexactBottomTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous bottom tab exports
*/
declare export type BottomTabDescriptor = Descriptor<
- BottomTabNavigationProp<>,
+ BottomTabNavigationHelpers<>,
BottomTabOptions,
>;
@@ -1562,7 +1556,7 @@
declare type BottomTabNavigationBuilderResult = {|
+state: TabNavigationState,
- +navigation: BottomTabNavigationProp<>,
+ +navigation: BottomTabNavigationHelpers<>,
+descriptors: {| +[key: string]: BottomTabDescriptor |},
|};
@@ -1585,10 +1579,10 @@
|};
declare export type BottomTabNavigatorProps<
- NavProp: InexactBottomTabNavigationProp<> = BottomTabNavigationProp<>,
+ NavHelpers: BottomTabNavigationHelpers<> = BottomTabNavigationHelpers<>,
> = {|
...ExtraBottomTabNavigatorProps,
- ...ScreenOptionsProp<BottomTabOptions, NavProp>,
+ ...ScreenOptionsProp<BottomTabOptions, NavHelpers>,
|};
/**
@@ -1616,29 +1610,34 @@
+tabPress: {| +data: void, +canPreventDefault: true |},
|};
- declare export type InexactMaterialBottomTabNavigationProp<
+ declare export type MaterialBottomTabNavigationHelpers<
ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = MaterialBottomTabOptions,
EventMap: EventMapBase = MaterialBottomTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
+ > = {
+ ...$Exact<NavigationHelpers<
+ ParamList,
+ TabNavigationState,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ ...
+ };
declare export type MaterialBottomTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = MaterialBottomTabOptions,
EventMap: EventMapBase = MaterialBottomTabNavigationEventMap,
- > = $Exact<InexactMaterialBottomTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous material bottom tab exports
@@ -1731,11 +1730,11 @@
|};
declare export type MaterialBottomTabNavigatorProps<
- NavProp: InexactMaterialBottomTabNavigationProp<> =
- MaterialBottomTabNavigationProp<>,
+ NavHelpers: MaterialBottomTabNavigationHelpers<> =
+ MaterialBottomTabNavigationHelpers<>,
> = {|
...ExtraMaterialBottomTabNavigatorProps,
- ...ScreenOptionsProp<MaterialBottomTabOptions, NavProp>,
+ ...ScreenOptionsProp<MaterialBottomTabOptions, NavHelpers>,
|};
/**
@@ -1764,29 +1763,34 @@
+swipeEnd: {| +data: void, +canPreventDefault: false |},
|};
- declare export type InexactMaterialTopTabNavigationProp<
+ declare export type MaterialTopTabNavigationHelpers<
ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = MaterialTopTabOptions,
EventMap: EventMapBase = MaterialTopTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
+ > = {
+ ...$Exact<NavigationHelpers<
+ ParamList,
+ TabNavigationState,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ ...
+ };
declare export type MaterialTopTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = MaterialTopTabOptions,
EventMap: EventMapBase = MaterialTopTabNavigationEventMap,
- > = $Exact<InexactMaterialTopTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous material top tab exports
@@ -1858,13 +1862,13 @@
|}>;
declare export type MaterialTopTabDescriptor = Descriptor<
- MaterialBottomTabNavigationProp<>,
+ MaterialBottomTabNavigationHelpers<>,
MaterialBottomTabOptions,
>;
declare type MaterialTopTabNavigationBuilderResult = {|
+state: TabNavigationState,
- +navigation: MaterialTopTabNavigationProp<>,
+ +navigation: MaterialTopTabNavigationHelpers<>,
+descriptors: {| +[key: string]: MaterialTopTabDescriptor |},
|};
@@ -1900,11 +1904,11 @@
|};
declare export type MaterialTopTabNavigatorProps<
- NavProp: InexactMaterialTopTabNavigationProp<> =
- MaterialTopTabNavigationProp<>,
+ NavHelpers: MaterialTopTabNavigationHelpers<> =
+ MaterialTopTabNavigationHelpers<>,
> = {|
...ExtraMaterialTopTabNavigatorProps,
- ...ScreenOptionsProp<MaterialTopTabOptions, NavProp>,
+ ...ScreenOptionsProp<MaterialTopTabOptions, 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
@@ -1492,53 +1492,47 @@
+tabLongPress: {| +data: void, +canPreventDefault: false |},
|};
- declare type InexactTabNavigationProp<
- ParamList: ParamListBase,
- RouteName: $Keys<ParamList>,
- Options: {...},
- EventMap: EventMapBase,
+ declare type TabExtraNavigationHelpers<
+ ParamList: ParamListBase = ParamListBase,
+ > = {|
+ +jumpTo: SimpleNavigate<ParamList>,
+ |};
+
+ declare export type BottomTabNavigationHelpers<
+ ParamList: ParamListBase = ParamListBase,
+ EventMap: EventMapBase = BottomTabNavigationEventMap,
> = {
- ...$Exact<NavigationProp<
+ ...$Exact<NavigationHelpers<
ParamList,
- RouteName,
TabNavigationState,
- Options,
EventMap,
>>,
- +jumpTo: SimpleNavigate<ParamList>,
+ ...TabExtraNavigationHelpers<ParamList>,
...
};
- declare export type InexactBottomTabNavigationProp<
- ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = BottomTabOptions,
- EventMap: EventMapBase = BottomTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
-
declare export type BottomTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = BottomTabOptions,
EventMap: EventMapBase = BottomTabNavigationEventMap,
- > = $Exact<InexactBottomTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous bottom tab exports
*/
declare export type BottomTabDescriptor = Descriptor<
- BottomTabNavigationProp<>,
+ BottomTabNavigationHelpers<>,
BottomTabOptions,
>;
@@ -1562,7 +1556,7 @@
declare type BottomTabNavigationBuilderResult = {|
+state: TabNavigationState,
- +navigation: BottomTabNavigationProp<>,
+ +navigation: BottomTabNavigationHelpers<>,
+descriptors: {| +[key: string]: BottomTabDescriptor |},
|};
@@ -1585,10 +1579,10 @@
|};
declare export type BottomTabNavigatorProps<
- NavProp: InexactBottomTabNavigationProp<> = BottomTabNavigationProp<>,
+ NavHelpers: BottomTabNavigationHelpers<> = BottomTabNavigationHelpers<>,
> = {|
...ExtraBottomTabNavigatorProps,
- ...ScreenOptionsProp<BottomTabOptions, NavProp>,
+ ...ScreenOptionsProp<BottomTabOptions, NavHelpers>,
|};
/**
@@ -1616,29 +1610,34 @@
+tabPress: {| +data: void, +canPreventDefault: true |},
|};
- declare export type InexactMaterialBottomTabNavigationProp<
+ declare export type MaterialBottomTabNavigationHelpers<
ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = MaterialBottomTabOptions,
EventMap: EventMapBase = MaterialBottomTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
+ > = {
+ ...$Exact<NavigationHelpers<
+ ParamList,
+ TabNavigationState,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ ...
+ };
declare export type MaterialBottomTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = MaterialBottomTabOptions,
EventMap: EventMapBase = MaterialBottomTabNavigationEventMap,
- > = $Exact<InexactMaterialBottomTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous material bottom tab exports
@@ -1731,11 +1730,11 @@
|};
declare export type MaterialBottomTabNavigatorProps<
- NavProp: InexactMaterialBottomTabNavigationProp<> =
- MaterialBottomTabNavigationProp<>,
+ NavHelpers: MaterialBottomTabNavigationHelpers<> =
+ MaterialBottomTabNavigationHelpers<>,
> = {|
...ExtraMaterialBottomTabNavigatorProps,
- ...ScreenOptionsProp<MaterialBottomTabOptions, NavProp>,
+ ...ScreenOptionsProp<MaterialBottomTabOptions, NavHelpers>,
|};
/**
@@ -1764,29 +1763,34 @@
+swipeEnd: {| +data: void, +canPreventDefault: false |},
|};
- declare export type InexactMaterialTopTabNavigationProp<
+ declare export type MaterialTopTabNavigationHelpers<
ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = MaterialTopTabOptions,
EventMap: EventMapBase = MaterialTopTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
+ > = {
+ ...$Exact<NavigationHelpers<
+ ParamList,
+ TabNavigationState,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ ...
+ };
declare export type MaterialTopTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = MaterialTopTabOptions,
EventMap: EventMapBase = MaterialTopTabNavigationEventMap,
- > = $Exact<InexactMaterialTopTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous material top tab exports
@@ -1858,13 +1862,13 @@
|}>;
declare export type MaterialTopTabDescriptor = Descriptor<
- MaterialBottomTabNavigationProp<>,
+ MaterialBottomTabNavigationHelpers<>,
MaterialBottomTabOptions,
>;
declare type MaterialTopTabNavigationBuilderResult = {|
+state: TabNavigationState,
- +navigation: MaterialTopTabNavigationProp<>,
+ +navigation: MaterialTopTabNavigationHelpers<>,
+descriptors: {| +[key: string]: MaterialTopTabDescriptor |},
|};
@@ -1900,11 +1904,11 @@
|};
declare export type MaterialTopTabNavigatorProps<
- NavProp: InexactMaterialTopTabNavigationProp<> =
- MaterialTopTabNavigationProp<>,
+ NavHelpers: MaterialTopTabNavigationHelpers<> =
+ MaterialTopTabNavigationHelpers<>,
> = {|
...ExtraMaterialTopTabNavigatorProps,
- ...ScreenOptionsProp<MaterialTopTabOptions, NavProp>,
+ ...ScreenOptionsProp<MaterialTopTabOptions, 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
@@ -1492,53 +1492,47 @@
+tabLongPress: {| +data: void, +canPreventDefault: false |},
|};
- declare type InexactTabNavigationProp<
- ParamList: ParamListBase,
- RouteName: $Keys<ParamList>,
- Options: {...},
- EventMap: EventMapBase,
+ declare type TabExtraNavigationHelpers<
+ ParamList: ParamListBase = ParamListBase,
+ > = {|
+ +jumpTo: SimpleNavigate<ParamList>,
+ |};
+
+ declare export type BottomTabNavigationHelpers<
+ ParamList: ParamListBase = ParamListBase,
+ EventMap: EventMapBase = BottomTabNavigationEventMap,
> = {
- ...$Exact<NavigationProp<
+ ...$Exact<NavigationHelpers<
ParamList,
- RouteName,
TabNavigationState,
- Options,
EventMap,
>>,
- +jumpTo: SimpleNavigate<ParamList>,
+ ...TabExtraNavigationHelpers<ParamList>,
...
};
- declare export type InexactBottomTabNavigationProp<
- ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = BottomTabOptions,
- EventMap: EventMapBase = BottomTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
-
declare export type BottomTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = BottomTabOptions,
EventMap: EventMapBase = BottomTabNavigationEventMap,
- > = $Exact<InexactBottomTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous bottom tab exports
*/
declare export type BottomTabDescriptor = Descriptor<
- BottomTabNavigationProp<>,
+ BottomTabNavigationHelpers<>,
BottomTabOptions,
>;
@@ -1562,7 +1556,7 @@
declare type BottomTabNavigationBuilderResult = {|
+state: TabNavigationState,
- +navigation: BottomTabNavigationProp<>,
+ +navigation: BottomTabNavigationHelpers<>,
+descriptors: {| +[key: string]: BottomTabDescriptor |},
|};
@@ -1585,10 +1579,10 @@
|};
declare export type BottomTabNavigatorProps<
- NavProp: InexactBottomTabNavigationProp<> = BottomTabNavigationProp<>,
+ NavHelpers: BottomTabNavigationHelpers<> = BottomTabNavigationHelpers<>,
> = {|
...ExtraBottomTabNavigatorProps,
- ...ScreenOptionsProp<BottomTabOptions, NavProp>,
+ ...ScreenOptionsProp<BottomTabOptions, NavHelpers>,
|};
/**
@@ -1616,29 +1610,34 @@
+tabPress: {| +data: void, +canPreventDefault: true |},
|};
- declare export type InexactMaterialBottomTabNavigationProp<
+ declare export type MaterialBottomTabNavigationHelpers<
ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = MaterialBottomTabOptions,
EventMap: EventMapBase = MaterialBottomTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
+ > = {
+ ...$Exact<NavigationHelpers<
+ ParamList,
+ TabNavigationState,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ ...
+ };
declare export type MaterialBottomTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = MaterialBottomTabOptions,
EventMap: EventMapBase = MaterialBottomTabNavigationEventMap,
- > = $Exact<InexactMaterialBottomTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous material bottom tab exports
@@ -1731,11 +1730,11 @@
|};
declare export type MaterialBottomTabNavigatorProps<
- NavProp: InexactMaterialBottomTabNavigationProp<> =
- MaterialBottomTabNavigationProp<>,
+ NavHelpers: MaterialBottomTabNavigationHelpers<> =
+ MaterialBottomTabNavigationHelpers<>,
> = {|
...ExtraMaterialBottomTabNavigatorProps,
- ...ScreenOptionsProp<MaterialBottomTabOptions, NavProp>,
+ ...ScreenOptionsProp<MaterialBottomTabOptions, NavHelpers>,
|};
/**
@@ -1764,29 +1763,34 @@
+swipeEnd: {| +data: void, +canPreventDefault: false |},
|};
- declare export type InexactMaterialTopTabNavigationProp<
+ declare export type MaterialTopTabNavigationHelpers<
ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = MaterialTopTabOptions,
EventMap: EventMapBase = MaterialTopTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
+ > = {
+ ...$Exact<NavigationHelpers<
+ ParamList,
+ TabNavigationState,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ ...
+ };
declare export type MaterialTopTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = MaterialTopTabOptions,
EventMap: EventMapBase = MaterialTopTabNavigationEventMap,
- > = $Exact<InexactMaterialTopTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous material top tab exports
@@ -1858,13 +1862,13 @@
|}>;
declare export type MaterialTopTabDescriptor = Descriptor<
- MaterialBottomTabNavigationProp<>,
+ MaterialBottomTabNavigationHelpers<>,
MaterialBottomTabOptions,
>;
declare type MaterialTopTabNavigationBuilderResult = {|
+state: TabNavigationState,
- +navigation: MaterialTopTabNavigationProp<>,
+ +navigation: MaterialTopTabNavigationHelpers<>,
+descriptors: {| +[key: string]: MaterialTopTabDescriptor |},
|};
@@ -1900,11 +1904,11 @@
|};
declare export type MaterialTopTabNavigatorProps<
- NavProp: InexactMaterialTopTabNavigationProp<> =
- MaterialTopTabNavigationProp<>,
+ NavHelpers: MaterialTopTabNavigationHelpers<> =
+ MaterialTopTabNavigationHelpers<>,
> = {|
...ExtraMaterialTopTabNavigatorProps,
- ...ScreenOptionsProp<MaterialTopTabOptions, NavProp>,
+ ...ScreenOptionsProp<MaterialTopTabOptions, 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
@@ -1492,53 +1492,47 @@
+tabLongPress: {| +data: void, +canPreventDefault: false |},
|};
- declare type InexactTabNavigationProp<
- ParamList: ParamListBase,
- RouteName: $Keys<ParamList>,
- Options: {...},
- EventMap: EventMapBase,
+ declare type TabExtraNavigationHelpers<
+ ParamList: ParamListBase = ParamListBase,
+ > = {|
+ +jumpTo: SimpleNavigate<ParamList>,
+ |};
+
+ declare export type BottomTabNavigationHelpers<
+ ParamList: ParamListBase = ParamListBase,
+ EventMap: EventMapBase = BottomTabNavigationEventMap,
> = {
- ...$Exact<NavigationProp<
+ ...$Exact<NavigationHelpers<
ParamList,
- RouteName,
TabNavigationState,
- Options,
EventMap,
>>,
- +jumpTo: SimpleNavigate<ParamList>,
+ ...TabExtraNavigationHelpers<ParamList>,
...
};
- declare export type InexactBottomTabNavigationProp<
- ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = BottomTabOptions,
- EventMap: EventMapBase = BottomTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
-
declare export type BottomTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = BottomTabOptions,
EventMap: EventMapBase = BottomTabNavigationEventMap,
- > = $Exact<InexactBottomTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous bottom tab exports
*/
declare export type BottomTabDescriptor = Descriptor<
- BottomTabNavigationProp<>,
+ BottomTabNavigationHelpers<>,
BottomTabOptions,
>;
@@ -1562,7 +1556,7 @@
declare type BottomTabNavigationBuilderResult = {|
+state: TabNavigationState,
- +navigation: BottomTabNavigationProp<>,
+ +navigation: BottomTabNavigationHelpers<>,
+descriptors: {| +[key: string]: BottomTabDescriptor |},
|};
@@ -1585,10 +1579,10 @@
|};
declare export type BottomTabNavigatorProps<
- NavProp: InexactBottomTabNavigationProp<> = BottomTabNavigationProp<>,
+ NavHelpers: BottomTabNavigationHelpers<> = BottomTabNavigationHelpers<>,
> = {|
...ExtraBottomTabNavigatorProps,
- ...ScreenOptionsProp<BottomTabOptions, NavProp>,
+ ...ScreenOptionsProp<BottomTabOptions, NavHelpers>,
|};
/**
@@ -1616,29 +1610,34 @@
+tabPress: {| +data: void, +canPreventDefault: true |},
|};
- declare export type InexactMaterialBottomTabNavigationProp<
+ declare export type MaterialBottomTabNavigationHelpers<
ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = MaterialBottomTabOptions,
EventMap: EventMapBase = MaterialBottomTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
+ > = {
+ ...$Exact<NavigationHelpers<
+ ParamList,
+ TabNavigationState,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ ...
+ };
declare export type MaterialBottomTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = MaterialBottomTabOptions,
EventMap: EventMapBase = MaterialBottomTabNavigationEventMap,
- > = $Exact<InexactMaterialBottomTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous material bottom tab exports
@@ -1731,11 +1730,11 @@
|};
declare export type MaterialBottomTabNavigatorProps<
- NavProp: InexactMaterialBottomTabNavigationProp<> =
- MaterialBottomTabNavigationProp<>,
+ NavHelpers: MaterialBottomTabNavigationHelpers<> =
+ MaterialBottomTabNavigationHelpers<>,
> = {|
...ExtraMaterialBottomTabNavigatorProps,
- ...ScreenOptionsProp<MaterialBottomTabOptions, NavProp>,
+ ...ScreenOptionsProp<MaterialBottomTabOptions, NavHelpers>,
|};
/**
@@ -1764,29 +1763,34 @@
+swipeEnd: {| +data: void, +canPreventDefault: false |},
|};
- declare export type InexactMaterialTopTabNavigationProp<
+ declare export type MaterialTopTabNavigationHelpers<
ParamList: ParamListBase = ParamListBase,
- RouteName: $Keys<ParamList> = $Keys<ParamList>,
- Options: {...} = MaterialTopTabOptions,
EventMap: EventMapBase = MaterialTopTabNavigationEventMap,
- > = InexactTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >;
+ > = {
+ ...$Exact<NavigationHelpers<
+ ParamList,
+ TabNavigationState,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ ...
+ };
declare export type MaterialTopTabNavigationProp<
ParamList: ParamListBase = ParamListBase,
RouteName: $Keys<ParamList> = $Keys<ParamList>,
Options: {...} = MaterialTopTabOptions,
EventMap: EventMapBase = MaterialTopTabNavigationEventMap,
- > = $Exact<InexactMaterialTopTabNavigationProp<
- ParamList,
- RouteName,
- Options,
- EventMap,
- >>;
+ > = {|
+ ...$Exact<NavigationProp<
+ ParamList,
+ RouteName,
+ TabNavigationState,
+ Options,
+ EventMap,
+ >>,
+ ...TabExtraNavigationHelpers<ParamList>,
+ |};
/**
* Miscellaneous material top tab exports
@@ -1858,13 +1862,13 @@
|}>;
declare export type MaterialTopTabDescriptor = Descriptor<
- MaterialBottomTabNavigationProp<>,
+ MaterialBottomTabNavigationHelpers<>,
MaterialBottomTabOptions,
>;
declare type MaterialTopTabNavigationBuilderResult = {|
+state: TabNavigationState,
- +navigation: MaterialTopTabNavigationProp<>,
+ +navigation: MaterialTopTabNavigationHelpers<>,
+descriptors: {| +[key: string]: MaterialTopTabDescriptor |},
|};
@@ -1900,11 +1904,11 @@
|};
declare export type MaterialTopTabNavigatorProps<
- NavProp: InexactMaterialTopTabNavigationProp<> =
- MaterialTopTabNavigationProp<>,
+ NavHelpers: MaterialTopTabNavigationHelpers<> =
+ MaterialTopTabNavigationHelpers<>,
> = {|
...ExtraMaterialTopTabNavigatorProps,
- ...ScreenOptionsProp<MaterialTopTabOptions, NavProp>,
+ ...ScreenOptionsProp<MaterialTopTabOptions, NavHelpers>,
|};
/**
diff --git a/native/navigation/app-navigator.react.js b/native/navigation/app-navigator.react.js
--- a/native/navigation/app-navigator.react.js
+++ b/native/navigation/app-navigator.react.js
@@ -1,6 +1,9 @@
// @flow
-import type { BottomTabNavigationProp } from '@react-navigation/bottom-tabs';
+import type {
+ BottomTabNavigationHelpers,
+ BottomTabNavigationProp,
+} from '@react-navigation/bottom-tabs';
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
import * as SplashScreen from 'expo-splash-screen';
import * as React from 'react';
@@ -95,7 +98,7 @@
const Tab = createBottomTabNavigator<
ScreenParamList,
TabParamList,
- TabNavigationProp<>,
+ BottomTabNavigationHelpers<ScreenParamList>,
>();
const tabBarOptions = {
keyboardHidesTabBar: false,
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Nov 16, 1:52 PM (20 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2498027
Default Alt Text
D5403.diff (35 KB)
Attached To
Mode
D5403: [native] [10/34] ReactNav6: separate TabNavigationProp from TabNavigationHelpers
Attached
Detach File
Event Timeline
Log In to Comment