Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3249433
D5405.id17683.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
17 KB
Referenced Files
None
Subscribers
None
D5405.id17683.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
@@ -1050,19 +1050,19 @@
EventMap,
>) => React$Node;
- declare type ScreenOptionsProp<ScreenOptions: {...}, NavProp> = {|
+ declare type ScreenOptionsProp<ScreenOptions: {...}, NavHelpers> = {|
+screenOptions?:
| ScreenOptions
- | ({| route: LeafRoute<>, navigation: NavProp |}) => ScreenOptions,
+ | ({| route: LeafRoute<>, navigation: NavHelpers |}) => ScreenOptions,
|};
declare export type ExtraNavigatorPropsBase = {
...$Exact<DefaultRouterOptions>,
+children?: React$Node,
...
};
- declare export type NavigatorPropsBase<ScreenOptions: {...}, NavProp> = {
+ declare export type NavigatorPropsBase<ScreenOptions: {...}, NavHelpers> = {
...$Exact<ExtraNavigatorPropsBase>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
...
};
@@ -1074,7 +1074,7 @@
> = <
GlobalParamList: ParamListBase,
ParamList: ParamListBase,
- NavProp: NavigationHelpers<
+ NavHelpers: NavigationHelpers<
GlobalParamList,
State,
EventMap,
@@ -1089,16 +1089,16 @@
>,
+Navigator: React$ComponentType<{|
...$Exact<ExtraNavigatorProps>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+screenListeners?:
| ScreenListeners<State, EventMap>
| ({|
+route: RouteProp<ParamList>,
- +navigation: NavProp,
+ +navigation: NavHelpers,
|}) => ScreenListeners<State, EventMap>,
|}>,
+Group: React$ComponentType<{|
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+children: React$Node,
+navigationKey?: string,
|}>,
@@ -1108,7 +1108,7 @@
State: NavigationState,
ScreenOptions: {...},
EventMap: EventMapBase,
- NavProp: NavigationHelpers<
+ NavHelpers: NavigationHelpers<
ParamListBase,
State,
EventMap,
@@ -1117,7 +1117,7 @@
>(
navigator: React$ComponentType<{|
...$Exact<ExtraNavigatorPropsBase>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
|}>,
) => CreateNavigator<State, ScreenOptions, EventMap, ExtraNavigatorProps>;
@@ -1126,12 +1126,12 @@
*/
declare export type Descriptor<
- NavProp,
+ NavHelpers,
ScreenOptions: {...} = {...},
> = {|
+render: () => React$Node,
+options: $ReadOnly<ScreenOptions>,
- +navigation: NavProp,
+ +navigation: NavHelpers,
|};
declare export type UseNavigationBuilder = <
@@ -1139,18 +1139,18 @@
Action: GenericNavigationAction,
ScreenOptions: {...},
RouterOptions: DefaultRouterOptions,
- NavProp,
+ NavHelpers,
>(
routerFactory: RouterFactory<State, Action, RouterOptions>,
options: {|
...$Exact<RouterOptions>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+children?: React$Node,
|},
) => {|
+state: State,
- +descriptors: {| +[key: string]: Descriptor<NavProp, ScreenOptions> |},
- +navigation: NavProp,
+ +descriptors: {| +[key: string]: Descriptor<NavHelpers, ScreenOptions> |},
+ +navigation: 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
@@ -1050,19 +1050,19 @@
EventMap,
>) => React$Node;
- declare type ScreenOptionsProp<ScreenOptions: {...}, NavProp> = {|
+ declare type ScreenOptionsProp<ScreenOptions: {...}, NavHelpers> = {|
+screenOptions?:
| ScreenOptions
- | ({| route: LeafRoute<>, navigation: NavProp |}) => ScreenOptions,
+ | ({| route: LeafRoute<>, navigation: NavHelpers |}) => ScreenOptions,
|};
declare export type ExtraNavigatorPropsBase = {
...$Exact<DefaultRouterOptions>,
+children?: React$Node,
...
};
- declare export type NavigatorPropsBase<ScreenOptions: {...}, NavProp> = {
+ declare export type NavigatorPropsBase<ScreenOptions: {...}, NavHelpers> = {
...$Exact<ExtraNavigatorPropsBase>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
...
};
@@ -1074,7 +1074,7 @@
> = <
GlobalParamList: ParamListBase,
ParamList: ParamListBase,
- NavProp: NavigationHelpers<
+ NavHelpers: NavigationHelpers<
GlobalParamList,
State,
EventMap,
@@ -1089,16 +1089,16 @@
>,
+Navigator: React$ComponentType<{|
...$Exact<ExtraNavigatorProps>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+screenListeners?:
| ScreenListeners<State, EventMap>
| ({|
+route: RouteProp<ParamList>,
- +navigation: NavProp,
+ +navigation: NavHelpers,
|}) => ScreenListeners<State, EventMap>,
|}>,
+Group: React$ComponentType<{|
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+children: React$Node,
+navigationKey?: string,
|}>,
@@ -1108,7 +1108,7 @@
State: NavigationState,
ScreenOptions: {...},
EventMap: EventMapBase,
- NavProp: NavigationHelpers<
+ NavHelpers: NavigationHelpers<
ParamListBase,
State,
EventMap,
@@ -1117,7 +1117,7 @@
>(
navigator: React$ComponentType<{|
...$Exact<ExtraNavigatorPropsBase>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
|}>,
) => CreateNavigator<State, ScreenOptions, EventMap, ExtraNavigatorProps>;
@@ -1126,12 +1126,12 @@
*/
declare export type Descriptor<
- NavProp,
+ NavHelpers,
ScreenOptions: {...} = {...},
> = {|
+render: () => React$Node,
+options: $ReadOnly<ScreenOptions>,
- +navigation: NavProp,
+ +navigation: NavHelpers,
|};
declare export type UseNavigationBuilder = <
@@ -1139,18 +1139,18 @@
Action: GenericNavigationAction,
ScreenOptions: {...},
RouterOptions: DefaultRouterOptions,
- NavProp,
+ NavHelpers,
>(
routerFactory: RouterFactory<State, Action, RouterOptions>,
options: {|
...$Exact<RouterOptions>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+children?: React$Node,
|},
) => {|
+state: State,
- +descriptors: {| +[key: string]: Descriptor<NavProp, ScreenOptions> |},
- +navigation: NavProp,
+ +descriptors: {| +[key: string]: Descriptor<NavHelpers, ScreenOptions> |},
+ +navigation: 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
@@ -1050,19 +1050,19 @@
EventMap,
>) => React$Node;
- declare type ScreenOptionsProp<ScreenOptions: {...}, NavProp> = {|
+ declare type ScreenOptionsProp<ScreenOptions: {...}, NavHelpers> = {|
+screenOptions?:
| ScreenOptions
- | ({| route: LeafRoute<>, navigation: NavProp |}) => ScreenOptions,
+ | ({| route: LeafRoute<>, navigation: NavHelpers |}) => ScreenOptions,
|};
declare export type ExtraNavigatorPropsBase = {
...$Exact<DefaultRouterOptions>,
+children?: React$Node,
...
};
- declare export type NavigatorPropsBase<ScreenOptions: {...}, NavProp> = {
+ declare export type NavigatorPropsBase<ScreenOptions: {...}, NavHelpers> = {
...$Exact<ExtraNavigatorPropsBase>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
...
};
@@ -1074,7 +1074,7 @@
> = <
GlobalParamList: ParamListBase,
ParamList: ParamListBase,
- NavProp: NavigationHelpers<
+ NavHelpers: NavigationHelpers<
GlobalParamList,
State,
EventMap,
@@ -1089,16 +1089,16 @@
>,
+Navigator: React$ComponentType<{|
...$Exact<ExtraNavigatorProps>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+screenListeners?:
| ScreenListeners<State, EventMap>
| ({|
+route: RouteProp<ParamList>,
- +navigation: NavProp,
+ +navigation: NavHelpers,
|}) => ScreenListeners<State, EventMap>,
|}>,
+Group: React$ComponentType<{|
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+children: React$Node,
+navigationKey?: string,
|}>,
@@ -1108,7 +1108,7 @@
State: NavigationState,
ScreenOptions: {...},
EventMap: EventMapBase,
- NavProp: NavigationHelpers<
+ NavHelpers: NavigationHelpers<
ParamListBase,
State,
EventMap,
@@ -1117,7 +1117,7 @@
>(
navigator: React$ComponentType<{|
...$Exact<ExtraNavigatorPropsBase>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
|}>,
) => CreateNavigator<State, ScreenOptions, EventMap, ExtraNavigatorProps>;
@@ -1126,12 +1126,12 @@
*/
declare export type Descriptor<
- NavProp,
+ NavHelpers,
ScreenOptions: {...} = {...},
> = {|
+render: () => React$Node,
+options: $ReadOnly<ScreenOptions>,
- +navigation: NavProp,
+ +navigation: NavHelpers,
|};
declare export type UseNavigationBuilder = <
@@ -1139,18 +1139,18 @@
Action: GenericNavigationAction,
ScreenOptions: {...},
RouterOptions: DefaultRouterOptions,
- NavProp,
+ NavHelpers,
>(
routerFactory: RouterFactory<State, Action, RouterOptions>,
options: {|
...$Exact<RouterOptions>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+children?: React$Node,
|},
) => {|
+state: State,
- +descriptors: {| +[key: string]: Descriptor<NavProp, ScreenOptions> |},
- +navigation: NavProp,
+ +descriptors: {| +[key: string]: Descriptor<NavHelpers, ScreenOptions> |},
+ +navigation: 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
@@ -1050,19 +1050,19 @@
EventMap,
>) => React$Node;
- declare type ScreenOptionsProp<ScreenOptions: {...}, NavProp> = {|
+ declare type ScreenOptionsProp<ScreenOptions: {...}, NavHelpers> = {|
+screenOptions?:
| ScreenOptions
- | ({| route: LeafRoute<>, navigation: NavProp |}) => ScreenOptions,
+ | ({| route: LeafRoute<>, navigation: NavHelpers |}) => ScreenOptions,
|};
declare export type ExtraNavigatorPropsBase = {
...$Exact<DefaultRouterOptions>,
+children?: React$Node,
...
};
- declare export type NavigatorPropsBase<ScreenOptions: {...}, NavProp> = {
+ declare export type NavigatorPropsBase<ScreenOptions: {...}, NavHelpers> = {
...$Exact<ExtraNavigatorPropsBase>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
...
};
@@ -1074,7 +1074,7 @@
> = <
GlobalParamList: ParamListBase,
ParamList: ParamListBase,
- NavProp: NavigationHelpers<
+ NavHelpers: NavigationHelpers<
GlobalParamList,
State,
EventMap,
@@ -1089,16 +1089,16 @@
>,
+Navigator: React$ComponentType<{|
...$Exact<ExtraNavigatorProps>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+screenListeners?:
| ScreenListeners<State, EventMap>
| ({|
+route: RouteProp<ParamList>,
- +navigation: NavProp,
+ +navigation: NavHelpers,
|}) => ScreenListeners<State, EventMap>,
|}>,
+Group: React$ComponentType<{|
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+children: React$Node,
+navigationKey?: string,
|}>,
@@ -1108,7 +1108,7 @@
State: NavigationState,
ScreenOptions: {...},
EventMap: EventMapBase,
- NavProp: NavigationHelpers<
+ NavHelpers: NavigationHelpers<
ParamListBase,
State,
EventMap,
@@ -1117,7 +1117,7 @@
>(
navigator: React$ComponentType<{|
...$Exact<ExtraNavigatorPropsBase>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
|}>,
) => CreateNavigator<State, ScreenOptions, EventMap, ExtraNavigatorProps>;
@@ -1126,12 +1126,12 @@
*/
declare export type Descriptor<
- NavProp,
+ NavHelpers,
ScreenOptions: {...} = {...},
> = {|
+render: () => React$Node,
+options: $ReadOnly<ScreenOptions>,
- +navigation: NavProp,
+ +navigation: NavHelpers,
|};
declare export type UseNavigationBuilder = <
@@ -1139,18 +1139,18 @@
Action: GenericNavigationAction,
ScreenOptions: {...},
RouterOptions: DefaultRouterOptions,
- NavProp,
+ NavHelpers,
>(
routerFactory: RouterFactory<State, Action, RouterOptions>,
options: {|
...$Exact<RouterOptions>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+children?: React$Node,
|},
) => {|
+state: State,
- +descriptors: {| +[key: string]: Descriptor<NavProp, ScreenOptions> |},
- +navigation: NavProp,
+ +descriptors: {| +[key: string]: Descriptor<NavHelpers, ScreenOptions> |},
+ +navigation: 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
@@ -1050,19 +1050,19 @@
EventMap,
>) => React$Node;
- declare type ScreenOptionsProp<ScreenOptions: {...}, NavProp> = {|
+ declare type ScreenOptionsProp<ScreenOptions: {...}, NavHelpers> = {|
+screenOptions?:
| ScreenOptions
- | ({| route: LeafRoute<>, navigation: NavProp |}) => ScreenOptions,
+ | ({| route: LeafRoute<>, navigation: NavHelpers |}) => ScreenOptions,
|};
declare export type ExtraNavigatorPropsBase = {
...$Exact<DefaultRouterOptions>,
+children?: React$Node,
...
};
- declare export type NavigatorPropsBase<ScreenOptions: {...}, NavProp> = {
+ declare export type NavigatorPropsBase<ScreenOptions: {...}, NavHelpers> = {
...$Exact<ExtraNavigatorPropsBase>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
...
};
@@ -1074,7 +1074,7 @@
> = <
GlobalParamList: ParamListBase,
ParamList: ParamListBase,
- NavProp: NavigationHelpers<
+ NavHelpers: NavigationHelpers<
GlobalParamList,
State,
EventMap,
@@ -1089,16 +1089,16 @@
>,
+Navigator: React$ComponentType<{|
...$Exact<ExtraNavigatorProps>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+screenListeners?:
| ScreenListeners<State, EventMap>
| ({|
+route: RouteProp<ParamList>,
- +navigation: NavProp,
+ +navigation: NavHelpers,
|}) => ScreenListeners<State, EventMap>,
|}>,
+Group: React$ComponentType<{|
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+children: React$Node,
+navigationKey?: string,
|}>,
@@ -1108,7 +1108,7 @@
State: NavigationState,
ScreenOptions: {...},
EventMap: EventMapBase,
- NavProp: NavigationHelpers<
+ NavHelpers: NavigationHelpers<
ParamListBase,
State,
EventMap,
@@ -1117,7 +1117,7 @@
>(
navigator: React$ComponentType<{|
...$Exact<ExtraNavigatorPropsBase>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
|}>,
) => CreateNavigator<State, ScreenOptions, EventMap, ExtraNavigatorProps>;
@@ -1126,12 +1126,12 @@
*/
declare export type Descriptor<
- NavProp,
+ NavHelpers,
ScreenOptions: {...} = {...},
> = {|
+render: () => React$Node,
+options: $ReadOnly<ScreenOptions>,
- +navigation: NavProp,
+ +navigation: NavHelpers,
|};
declare export type UseNavigationBuilder = <
@@ -1139,18 +1139,18 @@
Action: GenericNavigationAction,
ScreenOptions: {...},
RouterOptions: DefaultRouterOptions,
- NavProp,
+ NavHelpers,
>(
routerFactory: RouterFactory<State, Action, RouterOptions>,
options: {|
...$Exact<RouterOptions>,
- ...ScreenOptionsProp<ScreenOptions, NavProp>,
+ ...ScreenOptionsProp<ScreenOptions, NavHelpers>,
+children?: React$Node,
|},
) => {|
+state: State,
- +descriptors: {| +[key: string]: Descriptor<NavProp, ScreenOptions> |},
- +navigation: NavProp,
+ +descriptors: {| +[key: string]: Descriptor<NavHelpers, ScreenOptions> |},
+ +navigation: NavHelpers,
|};
/**
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Nov 16, 2:40 PM (21 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2498079
Default Alt Text
D5405.id17683.diff (17 KB)
Attached To
Mode
D5405: [native] [12/34] ReactNav6: use NavHelpers for type parameter name instead of NavProp
Attached
Detach File
Event Timeline
Log In to Comment