@react-navigation/routers 7.0.0-alpha.2 → 7.0.0-alpha.3
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/commonjs/BaseRouter.js +1 -2
- package/lib/commonjs/BaseRouter.js.map +1 -1
- package/lib/commonjs/CommonActions.js +2 -3
- package/lib/commonjs/CommonActions.js.map +1 -1
- package/lib/commonjs/DrawerRouter.js +2 -6
- package/lib/commonjs/DrawerRouter.js.map +1 -1
- package/lib/commonjs/StackRouter.js +11 -12
- package/lib/commonjs/StackRouter.js.map +1 -1
- package/lib/commonjs/TabRouter.js +6 -8
- package/lib/commonjs/TabRouter.js.map +1 -1
- package/lib/commonjs/index.js +2 -2
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/types.js.map +1 -1
- package/lib/module/BaseRouter.js.map +1 -1
- package/lib/module/CommonActions.js +2 -3
- package/lib/module/CommonActions.js.map +1 -1
- package/lib/module/DrawerRouter.js +1 -4
- package/lib/module/DrawerRouter.js.map +1 -1
- package/lib/module/StackRouter.js +10 -10
- package/lib/module/StackRouter.js.map +1 -1
- package/lib/module/TabRouter.js +5 -6
- package/lib/module/TabRouter.js.map +1 -1
- package/lib/module/index.js.map +1 -1
- package/lib/module/types.js.map +1 -1
- package/lib/typescript/src/DrawerRouter.d.ts +1 -1
- package/lib/typescript/src/DrawerRouter.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/CommonActions.tsx +4 -4
- package/src/DrawerRouter.tsx +4 -4
- package/src/StackRouter.tsx +2 -2
- package/src/TabRouter.tsx +1 -1
- package/src/types.tsx +4 -4
|
@@ -9,7 +9,7 @@ var _nonSecure = require("nanoid/non-secure");
|
|
|
9
9
|
* Base router object that can be used when writing custom routers.
|
|
10
10
|
* This provides few helper methods to handle common actions such as `RESET`.
|
|
11
11
|
*/
|
|
12
|
-
const BaseRouter = {
|
|
12
|
+
const BaseRouter = exports.BaseRouter = {
|
|
13
13
|
getStateForAction(state, action) {
|
|
14
14
|
switch (action.type) {
|
|
15
15
|
case 'SET_PARAMS':
|
|
@@ -57,5 +57,4 @@ const BaseRouter = {
|
|
|
57
57
|
return action.type === 'NAVIGATE' || action.type === 'NAVIGATE_DEPRECATED';
|
|
58
58
|
}
|
|
59
59
|
};
|
|
60
|
-
exports.BaseRouter = BaseRouter;
|
|
61
60
|
//# sourceMappingURL=BaseRouter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["BaseRouter","getStateForAction","state","action","type","index","source","routes","findIndex","r","key","map","i","params","payload","nextState","length","some","route","routeNames","includes","name","stale","nanoid","shouldActionChangeFocus"],"sourceRoot":"../../src","sources":["BaseRouter.tsx"],"mappings":";;;;;;AAAA;AAQA;AACA;AACA;AACA;AACO,
|
|
1
|
+
{"version":3,"names":["_nonSecure","require","BaseRouter","exports","getStateForAction","state","action","type","index","source","routes","findIndex","r","key","map","i","params","payload","nextState","length","some","route","routeNames","includes","name","stale","nanoid","shouldActionChangeFocus"],"sourceRoot":"../../src","sources":["BaseRouter.tsx"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAQA;AACA;AACA;AACA;AACO,MAAMC,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG;EACxBE,iBAAiBA,CACfC,KAAY,EACZC,MAA8B,EACM;IACpC,QAAQA,MAAM,CAACC,IAAI;MACjB,KAAK,YAAY;QAAE;UACjB,MAAMC,KAAK,GAAGF,MAAM,CAACG,MAAM,GACvBJ,KAAK,CAACK,MAAM,CAACC,SAAS,CAAEC,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAKP,MAAM,CAACG,MAAM,CAAC,GACtDJ,KAAK,CAACG,KAAK;UAEf,IAAIA,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,OAAO,IAAI;UACb;UAEA,OAAO;YACL,GAAGH,KAAK;YACRK,MAAM,EAAEL,KAAK,CAACK,MAAM,CAACI,GAAG,CAAC,CAACF,CAAC,EAAEG,CAAC,KAC5BA,CAAC,KAAKP,KAAK,GACP;cAAE,GAAGI,CAAC;cAAEI,MAAM,EAAE;gBAAE,GAAGJ,CAAC,CAACI,MAAM;gBAAE,GAAGV,MAAM,CAACW,OAAO,CAACD;cAAO;YAAE,CAAC,GAC3DJ,CACN;UACF,CAAC;QACH;MAEA,KAAK,OAAO;QAAE;UACZ,MAAMM,SAAS,GAAGZ,MAAM,CAACW,OAAsC;UAE/D,IACEC,SAAS,CAACR,MAAM,CAACS,MAAM,KAAK,CAAC,IAC7BD,SAAS,CAACR,MAAM,CAACU,IAAI,CAClBC,KAAuB,IAAK,CAAChB,KAAK,CAACiB,UAAU,CAACC,QAAQ,CAACF,KAAK,CAACG,IAAI,CACpE,CAAC,EACD;YACA,OAAO,IAAI;UACb;UAEA,IAAIN,SAAS,CAACO,KAAK,KAAK,KAAK,EAAE;YAC7B,IACEpB,KAAK,CAACiB,UAAU,CAACH,MAAM,KAAKD,SAAS,CAACI,UAAU,CAACH,MAAM,IACvDD,SAAS,CAACI,UAAU,CAACF,IAAI,CACtBI,IAAI,IAAK,CAACnB,KAAK,CAACiB,UAAU,CAACC,QAAQ,CAACC,IAAI,CAC3C,CAAC,EACD;cACA,OAAO,IAAI;YACb;YAEA,OAAO;cACL,GAAGN,SAAS;cACZR,MAAM,EAAEQ,SAAS,CAACR,MAAM,CAACI,GAAG,CAAEO,KAAK,IACjCA,KAAK,CAACR,GAAG,GAAGQ,KAAK,GAAG;gBAAE,GAAGA,KAAK;gBAAER,GAAG,EAAG,GAAEQ,KAAK,CAACG,IAAK,IAAG,IAAAE,iBAAM,EAAC,CAAE;cAAE,CACnE;YACF,CAAC;UACH;UAEA,OAAOR,SAAS;QAClB;MAEA;QACE,OAAO,IAAI;IACf;EACF,CAAC;EAEDS,uBAAuBA,CAACrB,MAA8B,EAAE;IACtD,OAAOA,MAAM,CAACC,IAAI,KAAK,UAAU,IAAID,MAAM,CAACC,IAAI,KAAK,qBAAqB;EAC5E;AACF,CAAC"}
|
|
@@ -13,7 +13,6 @@ function goBack() {
|
|
|
13
13
|
type: 'GO_BACK'
|
|
14
14
|
};
|
|
15
15
|
}
|
|
16
|
-
// eslint-disable-next-line no-redeclare
|
|
17
16
|
function navigate() {
|
|
18
17
|
if (typeof (arguments.length <= 0 ? undefined : arguments[0]) === 'string') {
|
|
19
18
|
return {
|
|
@@ -25,7 +24,7 @@ function navigate() {
|
|
|
25
24
|
};
|
|
26
25
|
} else {
|
|
27
26
|
const payload = (arguments.length <= 0 ? undefined : arguments[0]) || {};
|
|
28
|
-
if (!
|
|
27
|
+
if (!('name' in payload)) {
|
|
29
28
|
throw new Error('You need to specify a name when calling navigate with an object as the argument. See https://reactnavigation.org/docs/navigation-actions#navigate for usage.');
|
|
30
29
|
}
|
|
31
30
|
return {
|
|
@@ -45,7 +44,7 @@ function navigateDeprecated() {
|
|
|
45
44
|
};
|
|
46
45
|
} else {
|
|
47
46
|
const payload = (arguments.length <= 0 ? undefined : arguments[0]) || {};
|
|
48
|
-
if (!
|
|
47
|
+
if (!('name' in payload)) {
|
|
49
48
|
throw new Error('You need to specify a name when calling navigate with an object as the argument. See https://reactnavigation.org/docs/navigation-actions#navigatelegacy for usage.');
|
|
50
49
|
}
|
|
51
50
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["goBack","type","navigate","payload","name","params","
|
|
1
|
+
{"version":3,"names":["goBack","type","navigate","arguments","length","undefined","payload","name","params","Error","navigateDeprecated","reset","state","setParams"],"sourceRoot":"../../src","sources":["CommonActions.tsx"],"mappings":";;;;;;;;;;AAiDO,SAASA,MAAMA,CAAA,EAAW;EAC/B,OAAO;IAAEC,IAAI,EAAE;EAAU,CAAC;AAC5B;AAWO,SAASC,QAAQA,CAAA,EAAuB;EAC7C,IAAI,QAAAC,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,IAAc,KAAK,QAAQ,EAAE;IAC/B,OAAO;MAAEF,IAAI,EAAE,UAAU;MAAEK,OAAO,EAAE;QAAEC,IAAI,EAAAJ,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,GAAS;QAAEK,MAAM,EAAAL,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA;MAAU;IAAE,CAAC;EAC1E,CAAC,MAAM;IACL,MAAMG,OAAO,GAAG,CAAAH,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,QAAW,CAAC,CAAC;IAE7B,IAAI,EAAE,MAAM,IAAIG,OAAO,CAAC,EAAE;MACxB,MAAM,IAAIG,KAAK,CACb,8JACF,CAAC;IACH;IAEA,OAAO;MAAER,IAAI,EAAE,UAAU;MAAEK;IAAQ,CAAC;EACtC;AACF;AAEO,SAASI,kBAAkBA,CAAA,EAKxB;EACR,IAAI,QAAAP,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,IAAc,KAAK,QAAQ,EAAE;IAC/B,OAAO;MACLF,IAAI,EAAE,qBAAqB;MAC3BK,OAAO,EAAE;QAAEC,IAAI,EAAAJ,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,GAAS;QAAEK,MAAM,EAAAL,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA;MAAU;IAC5C,CAAC;EACH,CAAC,MAAM;IACL,MAAMG,OAAO,GAAG,CAAAH,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,QAAW,CAAC,CAAC;IAE7B,IAAI,EAAE,MAAM,IAAIG,OAAO,CAAC,EAAE;MACxB,MAAM,IAAIG,KAAK,CACb,oKACF,CAAC;IACH;IAEA,OAAO;MAAER,IAAI,EAAE,qBAAqB;MAAEK;IAAQ,CAAC;EACjD;AACF;AAEO,SAASK,KAAKA,CAACC,KAA6B,EAAU;EAC3D,OAAO;IAAEX,IAAI,EAAE,OAAO;IAAEK,OAAO,EAAEM;EAAM,CAAC;AAC1C;AAEO,SAASC,SAASA,CAACL,MAAc,EAAU;EAChD,OAAO;IAAEP,IAAI,EAAE,YAAY;IAAEK,OAAO,EAAE;MAAEE;IAAO;EAAE,CAAC;AACpD"}
|
|
@@ -7,7 +7,7 @@ exports.DrawerActions = void 0;
|
|
|
7
7
|
exports.DrawerRouter = DrawerRouter;
|
|
8
8
|
var _nonSecure = require("nanoid/non-secure");
|
|
9
9
|
var _TabRouter = require("./TabRouter");
|
|
10
|
-
const DrawerActions = {
|
|
10
|
+
const DrawerActions = exports.DrawerActions = {
|
|
11
11
|
..._TabRouter.TabActions,
|
|
12
12
|
openDrawer() {
|
|
13
13
|
return {
|
|
@@ -25,17 +25,13 @@ const DrawerActions = {
|
|
|
25
25
|
};
|
|
26
26
|
}
|
|
27
27
|
};
|
|
28
|
-
exports.DrawerActions = DrawerActions;
|
|
29
28
|
function DrawerRouter(_ref) {
|
|
30
29
|
let {
|
|
31
30
|
defaultStatus = 'closed',
|
|
32
31
|
...rest
|
|
33
32
|
} = _ref;
|
|
34
33
|
const router = (0, _TabRouter.TabRouter)(rest);
|
|
35
|
-
const isDrawerInHistory = state =>
|
|
36
|
-
var _state$history;
|
|
37
|
-
return Boolean((_state$history = state.history) === null || _state$history === void 0 ? void 0 : _state$history.some(it => it.type === 'drawer'));
|
|
38
|
-
};
|
|
34
|
+
const isDrawerInHistory = state => Boolean(state.history?.some(it => it.type === 'drawer'));
|
|
39
35
|
const addDrawerToHistory = state => {
|
|
40
36
|
if (isDrawerInHistory(state)) {
|
|
41
37
|
return state;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DrawerActions","TabActions","openDrawer","type","closeDrawer","toggleDrawer","DrawerRouter","defaultStatus","rest","router","TabRouter","isDrawerInHistory","state","Boolean","history","some","it","addDrawerToHistory","status","removeDrawerFromHistory","filter","getInitialState","routeNames","routeParamList","routeGetIdList","default","stale","key","nanoid","getRehydratedState","partialState","getStateForRouteFocus","result","getStateForAction","action","options","index","actionCreators"],"sourceRoot":"../../src","sources":["DrawerRouter.tsx"],"mappings":";;;;;;;AAAA;AAEA;AAmEO,
|
|
1
|
+
{"version":3,"names":["_nonSecure","require","_TabRouter","DrawerActions","exports","TabActions","openDrawer","type","closeDrawer","toggleDrawer","DrawerRouter","_ref","defaultStatus","rest","router","TabRouter","isDrawerInHistory","state","Boolean","history","some","it","addDrawerToHistory","status","removeDrawerFromHistory","filter","getInitialState","_ref2","routeNames","routeParamList","routeGetIdList","default","stale","key","nanoid","getRehydratedState","partialState","_ref3","getStateForRouteFocus","result","getStateForAction","action","options","index","actionCreators"],"sourceRoot":"../../src","sources":["DrawerRouter.tsx"],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ exports.StackActions = void 0;
|
|
|
7
7
|
exports.StackRouter = StackRouter;
|
|
8
8
|
var _nonSecure = require("nanoid/non-secure");
|
|
9
9
|
var _BaseRouter = require("./BaseRouter");
|
|
10
|
-
const StackActions = {
|
|
10
|
+
const StackActions = exports.StackActions = {
|
|
11
11
|
replace(name, params) {
|
|
12
12
|
return {
|
|
13
13
|
type: 'REPLACE',
|
|
@@ -51,7 +51,6 @@ const StackActions = {
|
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
53
|
};
|
|
54
|
-
exports.StackActions = StackActions;
|
|
55
54
|
function StackRouter(options) {
|
|
56
55
|
const router = {
|
|
57
56
|
..._BaseRouter.BaseRouter,
|
|
@@ -80,7 +79,7 @@ function StackRouter(options) {
|
|
|
80
79
|
routeNames,
|
|
81
80
|
routeParamList
|
|
82
81
|
} = _ref2;
|
|
83
|
-
|
|
82
|
+
const state = partialState;
|
|
84
83
|
if (state.stale === false) {
|
|
85
84
|
return state;
|
|
86
85
|
}
|
|
@@ -179,14 +178,14 @@ function StackRouter(options) {
|
|
|
179
178
|
return null;
|
|
180
179
|
}
|
|
181
180
|
const getId = options.routeGetIdList[action.payload.name];
|
|
182
|
-
const id = getId
|
|
181
|
+
const id = getId?.({
|
|
183
182
|
params: action.payload.params
|
|
184
183
|
});
|
|
185
184
|
let route;
|
|
186
185
|
if (id !== undefined) {
|
|
187
|
-
route = state.routes.find(route => route.name === action.payload.name && id ===
|
|
186
|
+
route = state.routes.find(route => route.name === action.payload.name && id === getId?.({
|
|
188
187
|
params: route.params
|
|
189
|
-
}))
|
|
188
|
+
}));
|
|
190
189
|
} else {
|
|
191
190
|
const currentRoute = state.routes[state.index];
|
|
192
191
|
|
|
@@ -240,13 +239,13 @@ function StackRouter(options) {
|
|
|
240
239
|
// If the route already exists, navigate to that
|
|
241
240
|
let index = -1;
|
|
242
241
|
const getId = options.routeGetIdList[action.payload.name];
|
|
243
|
-
const id = getId
|
|
242
|
+
const id = getId?.({
|
|
244
243
|
params: action.payload.params
|
|
245
244
|
});
|
|
246
245
|
if (id) {
|
|
247
|
-
index = state.routes.findIndex(route => route.name === action.payload.name && id ===
|
|
246
|
+
index = state.routes.findIndex(route => route.name === action.payload.name && id === getId?.({
|
|
248
247
|
params: route.params
|
|
249
|
-
}))
|
|
248
|
+
}));
|
|
250
249
|
} else if (state.routes[state.index].name === action.payload.name) {
|
|
251
250
|
index = state.index;
|
|
252
251
|
} else {
|
|
@@ -325,13 +324,13 @@ function StackRouter(options) {
|
|
|
325
324
|
// If the route already exists, navigate to that
|
|
326
325
|
let index = -1;
|
|
327
326
|
const getId = options.routeGetIdList[action.payload.name];
|
|
328
|
-
const id = getId
|
|
327
|
+
const id = getId?.({
|
|
329
328
|
params: action.payload.params
|
|
330
329
|
});
|
|
331
330
|
if (id) {
|
|
332
|
-
index = state.routes.findIndex(route => route.name === action.payload.name && id ===
|
|
331
|
+
index = state.routes.findIndex(route => route.name === action.payload.name && id === getId?.({
|
|
333
332
|
params: route.params
|
|
334
|
-
}))
|
|
333
|
+
}));
|
|
335
334
|
} else if (state.routes[state.index].name === action.payload.name) {
|
|
336
335
|
index = state.index;
|
|
337
336
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["StackActions","replace","name","params","type","payload","push","pop","count","popToTop","popTo","merge","StackRouter","options","router","BaseRouter","getInitialState","routeNames","routeParamList","initialRouteName","undefined","includes","stale","key","nanoid","index","routes","getRehydratedState","partialState","state","filter","route","map","length","getStateForRouteNamesChange","routeKeyChanges","Math","min","getStateForRouteFocus","findIndex","r","slice","getStateForAction","action","target","source","i","getId","routeGetIdList","id","find","currentRoute","routeKey","path","max","concat","actionCreators"],"sourceRoot":"../../src","sources":["StackRouter.tsx"],"mappings":"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"}
|
|
1
|
+
{"version":3,"names":["_nonSecure","require","_BaseRouter","StackActions","exports","replace","name","params","type","payload","push","pop","count","arguments","length","undefined","popToTop","popTo","merge","StackRouter","options","router","BaseRouter","getInitialState","_ref","routeNames","routeParamList","initialRouteName","includes","stale","key","nanoid","index","routes","getRehydratedState","partialState","_ref2","state","filter","route","map","getStateForRouteNamesChange","_ref3","routeKeyChanges","Math","min","getStateForRouteFocus","findIndex","r","slice","getStateForAction","action","target","source","i","getId","routeGetIdList","id","find","currentRoute","routeKey","path","max","concat","actionCreators"],"sourceRoot":"../../src","sources":["StackRouter.tsx"],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ exports.TabRouter = TabRouter;
|
|
|
8
8
|
var _nonSecure = require("nanoid/non-secure");
|
|
9
9
|
var _BaseRouter = require("./BaseRouter");
|
|
10
10
|
const TYPE_ROUTE = 'route';
|
|
11
|
-
const TabActions = {
|
|
11
|
+
const TabActions = exports.TabActions = {
|
|
12
12
|
jumpTo(name, params) {
|
|
13
13
|
return {
|
|
14
14
|
type: 'JUMP_TO',
|
|
@@ -19,7 +19,6 @@ const TabActions = {
|
|
|
19
19
|
};
|
|
20
20
|
}
|
|
21
21
|
};
|
|
22
|
-
exports.TabActions = TabActions;
|
|
23
22
|
const getRouteHistory = (routes, index, backBehavior, initialRouteName) => {
|
|
24
23
|
const history = [{
|
|
25
24
|
type: TYPE_ROUTE,
|
|
@@ -107,12 +106,11 @@ function TabRouter(_ref) {
|
|
|
107
106
|
};
|
|
108
107
|
},
|
|
109
108
|
getRehydratedState(partialState, _ref3) {
|
|
110
|
-
var _state$routes, _state$history;
|
|
111
109
|
let {
|
|
112
110
|
routeNames,
|
|
113
111
|
routeParamList
|
|
114
112
|
} = _ref3;
|
|
115
|
-
|
|
113
|
+
const state = partialState;
|
|
116
114
|
if (state.stale === false) {
|
|
117
115
|
return state;
|
|
118
116
|
}
|
|
@@ -128,8 +126,8 @@ function TabRouter(_ref) {
|
|
|
128
126
|
} : route ? route.params : undefined
|
|
129
127
|
};
|
|
130
128
|
});
|
|
131
|
-
const index = Math.min(Math.max(routeNames.indexOf(
|
|
132
|
-
const history =
|
|
129
|
+
const index = Math.min(Math.max(routeNames.indexOf(state.routes[state?.index ?? 0]?.name), 0), routes.length - 1);
|
|
130
|
+
const history = state.history?.filter(it => routes.find(r => r.key === it.key)) ?? [];
|
|
133
131
|
return changeIndex({
|
|
134
132
|
stale: false,
|
|
135
133
|
type: 'tab',
|
|
@@ -194,10 +192,10 @@ function TabRouter(_ref) {
|
|
|
194
192
|
return route;
|
|
195
193
|
}
|
|
196
194
|
const getId = routeGetIdList[route.name];
|
|
197
|
-
const currentId = getId
|
|
195
|
+
const currentId = getId?.({
|
|
198
196
|
params: route.params
|
|
199
197
|
});
|
|
200
|
-
const nextId = getId
|
|
198
|
+
const nextId = getId?.({
|
|
201
199
|
params: action.payload.params
|
|
202
200
|
});
|
|
203
201
|
const key = currentId === nextId ? route.key : `${route.name}-${(0, _nonSecure.nanoid)()}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["TYPE_ROUTE","TabActions","jumpTo","name","params","type","payload","getRouteHistory","routes","index","backBehavior","initialRouteName","history","key","initialRouteIndex","i","unshift","findIndex","route","changeIndex","state","currentKey","filter","it","concat","TabRouter","router","BaseRouter","getInitialState","routeNames","routeParamList","undefined","includes","indexOf","map","nanoid","stale","getRehydratedState","partialState","find","r","Math","min","max","length","getStateForRouteNamesChange","routeKeyChanges","getStateForRouteFocus","getStateForAction","action","routeGetIdList","getId","currentId","nextId","merge","path","previousKey","slice","actionCreators"],"sourceRoot":"../../src","sources":["TabRouter.tsx"],"mappings":";;;;;;;AAAA;AAEA;AAyDA,
|
|
1
|
+
{"version":3,"names":["_nonSecure","require","_BaseRouter","TYPE_ROUTE","TabActions","exports","jumpTo","name","params","type","payload","getRouteHistory","routes","index","backBehavior","initialRouteName","history","key","initialRouteIndex","i","unshift","findIndex","route","changeIndex","state","currentKey","filter","it","concat","TabRouter","_ref","router","BaseRouter","getInitialState","_ref2","routeNames","routeParamList","undefined","includes","indexOf","map","nanoid","stale","getRehydratedState","partialState","_ref3","find","r","Math","min","max","length","getStateForRouteNamesChange","_ref4","routeKeyChanges","getStateForRouteFocus","getStateForAction","action","_ref5","routeGetIdList","getId","currentId","nextId","merge","path","previousKey","slice","actionCreators"],"sourceRoot":"../../src","sources":["TabRouter.tsx"],"mappings":"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"}
|
package/lib/commonjs/index.js
CHANGED
|
@@ -74,6 +74,6 @@ Object.keys(_types).forEach(function (key) {
|
|
|
74
74
|
}
|
|
75
75
|
});
|
|
76
76
|
});
|
|
77
|
-
function _getRequireWildcardCache(
|
|
78
|
-
function _interopRequireWildcard(
|
|
77
|
+
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
78
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
79
79
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":[],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;
|
|
1
|
+
{"version":3,"names":["CommonActions","_interopRequireWildcard","require","exports","_BaseRouter","_DrawerRouter","_StackRouter","_TabRouter","_types","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","defineProperty","enumerable","get","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","n","__proto__","a","getOwnPropertyDescriptor","u","i","set"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,aAAA,GAAAC,uBAAA,CAAAC,OAAA;AAAiDC,OAAA,CAAAH,aAAA,GAAAA,aAAA;AAIjD,IAAAI,WAAA,GAAAF,OAAA;AAQA,IAAAG,aAAA,GAAAH,OAAA;AAOA,IAAAI,YAAA,GAAAJ,OAAA;AAOA,IAAAK,UAAA,GAAAL,OAAA;AACA,IAAAM,MAAA,GAAAN,OAAA;AAAAO,MAAA,CAAAC,IAAA,CAAAF,MAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAT,OAAA,IAAAA,OAAA,CAAAS,GAAA,MAAAJ,MAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAQ,cAAA,CAAAd,OAAA,EAAAS,GAAA;IAAAM,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAX,MAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AAAwB,SAAAQ,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAApB,wBAAAoB,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAL,GAAA,CAAAE,CAAA,OAAAO,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAArB,MAAA,CAAAQ,cAAA,IAAAR,MAAA,CAAAsB,wBAAA,WAAAC,CAAA,IAAAX,CAAA,oBAAAW,CAAA,IAAAvB,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAM,CAAA,EAAAW,CAAA,SAAAC,CAAA,GAAAH,CAAA,GAAArB,MAAA,CAAAsB,wBAAA,CAAAV,CAAA,EAAAW,CAAA,UAAAC,CAAA,KAAAA,CAAA,CAAAd,GAAA,IAAAc,CAAA,CAAAC,GAAA,IAAAzB,MAAA,CAAAQ,cAAA,CAAAW,CAAA,EAAAI,CAAA,EAAAC,CAAA,IAAAL,CAAA,CAAAI,CAAA,IAAAX,CAAA,CAAAW,CAAA,YAAAJ,CAAA,CAAAF,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAU,GAAA,CAAAb,CAAA,EAAAO,CAAA,GAAAA,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":[],"sourceRoot":"../../src","sources":["types.tsx"],"mappings":""}
|
|
1
|
+
{"version":3,"names":[],"sourceRoot":"../../src","sources":["types.tsx"],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","BaseRouter","getStateForAction","state","action","type","index","source","routes","findIndex","r","key","map","i","params","payload","nextState","length","some","route","routeNames","includes","name","stale","shouldActionChangeFocus"],"sourceRoot":"../../src","sources":["BaseRouter.tsx"],"mappings":"AAAA,SAASA,MAAM,QAAQ,mBAAmB;AAQ1C;AACA;AACA;AACA;AACA,OAAO,MAAMC,UAAU,GAAG;EACxBC,
|
|
1
|
+
{"version":3,"names":["nanoid","BaseRouter","getStateForAction","state","action","type","index","source","routes","findIndex","r","key","map","i","params","payload","nextState","length","some","route","routeNames","includes","name","stale","shouldActionChangeFocus"],"sourceRoot":"../../src","sources":["BaseRouter.tsx"],"mappings":"AAAA,SAASA,MAAM,QAAQ,mBAAmB;AAQ1C;AACA;AACA;AACA;AACA,OAAO,MAAMC,UAAU,GAAG;EACxBC,iBAAiBA,CACfC,KAAY,EACZC,MAA8B,EACM;IACpC,QAAQA,MAAM,CAACC,IAAI;MACjB,KAAK,YAAY;QAAE;UACjB,MAAMC,KAAK,GAAGF,MAAM,CAACG,MAAM,GACvBJ,KAAK,CAACK,MAAM,CAACC,SAAS,CAAEC,CAAC,IAAKA,CAAC,CAACC,GAAG,KAAKP,MAAM,CAACG,MAAM,CAAC,GACtDJ,KAAK,CAACG,KAAK;UAEf,IAAIA,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,OAAO,IAAI;UACb;UAEA,OAAO;YACL,GAAGH,KAAK;YACRK,MAAM,EAAEL,KAAK,CAACK,MAAM,CAACI,GAAG,CAAC,CAACF,CAAC,EAAEG,CAAC,KAC5BA,CAAC,KAAKP,KAAK,GACP;cAAE,GAAGI,CAAC;cAAEI,MAAM,EAAE;gBAAE,GAAGJ,CAAC,CAACI,MAAM;gBAAE,GAAGV,MAAM,CAACW,OAAO,CAACD;cAAO;YAAE,CAAC,GAC3DJ,CACN;UACF,CAAC;QACH;MAEA,KAAK,OAAO;QAAE;UACZ,MAAMM,SAAS,GAAGZ,MAAM,CAACW,OAAsC;UAE/D,IACEC,SAAS,CAACR,MAAM,CAACS,MAAM,KAAK,CAAC,IAC7BD,SAAS,CAACR,MAAM,CAACU,IAAI,CAClBC,KAAuB,IAAK,CAAChB,KAAK,CAACiB,UAAU,CAACC,QAAQ,CAACF,KAAK,CAACG,IAAI,CACpE,CAAC,EACD;YACA,OAAO,IAAI;UACb;UAEA,IAAIN,SAAS,CAACO,KAAK,KAAK,KAAK,EAAE;YAC7B,IACEpB,KAAK,CAACiB,UAAU,CAACH,MAAM,KAAKD,SAAS,CAACI,UAAU,CAACH,MAAM,IACvDD,SAAS,CAACI,UAAU,CAACF,IAAI,CACtBI,IAAI,IAAK,CAACnB,KAAK,CAACiB,UAAU,CAACC,QAAQ,CAACC,IAAI,CAC3C,CAAC,EACD;cACA,OAAO,IAAI;YACb;YAEA,OAAO;cACL,GAAGN,SAAS;cACZR,MAAM,EAAEQ,SAAS,CAACR,MAAM,CAACI,GAAG,CAAEO,KAAK,IACjCA,KAAK,CAACR,GAAG,GAAGQ,KAAK,GAAG;gBAAE,GAAGA,KAAK;gBAAER,GAAG,EAAG,GAAEQ,KAAK,CAACG,IAAK,IAAGtB,MAAM,CAAC,CAAE;cAAE,CACnE;YACF,CAAC;UACH;UAEA,OAAOgB,SAAS;QAClB;MAEA;QACE,OAAO,IAAI;IACf;EACF,CAAC;EAEDQ,uBAAuBA,CAACpB,MAA8B,EAAE;IACtD,OAAOA,MAAM,CAACC,IAAI,KAAK,UAAU,IAAID,MAAM,CAACC,IAAI,KAAK,qBAAqB;EAC5E;AACF,CAAC"}
|
|
@@ -3,7 +3,6 @@ export function goBack() {
|
|
|
3
3
|
type: 'GO_BACK'
|
|
4
4
|
};
|
|
5
5
|
}
|
|
6
|
-
// eslint-disable-next-line no-redeclare
|
|
7
6
|
export function navigate() {
|
|
8
7
|
if (typeof (arguments.length <= 0 ? undefined : arguments[0]) === 'string') {
|
|
9
8
|
return {
|
|
@@ -15,7 +14,7 @@ export function navigate() {
|
|
|
15
14
|
};
|
|
16
15
|
} else {
|
|
17
16
|
const payload = (arguments.length <= 0 ? undefined : arguments[0]) || {};
|
|
18
|
-
if (!
|
|
17
|
+
if (!('name' in payload)) {
|
|
19
18
|
throw new Error('You need to specify a name when calling navigate with an object as the argument. See https://reactnavigation.org/docs/navigation-actions#navigate for usage.');
|
|
20
19
|
}
|
|
21
20
|
return {
|
|
@@ -35,7 +34,7 @@ export function navigateDeprecated() {
|
|
|
35
34
|
};
|
|
36
35
|
} else {
|
|
37
36
|
const payload = (arguments.length <= 0 ? undefined : arguments[0]) || {};
|
|
38
|
-
if (!
|
|
37
|
+
if (!('name' in payload)) {
|
|
39
38
|
throw new Error('You need to specify a name when calling navigate with an object as the argument. See https://reactnavigation.org/docs/navigation-actions#navigatelegacy for usage.');
|
|
40
39
|
}
|
|
41
40
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["goBack","type","navigate","payload","name","params","
|
|
1
|
+
{"version":3,"names":["goBack","type","navigate","arguments","length","undefined","payload","name","params","Error","navigateDeprecated","reset","state","setParams"],"sourceRoot":"../../src","sources":["CommonActions.tsx"],"mappings":"AAiDA,OAAO,SAASA,MAAMA,CAAA,EAAW;EAC/B,OAAO;IAAEC,IAAI,EAAE;EAAU,CAAC;AAC5B;AAWA,OAAO,SAASC,QAAQA,CAAA,EAAuB;EAC7C,IAAI,QAAAC,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,IAAc,KAAK,QAAQ,EAAE;IAC/B,OAAO;MAAEF,IAAI,EAAE,UAAU;MAAEK,OAAO,EAAE;QAAEC,IAAI,EAAAJ,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,GAAS;QAAEK,MAAM,EAAAL,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA;MAAU;IAAE,CAAC;EAC1E,CAAC,MAAM;IACL,MAAMG,OAAO,GAAG,CAAAH,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,QAAW,CAAC,CAAC;IAE7B,IAAI,EAAE,MAAM,IAAIG,OAAO,CAAC,EAAE;MACxB,MAAM,IAAIG,KAAK,CACb,8JACF,CAAC;IACH;IAEA,OAAO;MAAER,IAAI,EAAE,UAAU;MAAEK;IAAQ,CAAC;EACtC;AACF;AAEA,OAAO,SAASI,kBAAkBA,CAAA,EAKxB;EACR,IAAI,QAAAP,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,IAAc,KAAK,QAAQ,EAAE;IAC/B,OAAO;MACLF,IAAI,EAAE,qBAAqB;MAC3BK,OAAO,EAAE;QAAEC,IAAI,EAAAJ,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,GAAS;QAAEK,MAAM,EAAAL,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA;MAAU;IAC5C,CAAC;EACH,CAAC,MAAM;IACL,MAAMG,OAAO,GAAG,CAAAH,SAAA,CAAAC,MAAA,QAAAC,SAAA,GAAAF,SAAA,QAAW,CAAC,CAAC;IAE7B,IAAI,EAAE,MAAM,IAAIG,OAAO,CAAC,EAAE;MACxB,MAAM,IAAIG,KAAK,CACb,oKACF,CAAC;IACH;IAEA,OAAO;MAAER,IAAI,EAAE,qBAAqB;MAAEK;IAAQ,CAAC;EACjD;AACF;AAEA,OAAO,SAASK,KAAKA,CAACC,KAA6B,EAAU;EAC3D,OAAO;IAAEX,IAAI,EAAE,OAAO;IAAEK,OAAO,EAAEM;EAAM,CAAC;AAC1C;AAEA,OAAO,SAASC,SAASA,CAACL,MAAc,EAAU;EAChD,OAAO;IAAEP,IAAI,EAAE,YAAY;IAAEK,OAAO,EAAE;MAAEE;IAAO;EAAE,CAAC;AACpD"}
|
|
@@ -24,10 +24,7 @@ export function DrawerRouter(_ref) {
|
|
|
24
24
|
...rest
|
|
25
25
|
} = _ref;
|
|
26
26
|
const router = TabRouter(rest);
|
|
27
|
-
const isDrawerInHistory = state =>
|
|
28
|
-
var _state$history;
|
|
29
|
-
return Boolean((_state$history = state.history) === null || _state$history === void 0 ? void 0 : _state$history.some(it => it.type === 'drawer'));
|
|
30
|
-
};
|
|
27
|
+
const isDrawerInHistory = state => Boolean(state.history?.some(it => it.type === 'drawer'));
|
|
31
28
|
const addDrawerToHistory = state => {
|
|
32
29
|
if (isDrawerInHistory(state)) {
|
|
33
30
|
return state;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","TabActions","TabRouter","DrawerActions","openDrawer","type","closeDrawer","toggleDrawer","DrawerRouter","defaultStatus","rest","router","isDrawerInHistory","state","Boolean","history","some","it","addDrawerToHistory","status","removeDrawerFromHistory","filter","getInitialState","routeNames","routeParamList","routeGetIdList","default","stale","key","getRehydratedState","partialState","getStateForRouteFocus","result","getStateForAction","action","options","index","actionCreators"],"sourceRoot":"../../src","sources":["DrawerRouter.tsx"],"mappings":"AAAA,SAASA,MAAM,QAAQ,mBAAmB;AAE1C,SAEEC,UAAU,EAGVC,SAAS,QAEJ,aAAa;AA4DpB,OAAO,MAAMC,aAAa,GAAG;EAC3B,GAAGF,UAAU;EACbG,
|
|
1
|
+
{"version":3,"names":["nanoid","TabActions","TabRouter","DrawerActions","openDrawer","type","closeDrawer","toggleDrawer","DrawerRouter","_ref","defaultStatus","rest","router","isDrawerInHistory","state","Boolean","history","some","it","addDrawerToHistory","status","removeDrawerFromHistory","filter","getInitialState","_ref2","routeNames","routeParamList","routeGetIdList","default","stale","key","getRehydratedState","partialState","_ref3","getStateForRouteFocus","result","getStateForAction","action","options","index","actionCreators"],"sourceRoot":"../../src","sources":["DrawerRouter.tsx"],"mappings":"AAAA,SAASA,MAAM,QAAQ,mBAAmB;AAE1C,SAEEC,UAAU,EAGVC,SAAS,QAEJ,aAAa;AA4DpB,OAAO,MAAMC,aAAa,GAAG;EAC3B,GAAGF,UAAU;EACbG,UAAUA,CAAA,EAAqB;IAC7B,OAAO;MAAEC,IAAI,EAAE;IAAc,CAAC;EAChC,CAAC;EACDC,WAAWA,CAAA,EAAqB;IAC9B,OAAO;MAAED,IAAI,EAAE;IAAe,CAAC;EACjC,CAAC;EACDE,YAAYA,CAAA,EAAqB;IAC/B,OAAO;MAAEF,IAAI,EAAE;IAAgB,CAAC;EAClC;AACF,CAAC;AAED,OAAO,SAASG,YAAYA,CAAAC,IAAA,EAM1B;EAAA,IAN2B;IAC3BC,aAAa,GAAG,QAAQ;IACxB,GAAGC;EACgB,CAAC,GAAAF,IAAA;EAIpB,MAAMG,MAAM,GAAGV,SAAS,CAACS,IAAI,CAG5B;EAED,MAAME,iBAAiB,GACrBC,KAEsD,IACnDC,OAAO,CAACD,KAAK,CAACE,OAAO,EAAEC,IAAI,CAAEC,EAAE,IAAKA,EAAE,CAACb,IAAI,KAAK,QAAQ,CAAC,CAAC;EAE/D,MAAMc,kBAAkB,GACtBL,KAA2C,IACF;IACzC,IAAID,iBAAiB,CAACC,KAAK,CAAC,EAAE;MAC5B,OAAOA,KAAK;IACd;IAEA,OAAO;MACL,GAAGA,KAAK;MACRE,OAAO,EAAE,CACP,GAAGF,KAAK,CAACE,OAAO,EAChB;QACEX,IAAI,EAAE,QAAQ;QACde,MAAM,EAAEV,aAAa,KAAK,MAAM,GAAG,QAAQ,GAAG;MAChD,CAAC;IAEL,CAAC;EACH,CAAC;EAED,MAAMW,uBAAuB,GAC3BP,KAA2C,IACF;IACzC,IAAI,CAACD,iBAAiB,CAACC,KAAK,CAAC,EAAE;MAC7B,OAAOA,KAAK;IACd;IAEA,OAAO;MACL,GAAGA,KAAK;MACRE,OAAO,EAAEF,KAAK,CAACE,OAAO,CAACM,MAAM,CAAEJ,EAAE,IAAKA,EAAE,CAACb,IAAI,KAAK,QAAQ;IAC5D,CAAC;EACH,CAAC;EAED,MAAMD,UAAU,GACdU,KAA2C,IACF;IACzC,IAAIJ,aAAa,KAAK,MAAM,EAAE;MAC5B,OAAOW,uBAAuB,CAACP,KAAK,CAAC;IACvC;IAEA,OAAOK,kBAAkB,CAACL,KAAK,CAAC;EAClC,CAAC;EAED,MAAMR,WAAW,GACfQ,KAA2C,IACF;IACzC,IAAIJ,aAAa,KAAK,MAAM,EAAE;MAC5B,OAAOS,kBAAkB,CAACL,KAAK,CAAC;IAClC;IAEA,OAAOO,uBAAuB,CAACP,KAAK,CAAC;EACvC,CAAC;EAED,OAAO;IACL,GAAGF,MAAM;IAETP,IAAI,EAAE,QAAQ;IAEdkB,eAAeA,CAAAC,KAAA,EAAiD;MAAA,IAAhD;QAAEC,UAAU;QAAEC,cAAc;QAAEC;MAAe,CAAC,GAAAH,KAAA;MAC5D,MAAMV,KAAK,GAAGF,MAAM,CAACW,eAAe,CAAC;QACnCE,UAAU;QACVC,cAAc;QACdC;MACF,CAAC,CAAC;MAEF,OAAO;QACL,GAAGb,KAAK;QACRc,OAAO,EAAElB,aAAa;QACtBmB,KAAK,EAAE,KAAK;QACZxB,IAAI,EAAE,QAAQ;QACdyB,GAAG,EAAG,UAAS9B,MAAM,CAAC,CAAE;MAC1B,CAAC;IACH,CAAC;IAED+B,kBAAkBA,CAChBC,YAAY,EAAAC,KAAA,EAEZ;MAAA,IADA;QAAER,UAAU;QAAEC,cAAc;QAAEC;MAAe,CAAC,GAAAM,KAAA;MAE9C,IAAID,YAAY,CAACH,KAAK,KAAK,KAAK,EAAE;QAChC,OAAOG,YAAY;MACrB;MAEA,IAAIlB,KAAK,GAAGF,MAAM,CAACmB,kBAAkB,CAACC,YAAY,EAAE;QAClDP,UAAU;QACVC,cAAc;QACdC;MACF,CAAC,CAAC;MAEF,IAAId,iBAAiB,CAACmB,YAAY,CAAC,EAAE;QACnC;QACAlB,KAAK,GAAGO,uBAAuB,CAACP,KAAK,CAAC;QACtCA,KAAK,GAAGK,kBAAkB,CAACL,KAAK,CAAC;MACnC;MAEA,OAAO;QACL,GAAGA,KAAK;QACRc,OAAO,EAAElB,aAAa;QACtBL,IAAI,EAAE,QAAQ;QACdyB,GAAG,EAAG,UAAS9B,MAAM,CAAC,CAAE;MAC1B,CAAC;IACH,CAAC;IAEDkC,qBAAqBA,CAACpB,KAAK,EAAEgB,GAAG,EAAE;MAChC,MAAMK,MAAM,GAAGvB,MAAM,CAACsB,qBAAqB,CAACpB,KAAK,EAAEgB,GAAG,CAAC;MAEvD,OAAOxB,WAAW,CAAC6B,MAAM,CAAC;IAC5B,CAAC;IAEDC,iBAAiBA,CAACtB,KAAK,EAAEuB,MAAM,EAAEC,OAAO,EAAE;MACxC,QAAQD,MAAM,CAAChC,IAAI;QACjB,KAAK,aAAa;UAChB,OAAOD,UAAU,CAACU,KAAK,CAAC;QAE1B,KAAK,cAAc;UACjB,OAAOR,WAAW,CAACQ,KAAK,CAAC;QAE3B,KAAK,eAAe;UAClB,IAAID,iBAAiB,CAACC,KAAK,CAAC,EAAE;YAC5B,OAAOO,uBAAuB,CAACP,KAAK,CAAC;UACvC;UAEA,OAAOK,kBAAkB,CAACL,KAAK,CAAC;QAElC,KAAK,SAAS;QACd,KAAK,UAAU;QACf,KAAK,qBAAqB;UAAE;YAC1B,MAAMqB,MAAM,GAAGvB,MAAM,CAACwB,iBAAiB,CAACtB,KAAK,EAAEuB,MAAM,EAAEC,OAAO,CAAC;YAE/D,IAAIH,MAAM,IAAI,IAAI,IAAIA,MAAM,CAACI,KAAK,KAAKzB,KAAK,CAACyB,KAAK,EAAE;cAClD,OAAOjC,WAAW,CAAC6B,MAA8C,CAAC;YACpE;YAEA,OAAOA,MAAM;UACf;QAEA,KAAK,SAAS;UACZ,IAAItB,iBAAiB,CAACC,KAAK,CAAC,EAAE;YAC5B,OAAOO,uBAAuB,CAACP,KAAK,CAAC;UACvC;UAEA,OAAOF,MAAM,CAACwB,iBAAiB,CAACtB,KAAK,EAAEuB,MAAM,EAAEC,OAAO,CAAC;QAEzD;UACE,OAAO1B,MAAM,CAACwB,iBAAiB,CAACtB,KAAK,EAAEuB,MAAM,EAAEC,OAAO,CAAC;MAC3D;IACF,CAAC;IAEDE,cAAc,EAAErC;EAClB,CAAC;AACH"}
|
|
@@ -72,7 +72,7 @@ export function StackRouter(options) {
|
|
|
72
72
|
routeNames,
|
|
73
73
|
routeParamList
|
|
74
74
|
} = _ref2;
|
|
75
|
-
|
|
75
|
+
const state = partialState;
|
|
76
76
|
if (state.stale === false) {
|
|
77
77
|
return state;
|
|
78
78
|
}
|
|
@@ -171,14 +171,14 @@ export function StackRouter(options) {
|
|
|
171
171
|
return null;
|
|
172
172
|
}
|
|
173
173
|
const getId = options.routeGetIdList[action.payload.name];
|
|
174
|
-
const id = getId
|
|
174
|
+
const id = getId?.({
|
|
175
175
|
params: action.payload.params
|
|
176
176
|
});
|
|
177
177
|
let route;
|
|
178
178
|
if (id !== undefined) {
|
|
179
|
-
route = state.routes.find(route => route.name === action.payload.name && id ===
|
|
179
|
+
route = state.routes.find(route => route.name === action.payload.name && id === getId?.({
|
|
180
180
|
params: route.params
|
|
181
|
-
}))
|
|
181
|
+
}));
|
|
182
182
|
} else {
|
|
183
183
|
const currentRoute = state.routes[state.index];
|
|
184
184
|
|
|
@@ -232,13 +232,13 @@ export function StackRouter(options) {
|
|
|
232
232
|
// If the route already exists, navigate to that
|
|
233
233
|
let index = -1;
|
|
234
234
|
const getId = options.routeGetIdList[action.payload.name];
|
|
235
|
-
const id = getId
|
|
235
|
+
const id = getId?.({
|
|
236
236
|
params: action.payload.params
|
|
237
237
|
});
|
|
238
238
|
if (id) {
|
|
239
|
-
index = state.routes.findIndex(route => route.name === action.payload.name && id ===
|
|
239
|
+
index = state.routes.findIndex(route => route.name === action.payload.name && id === getId?.({
|
|
240
240
|
params: route.params
|
|
241
|
-
}))
|
|
241
|
+
}));
|
|
242
242
|
} else if (state.routes[state.index].name === action.payload.name) {
|
|
243
243
|
index = state.index;
|
|
244
244
|
} else {
|
|
@@ -317,13 +317,13 @@ export function StackRouter(options) {
|
|
|
317
317
|
// If the route already exists, navigate to that
|
|
318
318
|
let index = -1;
|
|
319
319
|
const getId = options.routeGetIdList[action.payload.name];
|
|
320
|
-
const id = getId
|
|
320
|
+
const id = getId?.({
|
|
321
321
|
params: action.payload.params
|
|
322
322
|
});
|
|
323
323
|
if (id) {
|
|
324
|
-
index = state.routes.findIndex(route => route.name === action.payload.name && id ===
|
|
324
|
+
index = state.routes.findIndex(route => route.name === action.payload.name && id === getId?.({
|
|
325
325
|
params: route.params
|
|
326
|
-
}))
|
|
326
|
+
}));
|
|
327
327
|
} else if (state.routes[state.index].name === action.payload.name) {
|
|
328
328
|
index = state.index;
|
|
329
329
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","BaseRouter","StackActions","replace","name","params","type","payload","push","pop","count","popToTop","popTo","merge","StackRouter","options","router","getInitialState","routeNames","routeParamList","initialRouteName","undefined","includes","stale","key","index","routes","getRehydratedState","partialState","state","filter","route","map","length","getStateForRouteNamesChange","routeKeyChanges","Math","min","getStateForRouteFocus","findIndex","r","slice","getStateForAction","action","target","source","i","getId","routeGetIdList","id","find","currentRoute","routeKey","path","max","concat","actionCreators"],"sourceRoot":"../../src","sources":["StackRouter.tsx"],"mappings":"AAAA,SAASA,MAAM,QAAQ,mBAAmB;AAE1C,SAASC,UAAU,QAAQ,cAAc;AAmHzC,OAAO,MAAMC,YAAY,GAAG;EAC1BC,OAAO,CAACC,IAAY,EAAEC,MAAe,EAAmB;IACtD,OAAO;MAAEC,IAAI,EAAE,SAAS;MAAEC,OAAO,EAAE;QAAEH,IAAI;QAAEC;MAAO;IAAE,CAAC;EACvD,CAAC;EACDG,IAAI,CAACJ,IAAY,EAAEC,MAAe,EAAmB;IACnD,OAAO;MAAEC,IAAI,EAAE,MAAM;MAAEC,OAAO,EAAE;QAAEH,IAAI;QAAEC;MAAO;IAAE,CAAC;EACpD,CAAC;EACDI,GAAG,GAAqC;IAAA,IAApCC,KAAa,uEAAG,CAAC;IACnB,OAAO;MAAEJ,IAAI,EAAE,KAAK;MAAEC,OAAO,EAAE;QAAEG;MAAM;IAAE,CAAC;EAC5C,CAAC;EACDC,QAAQ,GAAoB;IAC1B,OAAO;MAAEL,IAAI,EAAE;IAAa,CAAC;EAC/B,CAAC;EACDM,KAAK,CAACR,IAAY,EAAEC,MAAe,EAAEQ,KAAe,EAAmB;IACrE,OAAO;MAAEP,IAAI,EAAE,QAAQ;MAAEC,OAAO,EAAE;QAAEH,IAAI;QAAEC,MAAM;QAAEQ;MAAM;IAAE,CAAC;EAC7D;AACF,CAAC;AAED,OAAO,SAASC,WAAW,CAACC,OAA2B,EAAE;EACvD,MAAMC,MAGL,GAAG;IACF,GAAGf,UAAU;IAEbK,IAAI,EAAE,OAAO;IAEbW,eAAe,OAAiC;MAAA,IAAhC;QAAEC,UAAU;QAAEC;MAAe,CAAC;MAC5C,MAAMC,gBAAgB,GACpBL,OAAO,CAACK,gBAAgB,KAAKC,SAAS,IACtCH,UAAU,CAACI,QAAQ,CAACP,OAAO,CAACK,gBAAgB,CAAC,GACzCL,OAAO,CAACK,gBAAgB,GACxBF,UAAU,CAAC,CAAC,CAAC;MAEnB,OAAO;QACLK,KAAK,EAAE,KAAK;QACZjB,IAAI,EAAE,OAAO;QACbkB,GAAG,EAAG,SAAQxB,MAAM,EAAG,EAAC;QACxByB,KAAK,EAAE,CAAC;QACRP,UAAU;QACVQ,MAAM,EAAE,CACN;UACEF,GAAG,EAAG,GAAEJ,gBAAiB,IAAGpB,MAAM,EAAG,EAAC;UACtCI,IAAI,EAAEgB,gBAAgB;UACtBf,MAAM,EAAEc,cAAc,CAACC,gBAAgB;QACzC,CAAC;MAEL,CAAC;IACH,CAAC;IAEDO,kBAAkB,CAACC,YAAY,SAAkC;MAAA,IAAhC;QAAEV,UAAU;QAAEC;MAAe,CAAC;MAC7D,IAAIU,KAAK,GAAGD,YAAY;MAExB,IAAIC,KAAK,CAACN,KAAK,KAAK,KAAK,EAAE;QACzB,OAAOM,KAAK;MACd;MAEA,MAAMH,MAAM,GAAGG,KAAK,CAACH,MAAM,CACxBI,MAAM,CAAEC,KAAK,IAAKb,UAAU,CAACI,QAAQ,CAACS,KAAK,CAAC3B,IAAI,CAAC,CAAC,CAClD4B,GAAG,CACDD,KAAK,KACH;QACC,GAAGA,KAAK;QACRP,GAAG,EAAEO,KAAK,CAACP,GAAG,IAAK,GAAEO,KAAK,CAAC3B,IAAK,IAAGJ,MAAM,EAAG,EAAC;QAC7CK,MAAM,EACJc,cAAc,CAACY,KAAK,CAAC3B,IAAI,CAAC,KAAKiB,SAAS,GACpC;UACE,GAAGF,cAAc,CAACY,KAAK,CAAC3B,IAAI,CAAC;UAC7B,GAAG2B,KAAK,CAAC1B;QACX,CAAC,GACD0B,KAAK,CAAC1B;MACd,CAAC,CAAkB,CACtB;MAEH,IAAIqB,MAAM,CAACO,MAAM,KAAK,CAAC,EAAE;QACvB,MAAMb,gBAAgB,GACpBL,OAAO,CAACK,gBAAgB,KAAKC,SAAS,GAClCN,OAAO,CAACK,gBAAgB,GACxBF,UAAU,CAAC,CAAC,CAAC;QAEnBQ,MAAM,CAAClB,IAAI,CAAC;UACVgB,GAAG,EAAG,GAAEJ,gBAAiB,IAAGpB,MAAM,EAAG,EAAC;UACtCI,IAAI,EAAEgB,gBAAgB;UACtBf,MAAM,EAAEc,cAAc,CAACC,gBAAgB;QACzC,CAAC,CAAC;MACJ;MAEA,OAAO;QACLG,KAAK,EAAE,KAAK;QACZjB,IAAI,EAAE,OAAO;QACbkB,GAAG,EAAG,SAAQxB,MAAM,EAAG,EAAC;QACxByB,KAAK,EAAEC,MAAM,CAACO,MAAM,GAAG,CAAC;QACxBf,UAAU;QACVQ;MACF,CAAC;IACH,CAAC;IAEDQ,2BAA2B,CACzBL,KAAK,SAEL;MAAA,IADA;QAAEX,UAAU;QAAEC,cAAc;QAAEgB;MAAgB,CAAC;MAE/C,MAAMT,MAAM,GAAGG,KAAK,CAACH,MAAM,CAACI,MAAM,CAC/BC,KAAK,IACJb,UAAU,CAACI,QAAQ,CAACS,KAAK,CAAC3B,IAAI,CAAC,IAC/B,CAAC+B,eAAe,CAACb,QAAQ,CAACS,KAAK,CAAC3B,IAAI,CAAC,CACxC;MAED,IAAIsB,MAAM,CAACO,MAAM,KAAK,CAAC,EAAE;QACvB,MAAMb,gBAAgB,GACpBL,OAAO,CAACK,gBAAgB,KAAKC,SAAS,IACtCH,UAAU,CAACI,QAAQ,CAACP,OAAO,CAACK,gBAAgB,CAAC,GACzCL,OAAO,CAACK,gBAAgB,GACxBF,UAAU,CAAC,CAAC,CAAC;QAEnBQ,MAAM,CAAClB,IAAI,CAAC;UACVgB,GAAG,EAAG,GAAEJ,gBAAiB,IAAGpB,MAAM,EAAG,EAAC;UACtCI,IAAI,EAAEgB,gBAAgB;UACtBf,MAAM,EAAEc,cAAc,CAACC,gBAAgB;QACzC,CAAC,CAAC;MACJ;MAEA,OAAO;QACL,GAAGS,KAAK;QACRX,UAAU;QACVQ,MAAM;QACND,KAAK,EAAEW,IAAI,CAACC,GAAG,CAACR,KAAK,CAACJ,KAAK,EAAEC,MAAM,CAACO,MAAM,GAAG,CAAC;MAChD,CAAC;IACH,CAAC;IAEDK,qBAAqB,CAACT,KAAK,EAAEL,GAAG,EAAE;MAChC,MAAMC,KAAK,GAAGI,KAAK,CAACH,MAAM,CAACa,SAAS,CAAEC,CAAC,IAAKA,CAAC,CAAChB,GAAG,KAAKA,GAAG,CAAC;MAE1D,IAAIC,KAAK,KAAK,CAAC,CAAC,IAAIA,KAAK,KAAKI,KAAK,CAACJ,KAAK,EAAE;QACzC,OAAOI,KAAK;MACd;MAEA,OAAO;QACL,GAAGA,KAAK;QACRJ,KAAK;QACLC,MAAM,EAAEG,KAAK,CAACH,MAAM,CAACe,KAAK,CAAC,CAAC,EAAEhB,KAAK,GAAG,CAAC;MACzC,CAAC;IACH,CAAC;IAEDiB,iBAAiB,CAACb,KAAK,EAAEc,MAAM,EAAE5B,OAAO,EAAE;MACxC,MAAM;QAAEI;MAAe,CAAC,GAAGJ,OAAO;MAElC,QAAQ4B,MAAM,CAACrC,IAAI;QACjB,KAAK,SAAS;UAAE;YACd,MAAMmB,KAAK,GACTkB,MAAM,CAACC,MAAM,KAAKf,KAAK,CAACL,GAAG,IAAImB,MAAM,CAACE,MAAM,GACxChB,KAAK,CAACH,MAAM,CAACa,SAAS,CAAEC,CAAC,IAAKA,CAAC,CAAChB,GAAG,KAAKmB,MAAM,CAACE,MAAM,CAAC,GACtDhB,KAAK,CAACJ,KAAK;YAEjB,IAAIA,KAAK,KAAK,CAAC,CAAC,EAAE;cAChB,OAAO,IAAI;YACb;YAEA,MAAM;cAAErB,IAAI;cAAEC;YAAO,CAAC,GAAGsC,MAAM,CAACpC,OAAO;YAEvC,IAAI,CAACsB,KAAK,CAACX,UAAU,CAACI,QAAQ,CAAClB,IAAI,CAAC,EAAE;cACpC,OAAO,IAAI;YACb;YAEA,OAAO;cACL,GAAGyB,KAAK;cACRH,MAAM,EAAEG,KAAK,CAACH,MAAM,CAACM,GAAG,CAAC,CAACD,KAAK,EAAEe,CAAC,KAChCA,CAAC,KAAKrB,KAAK,GACP;gBACED,GAAG,EAAG,GAAEpB,IAAK,IAAGJ,MAAM,EAAG,EAAC;gBAC1BI,IAAI;gBACJC,MAAM,EACJc,cAAc,CAACf,IAAI,CAAC,KAAKiB,SAAS,GAC9B;kBACE,GAAGF,cAAc,CAACf,IAAI,CAAC;kBACvB,GAAGC;gBACL,CAAC,GACDA;cACR,CAAC,GACD0B,KAAK;YAEb,CAAC;UACH;QAEA,KAAK,MAAM;QACX,KAAK,UAAU;UAAE;YACf,IAAI,CAACF,KAAK,CAACX,UAAU,CAACI,QAAQ,CAACqB,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC,EAAE;cACnD,OAAO,IAAI;YACb;YAEA,MAAM2C,KAAK,GAAGhC,OAAO,CAACiC,cAAc,CAACL,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC;YACzD,MAAM6C,EAAE,GAAGF,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAG;cAAE1C,MAAM,EAAEsC,MAAM,CAACpC,OAAO,CAACF;YAAO,CAAC,CAAC;YAErD,IAAI0B,KAAgC;YAEpC,IAAIkB,EAAE,KAAK5B,SAAS,EAAE;cACpBU,KAAK,GAAGF,KAAK,CAACH,MAAM,CAACwB,IAAI,CACtBnB,KAAK,IACJA,KAAK,CAAC3B,IAAI,KAAKuC,MAAM,CAACpC,OAAO,CAACH,IAAI,IAClC6C,EAAE,MAAKF,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAG;gBAAE1C,MAAM,EAAE0B,KAAK,CAAC1B;cAAO,CAAC,CAAC,EAC3C;YACH,CAAC,MAAM;cACL,MAAM8C,YAAY,GAAGtB,KAAK,CAACH,MAAM,CAACG,KAAK,CAACJ,KAAK,CAAC;;cAE9C;cACA,IACEkB,MAAM,CAACrC,IAAI,KAAK,UAAU,IAC1BqC,MAAM,CAACpC,OAAO,CAACH,IAAI,KAAK+C,YAAY,CAAC/C,IAAI,EACzC;gBACA2B,KAAK,GAAGoB,YAAY;cACtB;YACF;YAEA,IAAI9C,MAAM;YAEV,IAAIsC,MAAM,CAACrC,IAAI,KAAK,UAAU,IAAIqC,MAAM,CAACpC,OAAO,CAACM,KAAK,IAAIkB,KAAK,EAAE;cAC/D1B,MAAM,GACJsC,MAAM,CAACpC,OAAO,CAACF,MAAM,KAAKgB,SAAS,IACnCF,cAAc,CAACwB,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC,KAAKiB,SAAS,GAC7C;gBACE,GAAGF,cAAc,CAACwB,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC;gBACtC,GAAG2B,KAAK,CAAC1B,MAAM;gBACf,GAAGsC,MAAM,CAACpC,OAAO,CAACF;cACpB,CAAC,GACD0B,KAAK,CAAC1B,MAAM;YACpB,CAAC,MAAM;cACLA,MAAM,GACJc,cAAc,CAACwB,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC,KAAKiB,SAAS,GAC7C;gBACE,GAAGF,cAAc,CAACwB,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC;gBACtC,GAAGuC,MAAM,CAACpC,OAAO,CAACF;cACpB,CAAC,GACDsC,MAAM,CAACpC,OAAO,CAACF,MAAM;YAC7B;YAEA,IAAIqB,MAAuB;YAE3B,IAAIK,KAAK,EAAE;cACT,MAAMqB,QAAQ,GAAGrB,KAAK,CAACP,GAAG;cAE1BE,MAAM,GAAGG,KAAK,CAACH,MAAM,CAACI,MAAM,CAAEU,CAAC,IAAKA,CAAC,CAAChB,GAAG,KAAK4B,QAAQ,CAAC;cACvD1B,MAAM,CAAClB,IAAI,CAAC;gBACV,GAAGuB,KAAK;gBACRsB,IAAI,EACFV,MAAM,CAACrC,IAAI,KAAK,UAAU,IAAIqC,MAAM,CAACpC,OAAO,CAAC8C,IAAI,KAAKhC,SAAS,GAC3DsB,MAAM,CAACpC,OAAO,CAAC8C,IAAI,GACnBtB,KAAK,CAACsB,IAAI;gBAChBhD;cACF,CAAC,CAAC;YACJ,CAAC,MAAM;cACLqB,MAAM,GAAG,CACP,GAAGG,KAAK,CAACH,MAAM,EACf;gBACEF,GAAG,EAAG,GAAEmB,MAAM,CAACpC,OAAO,CAACH,IAAK,IAAGJ,MAAM,EAAG,EAAC;gBACzCI,IAAI,EAAEuC,MAAM,CAACpC,OAAO,CAACH,IAAI;gBACzBiD,IAAI,EACFV,MAAM,CAACrC,IAAI,KAAK,UAAU,GAAGqC,MAAM,CAACpC,OAAO,CAAC8C,IAAI,GAAGhC,SAAS;gBAC9DhB;cACF,CAAC,CACF;YACH;YAEA,OAAO;cACL,GAAGwB,KAAK;cACRJ,KAAK,EAAEC,MAAM,CAACO,MAAM,GAAG,CAAC;cACxBP;YACF,CAAC;UACH;QAEA,KAAK,qBAAqB;UAAE;YAC1B,IAAI,CAACG,KAAK,CAACX,UAAU,CAACI,QAAQ,CAACqB,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC,EAAE;cACnD,OAAO,IAAI;YACb;;YAEA;YACA,IAAIqB,KAAK,GAAG,CAAC,CAAC;YAEd,MAAMsB,KAAK,GAAGhC,OAAO,CAACiC,cAAc,CAACL,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC;YACzD,MAAM6C,EAAE,GAAGF,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAG;cAAE1C,MAAM,EAAEsC,MAAM,CAACpC,OAAO,CAACF;YAAO,CAAC,CAAC;YAErD,IAAI4C,EAAE,EAAE;cACNxB,KAAK,GAAGI,KAAK,CAACH,MAAM,CAACa,SAAS,CAC3BR,KAAK,IACJA,KAAK,CAAC3B,IAAI,KAAKuC,MAAM,CAACpC,OAAO,CAACH,IAAI,IAClC6C,EAAE,MAAKF,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAG;gBAAE1C,MAAM,EAAE0B,KAAK,CAAC1B;cAAO,CAAC,CAAC,EAC3C;YACH,CAAC,MAAM,IAAIwB,KAAK,CAACH,MAAM,CAACG,KAAK,CAACJ,KAAK,CAAC,CAACrB,IAAI,KAAKuC,MAAM,CAACpC,OAAO,CAACH,IAAI,EAAE;cACjEqB,KAAK,GAAGI,KAAK,CAACJ,KAAK;YACrB,CAAC,MAAM;cACL,KAAK,IAAIqB,CAAC,GAAGjB,KAAK,CAACH,MAAM,CAACO,MAAM,GAAG,CAAC,EAAEa,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;gBACjD,IAAIjB,KAAK,CAACH,MAAM,CAACoB,CAAC,CAAC,CAAC1C,IAAI,KAAKuC,MAAM,CAACpC,OAAO,CAACH,IAAI,EAAE;kBAChDqB,KAAK,GAAGqB,CAAC;kBACT;gBACF;cACF;YACF;YAEA,IAAIrB,KAAK,KAAK,CAAC,CAAC,EAAE;cAChB,MAAMC,MAAM,GAAG,CACb,GAAGG,KAAK,CAACH,MAAM,EACf;gBACEF,GAAG,EAAG,GAAEmB,MAAM,CAACpC,OAAO,CAACH,IAAK,IAAGJ,MAAM,EAAG,EAAC;gBACzCI,IAAI,EAAEuC,MAAM,CAACpC,OAAO,CAACH,IAAI;gBACzBC,MAAM,EACJc,cAAc,CAACwB,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC,KAAKiB,SAAS,GAC7C;kBACE,GAAGF,cAAc,CAACwB,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC;kBACtC,GAAGuC,MAAM,CAACpC,OAAO,CAACF;gBACpB,CAAC,GACDsC,MAAM,CAACpC,OAAO,CAACF;cACvB,CAAC,CACF;cAED,OAAO;gBACL,GAAGwB,KAAK;gBACRH,MAAM;gBACND,KAAK,EAAEC,MAAM,CAACO,MAAM,GAAG;cACzB,CAAC;YACH;YAEA,MAAMF,KAAK,GAAGF,KAAK,CAACH,MAAM,CAACD,KAAK,CAAC;YAEjC,IAAIpB,MAAM;YAEV,IAAIsC,MAAM,CAACpC,OAAO,CAACM,KAAK,EAAE;cACxBR,MAAM,GACJsC,MAAM,CAACpC,OAAO,CAACF,MAAM,KAAKgB,SAAS,IACnCF,cAAc,CAACY,KAAK,CAAC3B,IAAI,CAAC,KAAKiB,SAAS,GACpC;gBACE,GAAGF,cAAc,CAACY,KAAK,CAAC3B,IAAI,CAAC;gBAC7B,GAAG2B,KAAK,CAAC1B,MAAM;gBACf,GAAGsC,MAAM,CAACpC,OAAO,CAACF;cACpB,CAAC,GACD0B,KAAK,CAAC1B,MAAM;YACpB,CAAC,MAAM;cACLA,MAAM,GACJc,cAAc,CAACY,KAAK,CAAC3B,IAAI,CAAC,KAAKiB,SAAS,GACpC;gBACE,GAAGF,cAAc,CAACY,KAAK,CAAC3B,IAAI,CAAC;gBAC7B,GAAGuC,MAAM,CAACpC,OAAO,CAACF;cACpB,CAAC,GACDsC,MAAM,CAACpC,OAAO,CAACF,MAAM;YAC7B;YAEA,OAAO;cACL,GAAGwB,KAAK;cACRJ,KAAK;cACLC,MAAM,EAAE,CACN,GAAGG,KAAK,CAACH,MAAM,CAACe,KAAK,CAAC,CAAC,EAAEhB,KAAK,CAAC,EAC/BpB,MAAM,KAAK0B,KAAK,CAAC1B,MAAM,GACnB;gBAAE,GAAG0B,KAAK;gBAAE1B;cAAO,CAAC,GACpBwB,KAAK,CAACH,MAAM,CAACD,KAAK,CAAC;YAE3B,CAAC;UACH;QAEA,KAAK,KAAK;UAAE;YACV,MAAMA,KAAK,GACTkB,MAAM,CAACC,MAAM,KAAKf,KAAK,CAACL,GAAG,IAAImB,MAAM,CAACE,MAAM,GACxChB,KAAK,CAACH,MAAM,CAACa,SAAS,CAAEC,CAAC,IAAKA,CAAC,CAAChB,GAAG,KAAKmB,MAAM,CAACE,MAAM,CAAC,GACtDhB,KAAK,CAACJ,KAAK;YAEjB,IAAIA,KAAK,GAAG,CAAC,EAAE;cACb,MAAMf,KAAK,GAAG0B,IAAI,CAACkB,GAAG,CAAC7B,KAAK,GAAGkB,MAAM,CAACpC,OAAO,CAACG,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC;cAC3D,MAAMgB,MAAM,GAAGG,KAAK,CAACH,MAAM,CACxBe,KAAK,CAAC,CAAC,EAAE/B,KAAK,CAAC,CACf6C,MAAM,CAAC1B,KAAK,CAACH,MAAM,CAACe,KAAK,CAAChB,KAAK,GAAG,CAAC,CAAC,CAAC;cAExC,OAAO;gBACL,GAAGI,KAAK;gBACRJ,KAAK,EAAEC,MAAM,CAACO,MAAM,GAAG,CAAC;gBACxBP;cACF,CAAC;YACH;YAEA,OAAO,IAAI;UACb;QAEA,KAAK,YAAY;UACf,OAAOV,MAAM,CAAC0B,iBAAiB,CAC7Bb,KAAK,EACL;YACEvB,IAAI,EAAE,KAAK;YACXC,OAAO,EAAE;cAAEG,KAAK,EAAEmB,KAAK,CAACH,MAAM,CAACO,MAAM,GAAG;YAAE;UAC5C,CAAC,EACDlB,OAAO,CACR;QAEH,KAAK,QAAQ;UAAE;YACb,IAAI,CAACc,KAAK,CAACX,UAAU,CAACI,QAAQ,CAACqB,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC,EAAE;cACnD,OAAO,IAAI;YACb;;YAEA;YACA,IAAIqB,KAAK,GAAG,CAAC,CAAC;YAEd,MAAMsB,KAAK,GAAGhC,OAAO,CAACiC,cAAc,CAACL,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC;YACzD,MAAM6C,EAAE,GAAGF,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAG;cAAE1C,MAAM,EAAEsC,MAAM,CAACpC,OAAO,CAACF;YAAO,CAAC,CAAC;YAErD,IAAI4C,EAAE,EAAE;cACNxB,KAAK,GAAGI,KAAK,CAACH,MAAM,CAACa,SAAS,CAC3BR,KAAK,IACJA,KAAK,CAAC3B,IAAI,KAAKuC,MAAM,CAACpC,OAAO,CAACH,IAAI,IAClC6C,EAAE,MAAKF,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAG;gBAAE1C,MAAM,EAAE0B,KAAK,CAAC1B;cAAO,CAAC,CAAC,EAC3C;YACH,CAAC,MAAM,IAAIwB,KAAK,CAACH,MAAM,CAACG,KAAK,CAACJ,KAAK,CAAC,CAACrB,IAAI,KAAKuC,MAAM,CAACpC,OAAO,CAACH,IAAI,EAAE;cACjEqB,KAAK,GAAGI,KAAK,CAACJ,KAAK;YACrB,CAAC,MAAM;cACL,KAAK,IAAIqB,CAAC,GAAGjB,KAAK,CAACH,MAAM,CAACO,MAAM,GAAG,CAAC,EAAEa,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;gBACjD,IAAIjB,KAAK,CAACH,MAAM,CAACoB,CAAC,CAAC,CAAC1C,IAAI,KAAKuC,MAAM,CAACpC,OAAO,CAACH,IAAI,EAAE;kBAChDqB,KAAK,GAAGqB,CAAC;kBACT;gBACF;cACF;YACF;;YAEA;YACA,IAAIrB,KAAK,KAAK,CAAC,CAAC,EAAE;cAChB,MAAMC,MAAM,GAAG,CACb,GAAGG,KAAK,CAACH,MAAM,CAACe,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAC5B;gBACEjB,GAAG,EAAG,GAAEmB,MAAM,CAACpC,OAAO,CAACH,IAAK,IAAGJ,MAAM,EAAG,EAAC;gBACzCI,IAAI,EAAEuC,MAAM,CAACpC,OAAO,CAACH,IAAI;gBACzBC,MAAM,EACJc,cAAc,CAACwB,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC,KAAKiB,SAAS,GAC7C;kBACE,GAAGF,cAAc,CAACwB,MAAM,CAACpC,OAAO,CAACH,IAAI,CAAC;kBACtC,GAAGuC,MAAM,CAACpC,OAAO,CAACF;gBACpB,CAAC,GACDsC,MAAM,CAACpC,OAAO,CAACF;cACvB,CAAC,CACF;cAED,OAAO;gBACL,GAAGwB,KAAK;gBACRH,MAAM;gBACND,KAAK,EAAEC,MAAM,CAACO,MAAM,GAAG;cACzB,CAAC;YACH;YAEA,MAAMF,KAAK,GAAGF,KAAK,CAACH,MAAM,CAACD,KAAK,CAAC;YAEjC,IAAIpB,MAAM;YAEV,IAAIsC,MAAM,CAACpC,OAAO,CAACM,KAAK,EAAE;cACxBR,MAAM,GACJsC,MAAM,CAACpC,OAAO,CAACF,MAAM,KAAKgB,SAAS,IACnCF,cAAc,CAACY,KAAK,CAAC3B,IAAI,CAAC,KAAKiB,SAAS,GACpC;gBACE,GAAGF,cAAc,CAACY,KAAK,CAAC3B,IAAI,CAAC;gBAC7B,GAAG2B,KAAK,CAAC1B,MAAM;gBACf,GAAGsC,MAAM,CAACpC,OAAO,CAACF;cACpB,CAAC,GACD0B,KAAK,CAAC1B,MAAM;YACpB,CAAC,MAAM;cACLA,MAAM,GACJc,cAAc,CAACY,KAAK,CAAC3B,IAAI,CAAC,KAAKiB,SAAS,GACpC;gBACE,GAAGF,cAAc,CAACY,KAAK,CAAC3B,IAAI,CAAC;gBAC7B,GAAGuC,MAAM,CAACpC,OAAO,CAACF;cACpB,CAAC,GACDsC,MAAM,CAACpC,OAAO,CAACF,MAAM;YAC7B;YAEA,OAAO;cACL,GAAGwB,KAAK;cACRJ,KAAK;cACLC,MAAM,EAAE,CACN,GAAGG,KAAK,CAACH,MAAM,CAACe,KAAK,CAAC,CAAC,EAAEhB,KAAK,CAAC,EAC/BpB,MAAM,KAAK0B,KAAK,CAAC1B,MAAM,GACnB;gBAAE,GAAG0B,KAAK;gBAAE1B;cAAO,CAAC,GACpBwB,KAAK,CAACH,MAAM,CAACD,KAAK,CAAC;YAE3B,CAAC;UACH;QAEA,KAAK,SAAS;UACZ,IAAII,KAAK,CAACJ,KAAK,GAAG,CAAC,EAAE;YACnB,OAAOT,MAAM,CAAC0B,iBAAiB,CAC7Bb,KAAK,EACL;cACEvB,IAAI,EAAE,KAAK;cACXC,OAAO,EAAE;gBAAEG,KAAK,EAAE;cAAE,CAAC;cACrBkC,MAAM,EAAED,MAAM,CAACC,MAAM;cACrBC,MAAM,EAAEF,MAAM,CAACE;YACjB,CAAC,EACD9B,OAAO,CACR;UACH;UAEA,OAAO,IAAI;QAEb;UACE,OAAOd,UAAU,CAACyC,iBAAiB,CAACb,KAAK,EAAEc,MAAM,CAAC;MAAC;IAEzD,CAAC;IAEDa,cAAc,EAAEtD;EAClB,CAAC;EAED,OAAOc,MAAM;AACf"}
|
|
1
|
+
{"version":3,"names":["nanoid","BaseRouter","StackActions","replace","name","params","type","payload","push","pop","count","arguments","length","undefined","popToTop","popTo","merge","StackRouter","options","router","getInitialState","_ref","routeNames","routeParamList","initialRouteName","includes","stale","key","index","routes","getRehydratedState","partialState","_ref2","state","filter","route","map","getStateForRouteNamesChange","_ref3","routeKeyChanges","Math","min","getStateForRouteFocus","findIndex","r","slice","getStateForAction","action","target","source","i","getId","routeGetIdList","id","find","currentRoute","routeKey","path","max","concat","actionCreators"],"sourceRoot":"../../src","sources":["StackRouter.tsx"],"mappings":"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"}
|
package/lib/module/TabRouter.js
CHANGED
|
@@ -99,12 +99,11 @@ export function TabRouter(_ref) {
|
|
|
99
99
|
};
|
|
100
100
|
},
|
|
101
101
|
getRehydratedState(partialState, _ref3) {
|
|
102
|
-
var _state$routes, _state$history;
|
|
103
102
|
let {
|
|
104
103
|
routeNames,
|
|
105
104
|
routeParamList
|
|
106
105
|
} = _ref3;
|
|
107
|
-
|
|
106
|
+
const state = partialState;
|
|
108
107
|
if (state.stale === false) {
|
|
109
108
|
return state;
|
|
110
109
|
}
|
|
@@ -120,8 +119,8 @@ export function TabRouter(_ref) {
|
|
|
120
119
|
} : route ? route.params : undefined
|
|
121
120
|
};
|
|
122
121
|
});
|
|
123
|
-
const index = Math.min(Math.max(routeNames.indexOf(
|
|
124
|
-
const history =
|
|
122
|
+
const index = Math.min(Math.max(routeNames.indexOf(state.routes[state?.index ?? 0]?.name), 0), routes.length - 1);
|
|
123
|
+
const history = state.history?.filter(it => routes.find(r => r.key === it.key)) ?? [];
|
|
125
124
|
return changeIndex({
|
|
126
125
|
stale: false,
|
|
127
126
|
type: 'tab',
|
|
@@ -186,10 +185,10 @@ export function TabRouter(_ref) {
|
|
|
186
185
|
return route;
|
|
187
186
|
}
|
|
188
187
|
const getId = routeGetIdList[route.name];
|
|
189
|
-
const currentId = getId
|
|
188
|
+
const currentId = getId?.({
|
|
190
189
|
params: route.params
|
|
191
190
|
});
|
|
192
|
-
const nextId = getId
|
|
191
|
+
const nextId = getId?.({
|
|
193
192
|
params: action.payload.params
|
|
194
193
|
});
|
|
195
194
|
const key = currentId === nextId ? route.key : `${route.name}-${nanoid()}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","BaseRouter","TYPE_ROUTE","TabActions","jumpTo","name","params","type","payload","getRouteHistory","routes","index","backBehavior","initialRouteName","history","key","initialRouteIndex","i","unshift","findIndex","route","changeIndex","state","currentKey","filter","it","concat","TabRouter","router","getInitialState","routeNames","routeParamList","undefined","includes","indexOf","map","stale","getRehydratedState","partialState","find","r","Math","min","max","length","getStateForRouteNamesChange","routeKeyChanges","getStateForRouteFocus","getStateForAction","action","routeGetIdList","getId","currentId","nextId","merge","path","previousKey","slice","actionCreators"],"sourceRoot":"../../src","sources":["TabRouter.tsx"],"mappings":"AAAA,SAASA,MAAM,QAAQ,mBAAmB;AAE1C,SAASC,UAAU,QAAQ,cAAc;AAyDzC,MAAMC,UAAU,GAAG,OAAgB;AAEnC,OAAO,MAAMC,UAAU,GAAG;EACxBC,
|
|
1
|
+
{"version":3,"names":["nanoid","BaseRouter","TYPE_ROUTE","TabActions","jumpTo","name","params","type","payload","getRouteHistory","routes","index","backBehavior","initialRouteName","history","key","initialRouteIndex","i","unshift","findIndex","route","changeIndex","state","currentKey","filter","it","concat","TabRouter","_ref","router","getInitialState","_ref2","routeNames","routeParamList","undefined","includes","indexOf","map","stale","getRehydratedState","partialState","_ref3","find","r","Math","min","max","length","getStateForRouteNamesChange","_ref4","routeKeyChanges","getStateForRouteFocus","getStateForAction","action","_ref5","routeGetIdList","getId","currentId","nextId","merge","path","previousKey","slice","actionCreators"],"sourceRoot":"../../src","sources":["TabRouter.tsx"],"mappings":"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"}
|
package/lib/module/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["CommonActions","BaseRouter","DrawerActions","DrawerRouter","StackActions","StackRouter","TabActions","TabRouter"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA,OAAO,KAAKA,aAAa,MAAM,iBAAiB;AAEhD,SAASA,aAAa;AAEtB,SAASC,UAAU,QAAQ,cAAc;AAQzC,SAASC,aAAa,EAAEC,YAAY,QAAQ,gBAAgB;AAO5D,SAASC,YAAY,EAAEC,WAAW,QAAQ,eAAe;AAOzD,SAASC,UAAU,EAAEC,SAAS,QAAQ,aAAa;AACnD,cAAc,SAAS"}
|
|
1
|
+
{"version":3,"names":["CommonActions","BaseRouter","DrawerActions","DrawerRouter","StackActions","StackRouter","TabActions","TabRouter"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA,OAAO,KAAKA,aAAa,MAAM,iBAAiB;AAEhD,SAASA,aAAa;AAEtB,SAASC,UAAU,QAAQ,cAAc;AAQzC,SAASC,aAAa,EAAEC,YAAY,QAAQ,gBAAgB;AAO5D,SAASC,YAAY,EAAEC,WAAW,QAAQ,eAAe;AAOzD,SAASC,UAAU,EAAEC,SAAS,QAAQ,aAAa;AACnD,cAAc,SAAS"}
|
package/lib/module/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":[],"sourceRoot":"../../src","sources":["types.tsx"],"mappings":""}
|
|
1
|
+
{"version":3,"names":[],"sourceRoot":"../../src","sources":["types.tsx"],"mappings":""}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TabActionHelpers, TabActionType, TabNavigationState, TabRouterOptions } from './TabRouter';
|
|
1
|
+
import { type TabActionHelpers, type TabActionType, type TabNavigationState, type TabRouterOptions } from './TabRouter';
|
|
2
2
|
import type { CommonNavigationAction, ParamListBase, Router } from './types';
|
|
3
3
|
export type DrawerStatus = 'open' | 'closed';
|
|
4
4
|
export type DrawerActionType = TabActionType | {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DrawerRouter.d.ts","sourceRoot":"","sources":["../../../src/DrawerRouter.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,
|
|
1
|
+
{"version":3,"file":"DrawerRouter.d.ts","sourceRoot":"","sources":["../../../src/DrawerRouter.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,gBAAgB,EAErB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EAEvB,KAAK,gBAAgB,EACtB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EACV,sBAAsB,EACtB,aAAa,EAEb,MAAM,EACP,MAAM,SAAS,CAAC;AACjB,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE7C,MAAM,MAAM,gBAAgB,GACxB,aAAa,GACb;IACE,IAAI,EAAE,aAAa,GAAG,cAAc,GAAG,eAAe,CAAC;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEN,MAAM,MAAM,mBAAmB,GAAG,gBAAgB,GAAG;IACnD,aAAa,CAAC,EAAE,YAAY,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,CAAC,SAAS,SAAS,aAAa,IAAI,IAAI,CACvE,kBAAkB,CAAC,SAAS,CAAC,EAC7B,MAAM,GAAG,SAAS,CACnB,GAAG;IACF;;OAEG;IACH,IAAI,EAAE,QAAQ,CAAC;IACf;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,OAAO,EAAE,CACL;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAC9B;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE,CAC3C,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,mBAAmB,CAAC,SAAS,SAAS,aAAa,IAC7D,gBAAgB,CAAC,SAAS,CAAC,GAAG;IAC5B;;OAEG;IACH,UAAU,IAAI,IAAI,CAAC;IAEnB;;OAEG;IACH,WAAW,IAAI,IAAI,CAAC;IAEpB;;OAEG;IACH,YAAY,IAAI,IAAI,CAAC;CACtB,CAAC;AAEJ,eAAO,MAAM,aAAa;kBAEV,gBAAgB;mBAGf,gBAAgB;oBAGf,gBAAgB;;CAGjC,CAAC;AAEF,wBAAgB,YAAY,CAAC,EAC3B,aAAwB,EACxB,GAAG,IAAI,EACR,EAAE,mBAAmB,GAAG,MAAM,CAC7B,qBAAqB,CAAC,aAAa,CAAC,EACpC,gBAAgB,GAAG,sBAAsB,CAC1C,CAgKA"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-navigation/routers",
|
|
3
3
|
"description": "Routers to help build custom navigators",
|
|
4
|
-
"version": "7.0.0-alpha.
|
|
4
|
+
"version": "7.0.0-alpha.3",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
7
7
|
"react-native",
|
|
@@ -36,12 +36,12 @@
|
|
|
36
36
|
"clean": "del lib"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"nanoid": "
|
|
39
|
+
"nanoid": "3.3.6"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"del-cli": "^5.
|
|
43
|
-
"react-native-builder-bob": "^0.
|
|
44
|
-
"typescript": "^
|
|
42
|
+
"del-cli": "^5.1.0",
|
|
43
|
+
"react-native-builder-bob": "^0.23.1",
|
|
44
|
+
"typescript": "^5.2.2"
|
|
45
45
|
},
|
|
46
46
|
"react-native-builder-bob": {
|
|
47
47
|
"source": "src",
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
]
|
|
58
58
|
]
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "858a8746a5c007a623206c920f70d55935ed39b4"
|
|
61
61
|
}
|
package/src/CommonActions.tsx
CHANGED
|
@@ -57,16 +57,16 @@ export function navigate(options: {
|
|
|
57
57
|
path?: string;
|
|
58
58
|
merge?: boolean;
|
|
59
59
|
}): Action;
|
|
60
|
-
|
|
60
|
+
|
|
61
61
|
export function navigate(name: string, params?: object): Action;
|
|
62
|
-
|
|
62
|
+
|
|
63
63
|
export function navigate(...args: any): Action {
|
|
64
64
|
if (typeof args[0] === 'string') {
|
|
65
65
|
return { type: 'NAVIGATE', payload: { name: args[0], params: args[1] } };
|
|
66
66
|
} else {
|
|
67
67
|
const payload = args[0] || {};
|
|
68
68
|
|
|
69
|
-
if (!
|
|
69
|
+
if (!('name' in payload)) {
|
|
70
70
|
throw new Error(
|
|
71
71
|
'You need to specify a name when calling navigate with an object as the argument. See https://reactnavigation.org/docs/navigation-actions#navigate for usage.'
|
|
72
72
|
);
|
|
@@ -90,7 +90,7 @@ export function navigateDeprecated(
|
|
|
90
90
|
} else {
|
|
91
91
|
const payload = args[0] || {};
|
|
92
92
|
|
|
93
|
-
if (!
|
|
93
|
+
if (!('name' in payload)) {
|
|
94
94
|
throw new Error(
|
|
95
95
|
'You need to specify a name when calling navigate with an object as the argument. See https://reactnavigation.org/docs/navigation-actions#navigatelegacy for usage.'
|
|
96
96
|
);
|
package/src/DrawerRouter.tsx
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { nanoid } from 'nanoid/non-secure';
|
|
2
2
|
|
|
3
3
|
import {
|
|
4
|
-
TabActionHelpers,
|
|
4
|
+
type TabActionHelpers,
|
|
5
5
|
TabActions,
|
|
6
|
-
TabActionType,
|
|
7
|
-
TabNavigationState,
|
|
6
|
+
type TabActionType,
|
|
7
|
+
type TabNavigationState,
|
|
8
8
|
TabRouter,
|
|
9
|
-
TabRouterOptions,
|
|
9
|
+
type TabRouterOptions,
|
|
10
10
|
} from './TabRouter';
|
|
11
11
|
import type {
|
|
12
12
|
CommonNavigationAction,
|
package/src/StackRouter.tsx
CHANGED
|
@@ -166,7 +166,7 @@ export function StackRouter(options: StackRouterOptions) {
|
|
|
166
166
|
},
|
|
167
167
|
|
|
168
168
|
getRehydratedState(partialState, { routeNames, routeParamList }) {
|
|
169
|
-
|
|
169
|
+
const state = partialState;
|
|
170
170
|
|
|
171
171
|
if (state.stale === false) {
|
|
172
172
|
return state;
|
|
@@ -186,7 +186,7 @@ export function StackRouter(options: StackRouterOptions) {
|
|
|
186
186
|
...route.params,
|
|
187
187
|
}
|
|
188
188
|
: route.params,
|
|
189
|
-
} as Route<string>
|
|
189
|
+
}) as Route<string>
|
|
190
190
|
);
|
|
191
191
|
|
|
192
192
|
if (routes.length === 0) {
|
package/src/TabRouter.tsx
CHANGED
package/src/types.tsx
CHANGED
|
@@ -4,7 +4,7 @@ export type CommonNavigationAction = CommonActions.Action;
|
|
|
4
4
|
|
|
5
5
|
type NavigationRoute<
|
|
6
6
|
ParamList extends ParamListBase,
|
|
7
|
-
RouteName extends keyof ParamList
|
|
7
|
+
RouteName extends keyof ParamList,
|
|
8
8
|
> = Route<Extract<RouteName, string>, ParamList[RouteName]> & {
|
|
9
9
|
state?: NavigationState | PartialState<NavigationState>;
|
|
10
10
|
};
|
|
@@ -64,7 +64,7 @@ export type PartialState<State extends NavigationState> = Partial<
|
|
|
64
64
|
|
|
65
65
|
export type Route<
|
|
66
66
|
RouteName extends string,
|
|
67
|
-
Params extends object | undefined = object | undefined
|
|
67
|
+
Params extends object | undefined = object | undefined,
|
|
68
68
|
> = Readonly<{
|
|
69
69
|
/**
|
|
70
70
|
* Unique key for the route.
|
|
@@ -130,7 +130,7 @@ export type DefaultRouterOptions<RouteName extends string = string> = {
|
|
|
130
130
|
export type RouterFactory<
|
|
131
131
|
State extends NavigationState,
|
|
132
132
|
Action extends NavigationAction,
|
|
133
|
-
RouterOptions extends DefaultRouterOptions
|
|
133
|
+
RouterOptions extends DefaultRouterOptions,
|
|
134
134
|
> = (options: RouterOptions) => Router<State, Action>;
|
|
135
135
|
|
|
136
136
|
export type RouterConfigOptions = {
|
|
@@ -145,7 +145,7 @@ export type RouterConfigOptions = {
|
|
|
145
145
|
|
|
146
146
|
export type Router<
|
|
147
147
|
State extends NavigationState,
|
|
148
|
-
Action extends NavigationAction
|
|
148
|
+
Action extends NavigationAction,
|
|
149
149
|
> = {
|
|
150
150
|
/**
|
|
151
151
|
* Type of the router. Should match the `type` property in state.
|