@react-navigation/native 7.3.4 → 7.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/module/createStandardNavigationFactories.js.map +1 -1
- package/lib/typescript/src/createStandardNavigationFactories.d.ts +13 -12
- package/lib/typescript/src/createStandardNavigationFactories.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/createStandardNavigationFactories.tsx +42 -16
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["CommonActions","createNavigatorFactory","createScreenFactory","useNavigationBuilder","React","useBuildHref","useMemoArray","jsx","_jsx","createStandardNavigationFactories","navigator","router","mapper","type","version","NavigatorContent","Error","StandardNavigationNavigator","props","builder","buildHref","routes","state","Array","isArray","preloadedRoutes","concat","map","route","href","name","params","key","useMemo","index","descriptors","descriptor","describe","options","render","actions","navigate","navigation","dispatch","target","back","goBack","emitter","emit","mapped","children","id","initialRouteName","layout","screenLayout","screenListeners","screenOptions","UNSTABLE_routeNamesChangeBehavior","UNSTABLE_router","rest","NavigationContent","createNavigator","createScreen"],"sourceRoot":"../../src","sources":["createStandardNavigationFactories.tsx"],"mappings":";;AAAA,SACEA,aAAa,EACbC,sBAAsB,EACtBC,mBAAmB,EAanBC,oBAAoB,QACf,wBAAwB;AAC/B,OAAO,KAAKC,KAAK,MAAM,OAAO;AAM9B,SAASC,YAAY,QAAQ,qBAAkB;AAC/C,SAASC,YAAY,QAAQ,mBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA;
|
|
1
|
+
{"version":3,"names":["CommonActions","createNavigatorFactory","createScreenFactory","useNavigationBuilder","React","useBuildHref","useMemoArray","jsx","_jsx","createStandardNavigationFactories","navigator","router","mapper","type","version","NavigatorContent","Error","StandardNavigationNavigator","props","builder","buildHref","routes","state","Array","isArray","preloadedRoutes","concat","map","route","href","name","params","key","useMemo","index","descriptors","descriptor","describe","options","render","actions","navigate","navigation","dispatch","target","back","goBack","emitter","emit","mapped","children","id","initialRouteName","layout","screenLayout","screenListeners","screenOptions","UNSTABLE_routeNamesChangeBehavior","UNSTABLE_router","rest","NavigationContent","createNavigator","createScreen"],"sourceRoot":"../../src","sources":["createStandardNavigationFactories.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -12,25 +12,26 @@ type StandardEventMap<EventMap extends EventMapBase> = {
|
|
|
12
12
|
};
|
|
13
13
|
};
|
|
14
14
|
type ActionHelpersOf<T> = T extends Record<string, (...args: never[]) => unknown> ? T : {};
|
|
15
|
-
type StandardNavigationTypeBagFor<TypeBag extends StandardNavigationTypeBagBase, ParamList extends ParamListBase, NavigatorID extends string | undefined = string | undefined> = TypeBag & {
|
|
15
|
+
type StandardNavigationTypeBagFor<TypeBag extends StandardNavigationTypeBagBase, ParamList extends ParamListBase, NavigatorID extends string | undefined = string | undefined, NavigatorProps extends object = {}> = TypeBag & {
|
|
16
16
|
ParamList: ParamList;
|
|
17
17
|
NavigatorID: NavigatorID;
|
|
18
|
+
Navigator: React.ComponentType<NavigatorProps>;
|
|
18
19
|
};
|
|
19
20
|
type StandardNavigation<TypeBag extends StandardNavigationTypeBagBase> = StandardNavigationTypeBagFor<TypeBag, ParamListBase>['NavigationList'][keyof StandardNavigationTypeBagFor<TypeBag, ParamListBase>['NavigationList']];
|
|
20
|
-
type StandardNavigationPropsMapper<TypeBag extends StandardNavigationTypeBagBase,
|
|
21
|
+
type StandardNavigationPropsMapper<TypeBag extends StandardNavigationTypeBagBase, MapperProps extends object> = (props: {
|
|
21
22
|
state: StandardNavigationTypeBagFor<TypeBag, ParamListBase>['State'];
|
|
22
23
|
navigation: StandardNavigation<TypeBag>;
|
|
23
|
-
}) =>
|
|
24
|
-
type StandardNavigationDefaultBag<TypeBag extends StandardNavigationTypeBagBase> = StandardNavigationTypeBagFor<TypeBag, ParamListBase, string | undefined>;
|
|
25
|
-
type StandardNavigationFactories<TypeBag extends StandardNavigationTypeBagBase> = {
|
|
26
|
-
createNavigator: StandardNavigationCreateNavigator<TypeBag>;
|
|
27
|
-
createScreen: StaticScreenFactory<StandardNavigationDefaultBag<TypeBag>>;
|
|
24
|
+
}) => MapperProps;
|
|
25
|
+
type StandardNavigationDefaultBag<TypeBag extends StandardNavigationTypeBagBase, NavigatorProps extends object> = StandardNavigationTypeBagFor<TypeBag, ParamListBase, string | undefined, NavigatorProps>;
|
|
26
|
+
type StandardNavigationFactories<TypeBag extends StandardNavigationTypeBagBase, NavigatorProps extends object> = {
|
|
27
|
+
createNavigator: StandardNavigationCreateNavigator<TypeBag, NavigatorProps>;
|
|
28
|
+
createScreen: StaticScreenFactory<StandardNavigationDefaultBag<TypeBag, NavigatorProps>>;
|
|
28
29
|
};
|
|
29
|
-
export type StandardNavigationCreateNavigator<TypeBag extends StandardNavigationTypeBagBase> = {
|
|
30
|
-
<const ParamList extends ParamListBase, const NavigatorID extends string | undefined = string | undefined>(): TypedNavigator<StandardNavigationTypeBagFor<TypeBag, ParamList, NavigatorID>, undefined>;
|
|
31
|
-
<const Config extends StaticConfig<StandardNavigationDefaultBag<TypeBag>>>(config: Config & StaticConfig<StandardNavigationDefaultBag<TypeBag>>): TypedNavigator<StandardNavigationTypeBagFor<TypeBag, StaticParamList<{
|
|
30
|
+
export type StandardNavigationCreateNavigator<TypeBag extends StandardNavigationTypeBagBase, NavigatorProps extends object> = {
|
|
31
|
+
<const ParamList extends ParamListBase, const NavigatorID extends string | undefined = string | undefined>(): TypedNavigator<StandardNavigationTypeBagFor<TypeBag, ParamList, NavigatorID, NavigatorProps>, undefined>;
|
|
32
|
+
<const Config extends StaticConfig<StandardNavigationDefaultBag<TypeBag, NavigatorProps>>>(config: Config & StaticConfig<StandardNavigationDefaultBag<TypeBag, NavigatorProps>>): TypedNavigator<StandardNavigationTypeBagFor<TypeBag, StaticParamList<{
|
|
32
33
|
config: Config;
|
|
33
|
-
}> & ParamListBase, string | undefined>, Config>;
|
|
34
|
+
}> & ParamListBase, string | undefined, NavigatorProps>, Config>;
|
|
34
35
|
};
|
|
35
36
|
export interface StandardNavigationTypeBagBase extends NavigatorTypeBagBase {
|
|
36
37
|
ActionHelpers: {};
|
|
@@ -42,6 +43,6 @@ export interface StandardNavigationTypeBagBase extends NavigatorTypeBagBase {
|
|
|
42
43
|
};
|
|
43
44
|
Navigator: React.ComponentType<{}>;
|
|
44
45
|
}
|
|
45
|
-
export declare function createStandardNavigationFactories<TypeBag extends StandardNavigationTypeBagBase, NavigatorProps extends object = {}>(navigator: ReturnType<typeof createStandardNavigator<TypeBag['ScreenOptions'], StandardEventMap<TypeBag['EventMap']>, NavigatorProps>>, router: RouterFactory<StandardNavigationTypeBagFor<TypeBag, ParamListBase>['State'], NavigationAction, TypeBag['RouterOptions']>, mapper?: StandardNavigationPropsMapper<TypeBag,
|
|
46
|
+
export declare function createStandardNavigationFactories<TypeBag extends StandardNavigationTypeBagBase, NavigatorProps extends object = {}, MapperProps extends object = {}>(navigator: ReturnType<typeof createStandardNavigator<TypeBag['ScreenOptions'], StandardEventMap<TypeBag['EventMap']>, NavigatorProps & MapperProps>>, router: RouterFactory<StandardNavigationTypeBagFor<TypeBag, ParamListBase>['State'], NavigationAction, TypeBag['RouterOptions']>, mapper?: StandardNavigationPropsMapper<TypeBag, MapperProps>): StandardNavigationFactories<TypeBag, NavigatorProps>;
|
|
46
47
|
export {};
|
|
47
48
|
//# sourceMappingURL=createStandardNavigationFactories.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createStandardNavigationFactories.d.ts","sourceRoot":"","sources":["../../../src/createStandardNavigationFactories.tsx"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,oBAAoB,EACzB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,cAAc,EAEpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EACV,uBAAuB,EAExB,MAAM,qBAAqB,CAAC;AAK7B,KAAK,gBAAgB,CAAC,QAAQ,SAAS,YAAY,IAAI;KACpD,SAAS,IAAI,MAAM,QAAQ,GAAG;QAC7B,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,SAAS;YAAE,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;SAAE,GACnD,IAAI,SAAS,MAAM,GAAG,SAAS,GAC7B,IAAI,GACJ,MAAM,GAAG,SAAS,GACpB,SAAS,CAAC;QACd,iBAAiB,EAAE,QAAQ,CAAC,SAAS,CAAC,SAAS;YAAE,iBAAiB,EAAE,IAAI,CAAA;SAAE,GACtE,IAAI,GACJ,KAAK,CAAC;KACX;CACF,CAAC;AAEF,KAAK,eAAe,CAAC,CAAC,IACpB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;AAcnE,KAAK,4BAA4B,CAC/B,OAAO,SAAS,6BAA6B,EAC7C,SAAS,SAAS,aAAa,EAC/B,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"createStandardNavigationFactories.d.ts","sourceRoot":"","sources":["../../../src/createStandardNavigationFactories.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-navigation/native",
|
|
3
3
|
"description": "React Native integration for React Navigation",
|
|
4
|
-
"version": "7.3.
|
|
4
|
+
"version": "7.3.5",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native",
|
|
7
7
|
"react-navigation",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"clean": "del lib"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@react-navigation/core": "^7.21.
|
|
45
|
+
"@react-navigation/core": "^7.21.3",
|
|
46
46
|
"escape-string-regexp": "^4.0.0",
|
|
47
47
|
"fast-deep-equal": "^3.1.3",
|
|
48
48
|
"nanoid": "^3.3.11",
|
|
@@ -84,5 +84,5 @@
|
|
|
84
84
|
]
|
|
85
85
|
]
|
|
86
86
|
},
|
|
87
|
-
"gitHead": "
|
|
87
|
+
"gitHead": "ce68b20b516d7d523fe85b567055516fdd49464b"
|
|
88
88
|
}
|
|
@@ -57,9 +57,11 @@ type StandardNavigationTypeBagFor<
|
|
|
57
57
|
TypeBag extends StandardNavigationTypeBagBase,
|
|
58
58
|
ParamList extends ParamListBase,
|
|
59
59
|
NavigatorID extends string | undefined = string | undefined,
|
|
60
|
+
NavigatorProps extends object = {},
|
|
60
61
|
> = TypeBag & {
|
|
61
62
|
ParamList: ParamList;
|
|
62
63
|
NavigatorID: NavigatorID;
|
|
64
|
+
Navigator: React.ComponentType<NavigatorProps>;
|
|
63
65
|
};
|
|
64
66
|
|
|
65
67
|
type StandardNavigation<TypeBag extends StandardNavigationTypeBagBase> =
|
|
@@ -73,40 +75,61 @@ type StandardNavigation<TypeBag extends StandardNavigationTypeBagBase> =
|
|
|
73
75
|
|
|
74
76
|
type StandardNavigationPropsMapper<
|
|
75
77
|
TypeBag extends StandardNavigationTypeBagBase,
|
|
76
|
-
|
|
78
|
+
MapperProps extends object,
|
|
77
79
|
> = (props: {
|
|
78
80
|
state: StandardNavigationTypeBagFor<TypeBag, ParamListBase>['State'];
|
|
79
81
|
navigation: StandardNavigation<TypeBag>;
|
|
80
|
-
}) =>
|
|
82
|
+
}) => MapperProps;
|
|
81
83
|
|
|
82
84
|
type StandardNavigationDefaultBag<
|
|
83
85
|
TypeBag extends StandardNavigationTypeBagBase,
|
|
84
|
-
|
|
86
|
+
NavigatorProps extends object,
|
|
87
|
+
> = StandardNavigationTypeBagFor<
|
|
88
|
+
TypeBag,
|
|
89
|
+
ParamListBase,
|
|
90
|
+
string | undefined,
|
|
91
|
+
NavigatorProps
|
|
92
|
+
>;
|
|
85
93
|
|
|
86
94
|
type StandardNavigationFactories<
|
|
87
95
|
TypeBag extends StandardNavigationTypeBagBase,
|
|
96
|
+
NavigatorProps extends object,
|
|
88
97
|
> = {
|
|
89
|
-
createNavigator: StandardNavigationCreateNavigator<TypeBag>;
|
|
90
|
-
createScreen: StaticScreenFactory<
|
|
98
|
+
createNavigator: StandardNavigationCreateNavigator<TypeBag, NavigatorProps>;
|
|
99
|
+
createScreen: StaticScreenFactory<
|
|
100
|
+
StandardNavigationDefaultBag<TypeBag, NavigatorProps>
|
|
101
|
+
>;
|
|
91
102
|
};
|
|
92
103
|
|
|
93
104
|
export type StandardNavigationCreateNavigator<
|
|
94
105
|
TypeBag extends StandardNavigationTypeBagBase,
|
|
106
|
+
NavigatorProps extends object,
|
|
95
107
|
> = {
|
|
96
108
|
<
|
|
97
109
|
const ParamList extends ParamListBase,
|
|
98
110
|
const NavigatorID extends string | undefined = string | undefined,
|
|
99
111
|
>(): TypedNavigator<
|
|
100
|
-
StandardNavigationTypeBagFor<
|
|
112
|
+
StandardNavigationTypeBagFor<
|
|
113
|
+
TypeBag,
|
|
114
|
+
ParamList,
|
|
115
|
+
NavigatorID,
|
|
116
|
+
NavigatorProps
|
|
117
|
+
>,
|
|
101
118
|
undefined
|
|
102
119
|
>;
|
|
103
|
-
<
|
|
104
|
-
|
|
120
|
+
<
|
|
121
|
+
const Config extends StaticConfig<
|
|
122
|
+
StandardNavigationDefaultBag<TypeBag, NavigatorProps>
|
|
123
|
+
>,
|
|
124
|
+
>(
|
|
125
|
+
config: Config &
|
|
126
|
+
StaticConfig<StandardNavigationDefaultBag<TypeBag, NavigatorProps>>
|
|
105
127
|
): TypedNavigator<
|
|
106
128
|
StandardNavigationTypeBagFor<
|
|
107
129
|
TypeBag,
|
|
108
130
|
StaticParamList<{ config: Config }> & ParamListBase,
|
|
109
|
-
string | undefined
|
|
131
|
+
string | undefined,
|
|
132
|
+
NavigatorProps
|
|
110
133
|
>,
|
|
111
134
|
Config
|
|
112
135
|
>;
|
|
@@ -134,12 +157,13 @@ export interface StandardNavigationTypeBagBase extends NavigatorTypeBagBase {
|
|
|
134
157
|
export function createStandardNavigationFactories<
|
|
135
158
|
TypeBag extends StandardNavigationTypeBagBase,
|
|
136
159
|
NavigatorProps extends object = {},
|
|
160
|
+
MapperProps extends object = {},
|
|
137
161
|
>(
|
|
138
162
|
navigator: ReturnType<
|
|
139
163
|
typeof createStandardNavigator<
|
|
140
164
|
TypeBag['ScreenOptions'],
|
|
141
165
|
StandardEventMap<TypeBag['EventMap']>,
|
|
142
|
-
NavigatorProps
|
|
166
|
+
NavigatorProps & MapperProps
|
|
143
167
|
>
|
|
144
168
|
>,
|
|
145
169
|
router: RouterFactory<
|
|
@@ -147,8 +171,8 @@ export function createStandardNavigationFactories<
|
|
|
147
171
|
NavigationAction,
|
|
148
172
|
TypeBag['RouterOptions']
|
|
149
173
|
>,
|
|
150
|
-
mapper?: StandardNavigationPropsMapper<TypeBag,
|
|
151
|
-
): StandardNavigationFactories<TypeBag> {
|
|
174
|
+
mapper?: StandardNavigationPropsMapper<TypeBag, MapperProps>
|
|
175
|
+
): StandardNavigationFactories<TypeBag, NavigatorProps> {
|
|
152
176
|
const { type, version, NavigatorContent } = navigator;
|
|
153
177
|
|
|
154
178
|
if (type !== 'standard') {
|
|
@@ -170,7 +194,7 @@ export function createStandardNavigationFactories<
|
|
|
170
194
|
>;
|
|
171
195
|
|
|
172
196
|
function StandardNavigationNavigator(
|
|
173
|
-
props: StandardNavigationNavigatorProps<TypeBag>
|
|
197
|
+
props: StandardNavigationNavigatorProps<TypeBag> & NavigatorProps
|
|
174
198
|
) {
|
|
175
199
|
const builder = useNavigationBuilder<
|
|
176
200
|
Bag['State'],
|
|
@@ -269,7 +293,7 @@ export function createStandardNavigationFactories<
|
|
|
269
293
|
return (
|
|
270
294
|
<builder.NavigationContent>
|
|
271
295
|
<NavigatorContent
|
|
272
|
-
{...(rest as NavigatorProps)}
|
|
296
|
+
{...(rest as NavigatorProps & MapperProps)}
|
|
273
297
|
{...mapped}
|
|
274
298
|
state={state}
|
|
275
299
|
descriptors={descriptors}
|
|
@@ -282,10 +306,12 @@ export function createStandardNavigationFactories<
|
|
|
282
306
|
|
|
283
307
|
const createNavigator = createNavigatorFactory(
|
|
284
308
|
StandardNavigationNavigator
|
|
285
|
-
) as StandardNavigationCreateNavigator<TypeBag>;
|
|
309
|
+
) as StandardNavigationCreateNavigator<TypeBag, NavigatorProps>;
|
|
286
310
|
|
|
287
311
|
const createScreen =
|
|
288
|
-
createScreenFactory<
|
|
312
|
+
createScreenFactory<
|
|
313
|
+
StandardNavigationDefaultBag<TypeBag, NavigatorProps>
|
|
314
|
+
>();
|
|
289
315
|
|
|
290
316
|
return {
|
|
291
317
|
createNavigator,
|