@react-navigation/routers 6.1.8 → 7.0.0-alpha.1
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/README.md +1 -1
- package/lib/commonjs/BaseRouter.js +3 -4
- package/lib/commonjs/BaseRouter.js.map +1 -1
- package/lib/commonjs/CommonActions.js +23 -2
- package/lib/commonjs/CommonActions.js.map +1 -1
- package/lib/commonjs/DrawerRouter.js +4 -5
- package/lib/commonjs/DrawerRouter.js.map +1 -1
- package/lib/commonjs/StackRouter.js +129 -39
- package/lib/commonjs/StackRouter.js.map +1 -1
- package/lib/commonjs/TabRouter.js +9 -17
- package/lib/commonjs/TabRouter.js.map +1 -1
- package/lib/commonjs/index.js +8 -9
- package/lib/commonjs/index.js.map +1 -1
- package/lib/module/BaseRouter.js +2 -3
- package/lib/module/BaseRouter.js.map +1 -1
- package/lib/module/CommonActions.js +22 -2
- package/lib/module/CommonActions.js.map +1 -1
- package/lib/module/DrawerRouter.js +3 -2
- package/lib/module/DrawerRouter.js.map +1 -1
- package/lib/module/StackRouter.js +127 -36
- package/lib/module/StackRouter.js.map +1 -1
- package/lib/module/TabRouter.js +7 -14
- package/lib/module/TabRouter.js.map +1 -1
- package/lib/module/index.js +4 -4
- package/lib/module/index.js.map +1 -1
- package/lib/typescript/src/BaseRouter.d.ts +1 -2
- package/lib/typescript/src/BaseRouter.d.ts.map +1 -1
- package/lib/typescript/src/CommonActions.d.ts +13 -13
- package/lib/typescript/src/CommonActions.d.ts.map +1 -1
- package/lib/typescript/src/DrawerRouter.d.ts +6 -6
- package/lib/typescript/src/DrawerRouter.d.ts.map +1 -1
- package/lib/typescript/src/StackRouter.d.ts +24 -6
- package/lib/typescript/src/StackRouter.d.ts.map +1 -1
- package/lib/typescript/src/TabRouter.d.ts +6 -6
- package/lib/typescript/src/TabRouter.d.ts.map +1 -1
- package/lib/typescript/src/index.d.ts +4 -4
- package/lib/typescript/src/index.d.ts.map +1 -1
- package/lib/typescript/src/types.d.ts +14 -14
- package/lib/typescript/src/types.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/BaseRouter.tsx +2 -4
- package/src/CommonActions.tsx +48 -28
- package/src/DrawerRouter.tsx +5 -3
- package/src/StackRouter.tsx +272 -149
- package/src/TabRouter.tsx +11 -21
- package/src/index.tsx +4 -4
package/lib/commonjs/index.js
CHANGED
|
@@ -16,7 +16,7 @@ var _exportNames = {
|
|
|
16
16
|
Object.defineProperty(exports, "BaseRouter", {
|
|
17
17
|
enumerable: true,
|
|
18
18
|
get: function () {
|
|
19
|
-
return _BaseRouter.
|
|
19
|
+
return _BaseRouter.BaseRouter;
|
|
20
20
|
}
|
|
21
21
|
});
|
|
22
22
|
exports.CommonActions = void 0;
|
|
@@ -29,7 +29,7 @@ Object.defineProperty(exports, "DrawerActions", {
|
|
|
29
29
|
Object.defineProperty(exports, "DrawerRouter", {
|
|
30
30
|
enumerable: true,
|
|
31
31
|
get: function () {
|
|
32
|
-
return _DrawerRouter.
|
|
32
|
+
return _DrawerRouter.DrawerRouter;
|
|
33
33
|
}
|
|
34
34
|
});
|
|
35
35
|
Object.defineProperty(exports, "StackActions", {
|
|
@@ -41,7 +41,7 @@ Object.defineProperty(exports, "StackActions", {
|
|
|
41
41
|
Object.defineProperty(exports, "StackRouter", {
|
|
42
42
|
enumerable: true,
|
|
43
43
|
get: function () {
|
|
44
|
-
return _StackRouter.
|
|
44
|
+
return _StackRouter.StackRouter;
|
|
45
45
|
}
|
|
46
46
|
});
|
|
47
47
|
Object.defineProperty(exports, "TabActions", {
|
|
@@ -53,15 +53,15 @@ Object.defineProperty(exports, "TabActions", {
|
|
|
53
53
|
Object.defineProperty(exports, "TabRouter", {
|
|
54
54
|
enumerable: true,
|
|
55
55
|
get: function () {
|
|
56
|
-
return _TabRouter.
|
|
56
|
+
return _TabRouter.TabRouter;
|
|
57
57
|
}
|
|
58
58
|
});
|
|
59
59
|
var CommonActions = _interopRequireWildcard(require("./CommonActions"));
|
|
60
60
|
exports.CommonActions = CommonActions;
|
|
61
|
-
var _BaseRouter =
|
|
62
|
-
var _DrawerRouter =
|
|
63
|
-
var _StackRouter =
|
|
64
|
-
var _TabRouter =
|
|
61
|
+
var _BaseRouter = require("./BaseRouter");
|
|
62
|
+
var _DrawerRouter = require("./DrawerRouter");
|
|
63
|
+
var _StackRouter = require("./StackRouter");
|
|
64
|
+
var _TabRouter = require("./TabRouter");
|
|
65
65
|
var _types = require("./types");
|
|
66
66
|
Object.keys(_types).forEach(function (key) {
|
|
67
67
|
if (key === "default" || key === "__esModule") return;
|
|
@@ -74,7 +74,6 @@ Object.keys(_types).forEach(function (key) {
|
|
|
74
74
|
}
|
|
75
75
|
});
|
|
76
76
|
});
|
|
77
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
78
77
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
79
78
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
80
79
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":[],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAiD;AAIjD;AAQA;AAOA;AAOA;AACA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAAwB;AAAA
|
|
1
|
+
{"version":3,"names":[],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAiD;AAIjD;AAQA;AAOA;AAOA;AACA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAAwB;AAAA"}
|
package/lib/module/BaseRouter.js
CHANGED
|
@@ -3,7 +3,7 @@ import { nanoid } from 'nanoid/non-secure';
|
|
|
3
3
|
* Base router object that can be used when writing custom routers.
|
|
4
4
|
* This provides few helper methods to handle common actions such as `RESET`.
|
|
5
5
|
*/
|
|
6
|
-
const BaseRouter = {
|
|
6
|
+
export const BaseRouter = {
|
|
7
7
|
getStateForAction(state, action) {
|
|
8
8
|
switch (action.type) {
|
|
9
9
|
case 'SET_PARAMS':
|
|
@@ -48,8 +48,7 @@ const BaseRouter = {
|
|
|
48
48
|
}
|
|
49
49
|
},
|
|
50
50
|
shouldActionChangeFocus(action) {
|
|
51
|
-
return action.type === 'NAVIGATE';
|
|
51
|
+
return action.type === 'NAVIGATE' || action.type === 'NAVIGATE_DEPRECATED';
|
|
52
52
|
}
|
|
53
53
|
};
|
|
54
|
-
export default BaseRouter;
|
|
55
54
|
//# sourceMappingURL=BaseRouter.js.map
|
|
@@ -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,MAAMC,UAAU,GAAG;
|
|
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,iBAAiB,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,CAAC;UAET,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,CAAC,CACpE,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,CAAC,CAC3C,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,EAAG;cAAE,CAAC;YAEtE,CAAC;UACH;UAEA,OAAOgB,SAAS;QAClB;MAEA;QACE,OAAO,IAAI;IAAC;EAElB,CAAC;EAEDQ,uBAAuB,CAACpB,MAA8B,EAAE;IACtD,OAAOA,MAAM,CAACC,IAAI,KAAK,UAAU,IAAID,MAAM,CAACC,IAAI,KAAK,qBAAqB;EAC5E;AACF,CAAC"}
|
|
@@ -15,8 +15,8 @@ export function navigate() {
|
|
|
15
15
|
};
|
|
16
16
|
} else {
|
|
17
17
|
const payload = (arguments.length <= 0 ? undefined : arguments[0]) || {};
|
|
18
|
-
if (!payload.hasOwnProperty('
|
|
19
|
-
throw new Error('You need to specify name
|
|
18
|
+
if (!payload.hasOwnProperty('name')) {
|
|
19
|
+
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
20
|
}
|
|
21
21
|
return {
|
|
22
22
|
type: 'NAVIGATE',
|
|
@@ -24,6 +24,26 @@ export function navigate() {
|
|
|
24
24
|
};
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
+
export function navigateDeprecated() {
|
|
28
|
+
if (typeof (arguments.length <= 0 ? undefined : arguments[0]) === 'string') {
|
|
29
|
+
return {
|
|
30
|
+
type: 'NAVIGATE_DEPRECATED',
|
|
31
|
+
payload: {
|
|
32
|
+
name: arguments.length <= 0 ? undefined : arguments[0],
|
|
33
|
+
params: arguments.length <= 1 ? undefined : arguments[1]
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
} else {
|
|
37
|
+
const payload = (arguments.length <= 0 ? undefined : arguments[0]) || {};
|
|
38
|
+
if (!payload.hasOwnProperty('name')) {
|
|
39
|
+
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
|
+
}
|
|
41
|
+
return {
|
|
42
|
+
type: 'NAVIGATE_DEPRECATED',
|
|
43
|
+
payload
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
}
|
|
27
47
|
export function reset(state) {
|
|
28
48
|
return {
|
|
29
49
|
type: 'RESET',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["goBack","type","navigate","payload","name","params","hasOwnProperty","Error","reset","state","setParams"],"sourceRoot":"../../src","sources":["CommonActions.tsx"],"mappings":"
|
|
1
|
+
{"version":3,"names":["goBack","type","navigate","payload","name","params","hasOwnProperty","Error","navigateDeprecated","reset","state","setParams"],"sourceRoot":"../../src","sources":["CommonActions.tsx"],"mappings":"AAiDA,OAAO,SAASA,MAAM,GAAW;EAC/B,OAAO;IAAEC,IAAI,EAAE;EAAU,CAAC;AAC5B;AAUA;AACA,OAAO,SAASC,QAAQ,GAAuB;EAC7C,IAAI,yDAAc,KAAK,QAAQ,EAAE;IAC/B,OAAO;MAAED,IAAI,EAAE,UAAU;MAAEE,OAAO,EAAE;QAAEC,IAAI,kDAAS;QAAEC,MAAM;MAAU;IAAE,CAAC;EAC1E,CAAC,MAAM;IACL,MAAMF,OAAO,GAAG,sDAAW,CAAC,CAAC;IAE7B,IAAI,CAACA,OAAO,CAACG,cAAc,CAAC,MAAM,CAAC,EAAE;MACnC,MAAM,IAAIC,KAAK,CACb,8JAA8J,CAC/J;IACH;IAEA,OAAO;MAAEN,IAAI,EAAE,UAAU;MAAEE;IAAQ,CAAC;EACtC;AACF;AAEA,OAAO,SAASK,kBAAkB,GAKxB;EACR,IAAI,yDAAc,KAAK,QAAQ,EAAE;IAC/B,OAAO;MACLP,IAAI,EAAE,qBAAqB;MAC3BE,OAAO,EAAE;QAAEC,IAAI,kDAAS;QAAEC,MAAM;MAAU;IAC5C,CAAC;EACH,CAAC,MAAM;IACL,MAAMF,OAAO,GAAG,sDAAW,CAAC,CAAC;IAE7B,IAAI,CAACA,OAAO,CAACG,cAAc,CAAC,MAAM,CAAC,EAAE;MACnC,MAAM,IAAIC,KAAK,CACb,oKAAoK,CACrK;IACH;IAEA,OAAO;MAAEN,IAAI,EAAE,qBAAqB;MAAEE;IAAQ,CAAC;EACjD;AACF;AAEA,OAAO,SAASM,KAAK,CAACC,KAA6B,EAAU;EAC3D,OAAO;IAAET,IAAI,EAAE,OAAO;IAAEE,OAAO,EAAEO;EAAM,CAAC;AAC1C;AAEA,OAAO,SAASC,SAAS,CAACN,MAAc,EAAU;EAChD,OAAO;IAAEJ,IAAI,EAAE,YAAY;IAAEE,OAAO,EAAE;MAAEE;IAAO;EAAE,CAAC;AACpD"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { nanoid } from 'nanoid/non-secure';
|
|
2
|
-
import
|
|
2
|
+
import { TabActions, TabRouter } from './TabRouter';
|
|
3
3
|
export const DrawerActions = {
|
|
4
4
|
...TabActions,
|
|
5
5
|
openDrawer() {
|
|
@@ -18,7 +18,7 @@ export const DrawerActions = {
|
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
20
|
};
|
|
21
|
-
export
|
|
21
|
+
export function DrawerRouter(_ref) {
|
|
22
22
|
let {
|
|
23
23
|
defaultStatus = 'closed',
|
|
24
24
|
...rest
|
|
@@ -126,6 +126,7 @@ export default function DrawerRouter(_ref) {
|
|
|
126
126
|
return addDrawerToHistory(state);
|
|
127
127
|
case 'JUMP_TO':
|
|
128
128
|
case 'NAVIGATE':
|
|
129
|
+
case 'NAVIGATE_DEPRECATED':
|
|
129
130
|
{
|
|
130
131
|
const result = router.getStateForAction(state, action, options);
|
|
131
132
|
if (result != null && result.index !== state.index) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","
|
|
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":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { nanoid } from 'nanoid/non-secure';
|
|
2
|
-
import BaseRouter from './BaseRouter';
|
|
2
|
+
import { BaseRouter } from './BaseRouter';
|
|
3
3
|
export const StackActions = {
|
|
4
4
|
replace(name, params) {
|
|
5
5
|
return {
|
|
@@ -32,9 +32,19 @@ export const StackActions = {
|
|
|
32
32
|
return {
|
|
33
33
|
type: 'POP_TO_TOP'
|
|
34
34
|
};
|
|
35
|
+
},
|
|
36
|
+
popTo(name, params, merge) {
|
|
37
|
+
return {
|
|
38
|
+
type: 'POP_TO',
|
|
39
|
+
payload: {
|
|
40
|
+
name,
|
|
41
|
+
params,
|
|
42
|
+
merge
|
|
43
|
+
}
|
|
44
|
+
};
|
|
35
45
|
}
|
|
36
46
|
};
|
|
37
|
-
export
|
|
47
|
+
export function StackRouter(options) {
|
|
38
48
|
const router = {
|
|
39
49
|
...BaseRouter,
|
|
40
50
|
type: 'stack',
|
|
@@ -137,7 +147,6 @@ export default function StackRouter(options) {
|
|
|
137
147
|
}
|
|
138
148
|
const {
|
|
139
149
|
name,
|
|
140
|
-
key,
|
|
141
150
|
params
|
|
142
151
|
} = action.payload;
|
|
143
152
|
if (!state.routeNames.includes(name)) {
|
|
@@ -146,7 +155,7 @@ export default function StackRouter(options) {
|
|
|
146
155
|
return {
|
|
147
156
|
...state,
|
|
148
157
|
routes: state.routes.map((route, i) => i === index ? {
|
|
149
|
-
key:
|
|
158
|
+
key: `${name}-${nanoid()}`,
|
|
150
159
|
name,
|
|
151
160
|
params: routeParamList[name] !== undefined ? {
|
|
152
161
|
...routeParamList[name],
|
|
@@ -156,26 +165,92 @@ export default function StackRouter(options) {
|
|
|
156
165
|
};
|
|
157
166
|
}
|
|
158
167
|
case 'PUSH':
|
|
159
|
-
|
|
168
|
+
case 'NAVIGATE':
|
|
169
|
+
{
|
|
170
|
+
if (!state.routeNames.includes(action.payload.name)) {
|
|
171
|
+
return null;
|
|
172
|
+
}
|
|
160
173
|
const getId = options.routeGetIdList[action.payload.name];
|
|
161
174
|
const id = getId === null || getId === void 0 ? void 0 : getId({
|
|
162
175
|
params: action.payload.params
|
|
163
176
|
});
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
177
|
+
let route;
|
|
178
|
+
if (id !== undefined) {
|
|
179
|
+
route = state.routes.find(route => route.name === action.payload.name && id === (getId === null || getId === void 0 ? void 0 : getId({
|
|
180
|
+
params: route.params
|
|
181
|
+
})));
|
|
182
|
+
} else {
|
|
183
|
+
const currentRoute = state.routes[state.index];
|
|
184
|
+
|
|
185
|
+
// If the route matches the current one, then navigate to it
|
|
186
|
+
if (action.type === 'NAVIGATE' && action.payload.name === currentRoute.name) {
|
|
187
|
+
route = currentRoute;
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
let params;
|
|
191
|
+
if (action.type === 'NAVIGATE' && action.payload.merge && route) {
|
|
192
|
+
params = action.payload.params !== undefined || routeParamList[action.payload.name] !== undefined ? {
|
|
193
|
+
...routeParamList[action.payload.name],
|
|
194
|
+
...route.params,
|
|
195
|
+
...action.payload.params
|
|
196
|
+
} : route.params;
|
|
197
|
+
} else {
|
|
198
|
+
params = routeParamList[action.payload.name] !== undefined ? {
|
|
199
|
+
...routeParamList[action.payload.name],
|
|
200
|
+
...action.payload.params
|
|
201
|
+
} : action.payload.params;
|
|
202
|
+
}
|
|
167
203
|
let routes;
|
|
168
204
|
if (route) {
|
|
169
|
-
|
|
205
|
+
const routeKey = route.key;
|
|
206
|
+
routes = state.routes.filter(r => r.key !== routeKey);
|
|
170
207
|
routes.push({
|
|
171
208
|
...route,
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
...action.payload.params
|
|
175
|
-
} : action.payload.params
|
|
209
|
+
path: action.type === 'NAVIGATE' && action.payload.path !== undefined ? action.payload.path : route.path,
|
|
210
|
+
params
|
|
176
211
|
});
|
|
177
212
|
} else {
|
|
178
213
|
routes = [...state.routes, {
|
|
214
|
+
key: `${action.payload.name}-${nanoid()}`,
|
|
215
|
+
name: action.payload.name,
|
|
216
|
+
path: action.type === 'NAVIGATE' ? action.payload.path : undefined,
|
|
217
|
+
params
|
|
218
|
+
}];
|
|
219
|
+
}
|
|
220
|
+
return {
|
|
221
|
+
...state,
|
|
222
|
+
index: routes.length - 1,
|
|
223
|
+
routes
|
|
224
|
+
};
|
|
225
|
+
}
|
|
226
|
+
case 'NAVIGATE_DEPRECATED':
|
|
227
|
+
{
|
|
228
|
+
if (!state.routeNames.includes(action.payload.name)) {
|
|
229
|
+
return null;
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
// If the route already exists, navigate to that
|
|
233
|
+
let index = -1;
|
|
234
|
+
const getId = options.routeGetIdList[action.payload.name];
|
|
235
|
+
const id = getId === null || getId === void 0 ? void 0 : getId({
|
|
236
|
+
params: action.payload.params
|
|
237
|
+
});
|
|
238
|
+
if (id) {
|
|
239
|
+
index = state.routes.findIndex(route => route.name === action.payload.name && id === (getId === null || getId === void 0 ? void 0 : getId({
|
|
240
|
+
params: route.params
|
|
241
|
+
})));
|
|
242
|
+
} else if (state.routes[state.index].name === action.payload.name) {
|
|
243
|
+
index = state.index;
|
|
244
|
+
} else {
|
|
245
|
+
for (let i = state.routes.length - 1; i >= 0; i--) {
|
|
246
|
+
if (state.routes[i].name === action.payload.name) {
|
|
247
|
+
index = i;
|
|
248
|
+
break;
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
if (index === -1) {
|
|
253
|
+
const routes = [...state.routes, {
|
|
179
254
|
key: `${action.payload.name}-${nanoid()}`,
|
|
180
255
|
name: action.payload.name,
|
|
181
256
|
params: routeParamList[action.payload.name] !== undefined ? {
|
|
@@ -183,14 +258,35 @@ export default function StackRouter(options) {
|
|
|
183
258
|
...action.payload.params
|
|
184
259
|
} : action.payload.params
|
|
185
260
|
}];
|
|
261
|
+
return {
|
|
262
|
+
...state,
|
|
263
|
+
routes,
|
|
264
|
+
index: routes.length - 1
|
|
265
|
+
};
|
|
266
|
+
}
|
|
267
|
+
const route = state.routes[index];
|
|
268
|
+
let params;
|
|
269
|
+
if (action.payload.merge) {
|
|
270
|
+
params = action.payload.params !== undefined || routeParamList[route.name] !== undefined ? {
|
|
271
|
+
...routeParamList[route.name],
|
|
272
|
+
...route.params,
|
|
273
|
+
...action.payload.params
|
|
274
|
+
} : route.params;
|
|
275
|
+
} else {
|
|
276
|
+
params = routeParamList[route.name] !== undefined ? {
|
|
277
|
+
...routeParamList[route.name],
|
|
278
|
+
...action.payload.params
|
|
279
|
+
} : action.payload.params;
|
|
186
280
|
}
|
|
187
281
|
return {
|
|
188
282
|
...state,
|
|
189
|
-
index
|
|
190
|
-
routes
|
|
283
|
+
index,
|
|
284
|
+
routes: [...state.routes.slice(0, index), params !== route.params ? {
|
|
285
|
+
...route,
|
|
286
|
+
params
|
|
287
|
+
} : state.routes[index]]
|
|
191
288
|
};
|
|
192
289
|
}
|
|
193
|
-
return null;
|
|
194
290
|
case 'POP':
|
|
195
291
|
{
|
|
196
292
|
const index = action.target === state.key && action.source ? state.routes.findIndex(r => r.key === action.source) : state.index;
|
|
@@ -212,16 +308,15 @@ export default function StackRouter(options) {
|
|
|
212
308
|
count: state.routes.length - 1
|
|
213
309
|
}
|
|
214
310
|
}, options);
|
|
215
|
-
case '
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
311
|
+
case 'POP_TO':
|
|
312
|
+
{
|
|
313
|
+
if (!state.routeNames.includes(action.payload.name)) {
|
|
314
|
+
return null;
|
|
315
|
+
}
|
|
316
|
+
|
|
220
317
|
// If the route already exists, navigate to that
|
|
221
318
|
let index = -1;
|
|
222
|
-
const getId =
|
|
223
|
-
// `getId` and `key` can't be used together
|
|
224
|
-
action.payload.key === undefined && action.payload.name !== undefined ? options.routeGetIdList[action.payload.name] : undefined;
|
|
319
|
+
const getId = options.routeGetIdList[action.payload.name];
|
|
225
320
|
const id = getId === null || getId === void 0 ? void 0 : getId({
|
|
226
321
|
params: action.payload.params
|
|
227
322
|
});
|
|
@@ -229,24 +324,22 @@ export default function StackRouter(options) {
|
|
|
229
324
|
index = state.routes.findIndex(route => route.name === action.payload.name && id === (getId === null || getId === void 0 ? void 0 : getId({
|
|
230
325
|
params: route.params
|
|
231
326
|
})));
|
|
232
|
-
} else if (state.routes[state.index].name === action.payload.name
|
|
327
|
+
} else if (state.routes[state.index].name === action.payload.name) {
|
|
233
328
|
index = state.index;
|
|
234
329
|
} else {
|
|
235
330
|
for (let i = state.routes.length - 1; i >= 0; i--) {
|
|
236
|
-
if (state.routes[i].name === action.payload.name
|
|
331
|
+
if (state.routes[i].name === action.payload.name) {
|
|
237
332
|
index = i;
|
|
238
333
|
break;
|
|
239
334
|
}
|
|
240
335
|
}
|
|
241
336
|
}
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
key: action.payload.key ?? `${action.payload.name}-${nanoid()}`,
|
|
337
|
+
|
|
338
|
+
// If the route doesn't exist, remove the current route and add the new one
|
|
339
|
+
if (index === -1) {
|
|
340
|
+
const routes = [...state.routes.slice(0, -1), {
|
|
341
|
+
key: `${action.payload.name}-${nanoid()}`,
|
|
248
342
|
name: action.payload.name,
|
|
249
|
-
path: action.payload.path,
|
|
250
343
|
params: routeParamList[action.payload.name] !== undefined ? {
|
|
251
344
|
...routeParamList[action.payload.name],
|
|
252
345
|
...action.payload.params
|
|
@@ -275,14 +368,12 @@ export default function StackRouter(options) {
|
|
|
275
368
|
return {
|
|
276
369
|
...state,
|
|
277
370
|
index,
|
|
278
|
-
routes: [...state.routes.slice(0, index), params !== route.params
|
|
371
|
+
routes: [...state.routes.slice(0, index), params !== route.params ? {
|
|
279
372
|
...route,
|
|
280
|
-
path: action.payload.path ?? route.path,
|
|
281
373
|
params
|
|
282
374
|
} : state.routes[index]]
|
|
283
375
|
};
|
|
284
376
|
}
|
|
285
|
-
return null;
|
|
286
377
|
case 'GO_BACK':
|
|
287
378
|
if (state.index > 0) {
|
|
288
379
|
return router.getStateForAction(state, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","BaseRouter","StackActions","replace","name","params","type","payload","push","pop","count","popToTop","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","max","concat","path","merge","actionCreators"],"sourceRoot":"../../src","sources":["StackRouter.tsx"],"mappings":"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"}
|
|
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"}
|
package/lib/module/TabRouter.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { nanoid } from 'nanoid/non-secure';
|
|
2
|
-
import BaseRouter from './BaseRouter';
|
|
2
|
+
import { BaseRouter } from './BaseRouter';
|
|
3
3
|
const TYPE_ROUTE = 'route';
|
|
4
4
|
export const TabActions = {
|
|
5
5
|
jumpTo(name, params) {
|
|
@@ -68,7 +68,7 @@ const changeIndex = (state, index, backBehavior, initialRouteName) => {
|
|
|
68
68
|
history
|
|
69
69
|
};
|
|
70
70
|
};
|
|
71
|
-
export
|
|
71
|
+
export function TabRouter(_ref) {
|
|
72
72
|
let {
|
|
73
73
|
initialRouteName,
|
|
74
74
|
backBehavior = 'firstRoute'
|
|
@@ -173,20 +173,16 @@ export default function TabRouter(_ref) {
|
|
|
173
173
|
switch (action.type) {
|
|
174
174
|
case 'JUMP_TO':
|
|
175
175
|
case 'NAVIGATE':
|
|
176
|
+
case 'NAVIGATE_DEPRECATED':
|
|
176
177
|
{
|
|
177
|
-
|
|
178
|
-
if (action.type === 'NAVIGATE' && action.payload.key) {
|
|
179
|
-
index = state.routes.findIndex(route => route.key === action.payload.key);
|
|
180
|
-
} else {
|
|
181
|
-
index = state.routes.findIndex(route => route.name === action.payload.name);
|
|
182
|
-
}
|
|
178
|
+
const index = state.routes.findIndex(route => route.name === action.payload.name);
|
|
183
179
|
if (index === -1) {
|
|
184
180
|
return null;
|
|
185
181
|
}
|
|
186
182
|
return changeIndex({
|
|
187
183
|
...state,
|
|
188
|
-
routes: state.routes.map(
|
|
189
|
-
if (
|
|
184
|
+
routes: state.routes.map(route => {
|
|
185
|
+
if (route.name !== action.payload.name) {
|
|
190
186
|
return route;
|
|
191
187
|
}
|
|
192
188
|
const getId = routeGetIdList[route.name];
|
|
@@ -198,7 +194,7 @@ export default function TabRouter(_ref) {
|
|
|
198
194
|
});
|
|
199
195
|
const key = currentId === nextId ? route.key : `${route.name}-${nanoid()}`;
|
|
200
196
|
let params;
|
|
201
|
-
if (action.type === 'NAVIGATE' && action.payload.merge && currentId === nextId) {
|
|
197
|
+
if ((action.type === 'NAVIGATE' || action.type === 'NAVIGATE_DEPRECATED') && action.payload.merge && currentId === nextId) {
|
|
202
198
|
params = action.payload.params !== undefined || routeParamList[route.name] !== undefined ? {
|
|
203
199
|
...routeParamList[route.name],
|
|
204
200
|
...route.params,
|
|
@@ -240,9 +236,6 @@ export default function TabRouter(_ref) {
|
|
|
240
236
|
return BaseRouter.getStateForAction(state, action);
|
|
241
237
|
}
|
|
242
238
|
},
|
|
243
|
-
shouldActionChangeFocus(action) {
|
|
244
|
-
return action.type === 'NAVIGATE';
|
|
245
|
-
},
|
|
246
239
|
actionCreators: TabActions
|
|
247
240
|
};
|
|
248
241
|
return router;
|
|
@@ -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","
|
|
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":"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"}
|
package/lib/module/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as CommonActions from './CommonActions';
|
|
2
2
|
export { CommonActions };
|
|
3
|
-
export {
|
|
4
|
-
export { DrawerActions,
|
|
5
|
-
export { StackActions,
|
|
6
|
-
export { TabActions,
|
|
3
|
+
export { BaseRouter } from './BaseRouter';
|
|
4
|
+
export { DrawerActions, DrawerRouter } from './DrawerRouter';
|
|
5
|
+
export { StackActions, StackRouter } from './StackRouter';
|
|
6
|
+
export { TabActions, TabRouter } from './TabRouter';
|
|
7
7
|
export * from './types';
|
|
8
8
|
//# sourceMappingURL=index.js.map
|
package/lib/module/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["CommonActions","
|
|
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"}
|