@react-navigation/routers 6.1.6 → 7.0.0-alpha.0

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.
Files changed (37) hide show
  1. package/README.md +1 -1
  2. package/lib/commonjs/BaseRouter.js +1 -1
  3. package/lib/commonjs/BaseRouter.js.map +1 -1
  4. package/lib/commonjs/CommonActions.js +23 -2
  5. package/lib/commonjs/CommonActions.js.map +1 -1
  6. package/lib/commonjs/DrawerRouter.js +1 -0
  7. package/lib/commonjs/DrawerRouter.js.map +1 -1
  8. package/lib/commonjs/StackRouter.js +125 -34
  9. package/lib/commonjs/StackRouter.js.map +1 -1
  10. package/lib/commonjs/TabRouter.js +3 -10
  11. package/lib/commonjs/TabRouter.js.map +1 -1
  12. package/lib/module/BaseRouter.js +1 -1
  13. package/lib/module/BaseRouter.js.map +1 -1
  14. package/lib/module/CommonActions.js +22 -2
  15. package/lib/module/CommonActions.js.map +1 -1
  16. package/lib/module/DrawerRouter.js +1 -0
  17. package/lib/module/DrawerRouter.js.map +1 -1
  18. package/lib/module/StackRouter.js +125 -34
  19. package/lib/module/StackRouter.js.map +1 -1
  20. package/lib/module/TabRouter.js +3 -10
  21. package/lib/module/TabRouter.js.map +1 -1
  22. package/lib/typescript/src/CommonActions.d.ts +13 -13
  23. package/lib/typescript/src/CommonActions.d.ts.map +1 -1
  24. package/lib/typescript/src/DrawerRouter.d.ts +5 -5
  25. package/lib/typescript/src/DrawerRouter.d.ts.map +1 -1
  26. package/lib/typescript/src/StackRouter.d.ts +23 -5
  27. package/lib/typescript/src/StackRouter.d.ts.map +1 -1
  28. package/lib/typescript/src/TabRouter.d.ts +5 -5
  29. package/lib/typescript/src/TabRouter.d.ts.map +1 -1
  30. package/lib/typescript/src/types.d.ts +14 -14
  31. package/lib/typescript/src/types.d.ts.map +1 -1
  32. package/package.json +4 -4
  33. package/src/BaseRouter.tsx +1 -1
  34. package/src/CommonActions.tsx +48 -28
  35. package/src/DrawerRouter.tsx +2 -1
  36. package/src/StackRouter.tsx +270 -147
  37. package/src/TabRouter.tsx +10 -17
package/README.md CHANGED
@@ -9,7 +9,7 @@ You probably don't need to use this package directly if you're not building cust
9
9
  Open a Terminal in your project's folder and run,
10
10
 
11
11
  ```sh
12
- yarn add @react-navigation/routers
12
+ npm install @react-navigation/routers
13
13
  ```
14
14
 
15
15
  ## Usage
@@ -54,7 +54,7 @@ const BaseRouter = {
54
54
  }
55
55
  },
56
56
  shouldActionChangeFocus(action) {
57
- return action.type === 'NAVIGATE';
57
+ return action.type === 'NAVIGATE' || action.type === 'NAVIGATE_DEPRECATED';
58
58
  }
59
59
  };
60
60
  var _default = BaseRouter;
@@ -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;AACA,MAAMA,UAAU,GAAG;EACjBC,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,IAAG,IAAAE,iBAAM,GAAG;cAAE,CAAC;YAEtE,CAAC;UACH;UAEA,OAAOR,SAAS;QAClB;MAEA;QACE,OAAO,IAAI;IAAC;EAElB,CAAC;EAEDS,uBAAuB,CAACrB,MAA8B,EAAE;IACtD,OAAOA,MAAM,CAACC,IAAI,KAAK,UAAU;EACnC;AACF,CAAC;AAAC,eAEaJ,UAAU;AAAA"}
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;AACA,MAAMA,UAAU,GAAG;EACjBC,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,IAAG,IAAAE,iBAAM,GAAG;cAAE,CAAC;YAEtE,CAAC;UACH;UAEA,OAAOR,SAAS;QAClB;MAEA;QACE,OAAO,IAAI;IAAC;EAElB,CAAC;EAEDS,uBAAuB,CAACrB,MAA8B,EAAE;IACtD,OAAOA,MAAM,CAACC,IAAI,KAAK,UAAU,IAAID,MAAM,CAACC,IAAI,KAAK,qBAAqB;EAC5E;AACF,CAAC;AAAC,eAEaJ,UAAU;AAAA"}
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.goBack = goBack;
7
7
  exports.navigate = navigate;
8
+ exports.navigateDeprecated = navigateDeprecated;
8
9
  exports.reset = reset;
9
10
  exports.setParams = setParams;
10
11
  function goBack() {
@@ -24,8 +25,8 @@ function navigate() {
24
25
  };
25
26
  } else {
26
27
  const payload = (arguments.length <= 0 ? undefined : arguments[0]) || {};
27
- if (!payload.hasOwnProperty('key') && !payload.hasOwnProperty('name')) {
28
- throw new Error('You need to specify name or key when calling navigate with an object as the argument. See https://reactnavigation.org/docs/navigation-actions#navigate for usage.');
28
+ if (!payload.hasOwnProperty('name')) {
29
+ 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.');
29
30
  }
30
31
  return {
31
32
  type: 'NAVIGATE',
@@ -33,6 +34,26 @@ function navigate() {
33
34
  };
34
35
  }
35
36
  }
37
+ function navigateDeprecated() {
38
+ if (typeof (arguments.length <= 0 ? undefined : arguments[0]) === 'string') {
39
+ return {
40
+ type: 'NAVIGATE_DEPRECATED',
41
+ payload: {
42
+ name: arguments.length <= 0 ? undefined : arguments[0],
43
+ params: arguments.length <= 1 ? undefined : arguments[1]
44
+ }
45
+ };
46
+ } else {
47
+ const payload = (arguments.length <= 0 ? undefined : arguments[0]) || {};
48
+ if (!payload.hasOwnProperty('name')) {
49
+ 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
+ }
51
+ return {
52
+ type: 'NAVIGATE_DEPRECATED',
53
+ payload
54
+ };
55
+ }
56
+ }
36
57
  function reset(state) {
37
58
  return {
38
59
  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":";;;;;;;;;AAgDO,SAASA,MAAM,GAAW;EAC/B,OAAO;IAAEC,IAAI,EAAE;EAAU,CAAC;AAC5B;AAeA;AACO,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,KAAK,CAAC,IAAI,CAACH,OAAO,CAACG,cAAc,CAAC,MAAM,CAAC,EAAE;MACrE,MAAM,IAAIC,KAAK,CACb,mKAAmK,CACpK;IACH;IAEA,OAAO;MAAEN,IAAI,EAAE,UAAU;MAAEE;IAAQ,CAAC;EACtC;AACF;AAEO,SAASK,KAAK,CAACC,KAA6B,EAAU;EAC3D,OAAO;IAAER,IAAI,EAAE,OAAO;IAAEE,OAAO,EAAEM;EAAM,CAAC;AAC1C;AAEO,SAASC,SAAS,CAACL,MAAc,EAAU;EAChD,OAAO;IAAEJ,IAAI,EAAE,YAAY;IAAEE,OAAO,EAAE;MAAEE;IAAO;EAAE,CAAC;AACpD"}
1
+ {"version":3,"names":["goBack","type","navigate","payload","name","params","hasOwnProperty","Error","navigateDeprecated","reset","state","setParams"],"sourceRoot":"../../src","sources":["CommonActions.tsx"],"mappings":";;;;;;;;;;AAiDO,SAASA,MAAM,GAAW;EAC/B,OAAO;IAAEC,IAAI,EAAE;EAAU,CAAC;AAC5B;AAUA;AACO,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;AAEO,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;AAEO,SAASM,KAAK,CAACC,KAA6B,EAAU;EAC3D,OAAO;IAAET,IAAI,EAAE,OAAO;IAAEE,OAAO,EAAEO;EAAM,CAAC;AAC1C;AAEO,SAASC,SAAS,CAACN,MAAc,EAAU;EAChD,OAAO;IAAEJ,IAAI,EAAE,YAAY;IAAEE,OAAO,EAAE;MAAEE;IAAO;EAAE,CAAC;AACpD"}
@@ -136,6 +136,7 @@ function DrawerRouter(_ref) {
136
136
  return addDrawerToHistory(state);
137
137
  case 'JUMP_TO':
138
138
  case 'NAVIGATE':
139
+ case 'NAVIGATE_DEPRECATED':
139
140
  {
140
141
  const result = router.getStateForAction(state, action, options);
141
142
  if (result != null && result.index !== state.index) {
@@ -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":"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"}
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":"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"}
@@ -40,6 +40,16 @@ const StackActions = {
40
40
  return {
41
41
  type: 'POP_TO_TOP'
42
42
  };
43
+ },
44
+ popTo(name, params, merge) {
45
+ return {
46
+ type: 'POP_TO',
47
+ payload: {
48
+ name,
49
+ params,
50
+ merge
51
+ }
52
+ };
43
53
  }
44
54
  };
45
55
  exports.StackActions = StackActions;
@@ -146,7 +156,6 @@ function StackRouter(options) {
146
156
  }
147
157
  const {
148
158
  name,
149
- key,
150
159
  params
151
160
  } = action.payload;
152
161
  if (!state.routeNames.includes(name)) {
@@ -155,7 +164,7 @@ function StackRouter(options) {
155
164
  return {
156
165
  ...state,
157
166
  routes: state.routes.map((route, i) => i === index ? {
158
- key: key !== undefined ? key : `${name}-${(0, _nonSecure.nanoid)()}`,
167
+ key: `${name}-${(0, _nonSecure.nanoid)()}`,
159
168
  name,
160
169
  params: routeParamList[name] !== undefined ? {
161
170
  ...routeParamList[name],
@@ -165,26 +174,92 @@ function StackRouter(options) {
165
174
  };
166
175
  }
167
176
  case 'PUSH':
168
- if (state.routeNames.includes(action.payload.name)) {
177
+ case 'NAVIGATE':
178
+ {
179
+ if (!state.routeNames.includes(action.payload.name)) {
180
+ return null;
181
+ }
169
182
  const getId = options.routeGetIdList[action.payload.name];
170
183
  const id = getId === null || getId === void 0 ? void 0 : getId({
171
184
  params: action.payload.params
172
185
  });
173
- const route = id ? state.routes.find(route => route.name === action.payload.name && id === (getId === null || getId === void 0 ? void 0 : getId({
174
- params: route.params
175
- }))) : undefined;
186
+ let route;
187
+ if (id !== undefined) {
188
+ route = state.routes.find(route => route.name === action.payload.name && id === (getId === null || getId === void 0 ? void 0 : getId({
189
+ params: route.params
190
+ })));
191
+ } else {
192
+ const currentRoute = state.routes[state.index];
193
+
194
+ // If the route matches the current one, then navigate to it
195
+ if (action.type === 'NAVIGATE' && action.payload.name === currentRoute.name) {
196
+ route = currentRoute;
197
+ }
198
+ }
199
+ let params;
200
+ if (action.type === 'NAVIGATE' && action.payload.merge && route) {
201
+ params = action.payload.params !== undefined || routeParamList[action.payload.name] !== undefined ? {
202
+ ...routeParamList[action.payload.name],
203
+ ...route.params,
204
+ ...action.payload.params
205
+ } : route.params;
206
+ } else {
207
+ params = routeParamList[action.payload.name] !== undefined ? {
208
+ ...routeParamList[action.payload.name],
209
+ ...action.payload.params
210
+ } : action.payload.params;
211
+ }
176
212
  let routes;
177
213
  if (route) {
178
- routes = state.routes.filter(r => r.key !== route.key);
214
+ const routeKey = route.key;
215
+ routes = state.routes.filter(r => r.key !== routeKey);
179
216
  routes.push({
180
217
  ...route,
181
- params: routeParamList[action.payload.name] !== undefined ? {
182
- ...routeParamList[action.payload.name],
183
- ...action.payload.params
184
- } : action.payload.params
218
+ path: action.type === 'NAVIGATE' && action.payload.path !== undefined ? action.payload.path : route.path,
219
+ params
185
220
  });
186
221
  } else {
187
222
  routes = [...state.routes, {
223
+ key: `${action.payload.name}-${(0, _nonSecure.nanoid)()}`,
224
+ name: action.payload.name,
225
+ path: action.type === 'NAVIGATE' ? action.payload.path : undefined,
226
+ params
227
+ }];
228
+ }
229
+ return {
230
+ ...state,
231
+ index: routes.length - 1,
232
+ routes
233
+ };
234
+ }
235
+ case 'NAVIGATE_DEPRECATED':
236
+ {
237
+ if (!state.routeNames.includes(action.payload.name)) {
238
+ return null;
239
+ }
240
+
241
+ // If the route already exists, navigate to that
242
+ let index = -1;
243
+ const getId = options.routeGetIdList[action.payload.name];
244
+ const id = getId === null || getId === void 0 ? void 0 : getId({
245
+ params: action.payload.params
246
+ });
247
+ if (id) {
248
+ index = state.routes.findIndex(route => route.name === action.payload.name && id === (getId === null || getId === void 0 ? void 0 : getId({
249
+ params: route.params
250
+ })));
251
+ } else if (state.routes[state.index].name === action.payload.name) {
252
+ index = state.index;
253
+ } else {
254
+ for (let i = state.routes.length - 1; i >= 0; i--) {
255
+ if (state.routes[i].name === action.payload.name) {
256
+ index = i;
257
+ break;
258
+ }
259
+ }
260
+ }
261
+ if (index === -1) {
262
+ const routes = [...state.routes, {
188
263
  key: `${action.payload.name}-${(0, _nonSecure.nanoid)()}`,
189
264
  name: action.payload.name,
190
265
  params: routeParamList[action.payload.name] !== undefined ? {
@@ -192,14 +267,35 @@ function StackRouter(options) {
192
267
  ...action.payload.params
193
268
  } : action.payload.params
194
269
  }];
270
+ return {
271
+ ...state,
272
+ routes,
273
+ index: routes.length - 1
274
+ };
275
+ }
276
+ const route = state.routes[index];
277
+ let params;
278
+ if (action.payload.merge) {
279
+ params = action.payload.params !== undefined || routeParamList[route.name] !== undefined ? {
280
+ ...routeParamList[route.name],
281
+ ...route.params,
282
+ ...action.payload.params
283
+ } : route.params;
284
+ } else {
285
+ params = routeParamList[route.name] !== undefined ? {
286
+ ...routeParamList[route.name],
287
+ ...action.payload.params
288
+ } : action.payload.params;
195
289
  }
196
290
  return {
197
291
  ...state,
198
- index: routes.length - 1,
199
- routes
292
+ index,
293
+ routes: [...state.routes.slice(0, index), params !== route.params ? {
294
+ ...route,
295
+ params
296
+ } : state.routes[index]]
200
297
  };
201
298
  }
202
- return null;
203
299
  case 'POP':
204
300
  {
205
301
  const index = action.target === state.key && action.source ? state.routes.findIndex(r => r.key === action.source) : state.index;
@@ -221,16 +317,15 @@ function StackRouter(options) {
221
317
  count: state.routes.length - 1
222
318
  }
223
319
  }, options);
224
- case 'NAVIGATE':
225
- if (action.payload.name !== undefined && !state.routeNames.includes(action.payload.name)) {
226
- return null;
227
- }
228
- if (action.payload.key || action.payload.name) {
320
+ case 'POP_TO':
321
+ {
322
+ if (!state.routeNames.includes(action.payload.name)) {
323
+ return null;
324
+ }
325
+
229
326
  // If the route already exists, navigate to that
230
327
  let index = -1;
231
- const getId =
232
- // `getId` and `key` can't be used together
233
- action.payload.key === undefined && action.payload.name !== undefined ? options.routeGetIdList[action.payload.name] : undefined;
328
+ const getId = options.routeGetIdList[action.payload.name];
234
329
  const id = getId === null || getId === void 0 ? void 0 : getId({
235
330
  params: action.payload.params
236
331
  });
@@ -238,24 +333,22 @@ function StackRouter(options) {
238
333
  index = state.routes.findIndex(route => route.name === action.payload.name && id === (getId === null || getId === void 0 ? void 0 : getId({
239
334
  params: route.params
240
335
  })));
241
- } else if (state.routes[state.index].name === action.payload.name && action.payload.key === undefined || state.routes[state.index].key === action.payload.key) {
336
+ } else if (state.routes[state.index].name === action.payload.name) {
242
337
  index = state.index;
243
338
  } else {
244
339
  for (let i = state.routes.length - 1; i >= 0; i--) {
245
- if (state.routes[i].name === action.payload.name && action.payload.key === undefined || state.routes[i].key === action.payload.key) {
340
+ if (state.routes[i].name === action.payload.name) {
246
341
  index = i;
247
342
  break;
248
343
  }
249
344
  }
250
345
  }
251
- if (index === -1 && action.payload.key && action.payload.name === undefined) {
252
- return null;
253
- }
254
- if (index === -1 && action.payload.name !== undefined) {
255
- const routes = [...state.routes, {
256
- key: action.payload.key ?? `${action.payload.name}-${(0, _nonSecure.nanoid)()}`,
346
+
347
+ // If the route doesn't exist, remove the current route and add the new one
348
+ if (index === -1) {
349
+ const routes = [...state.routes.slice(0, -1), {
350
+ key: `${action.payload.name}-${(0, _nonSecure.nanoid)()}`,
257
351
  name: action.payload.name,
258
- path: action.payload.path,
259
352
  params: routeParamList[action.payload.name] !== undefined ? {
260
353
  ...routeParamList[action.payload.name],
261
354
  ...action.payload.params
@@ -284,14 +377,12 @@ function StackRouter(options) {
284
377
  return {
285
378
  ...state,
286
379
  index,
287
- routes: [...state.routes.slice(0, index), params !== route.params || action.payload.path && action.payload.path !== route.path ? {
380
+ routes: [...state.routes.slice(0, index), params !== route.params ? {
288
381
  ...route,
289
- path: action.payload.path ?? route.path,
290
382
  params
291
383
  } : state.routes[index]]
292
384
  };
293
385
  }
294
- return null;
295
386
  case 'GO_BACK':
296
387
  if (state.index > 0) {
297
388
  return router.getStateForAction(state, {
@@ -1 +1 @@
1
- {"version":3,"names":["StackActions","replace","name","params","type","payload","push","pop","count","popToTop","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","max","concat","path","merge","actionCreators"],"sourceRoot":"../../src","sources":["StackRouter.tsx"],"mappings":"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"}
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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"}
@@ -181,13 +181,9 @@ function TabRouter(_ref) {
181
181
  switch (action.type) {
182
182
  case 'JUMP_TO':
183
183
  case 'NAVIGATE':
184
+ case 'NAVIGATE_DEPRECATED':
184
185
  {
185
- let index = -1;
186
- if (action.type === 'NAVIGATE' && action.payload.key) {
187
- index = state.routes.findIndex(route => route.key === action.payload.key);
188
- } else {
189
- index = state.routes.findIndex(route => route.name === action.payload.name);
190
- }
186
+ const index = state.routes.findIndex(route => route.name === action.payload.name);
191
187
  if (index === -1) {
192
188
  return null;
193
189
  }
@@ -198,7 +194,7 @@ function TabRouter(_ref) {
198
194
  return route;
199
195
  }
200
196
  let params;
201
- if (action.type === 'NAVIGATE' && action.payload.merge) {
197
+ if ((action.type === 'NAVIGATE' || action.type === 'NAVIGATE_DEPRECATED') && action.payload.merge) {
202
198
  params = action.payload.params !== undefined || routeParamList[route.name] !== undefined ? {
203
199
  ...routeParamList[route.name],
204
200
  ...route.params,
@@ -239,9 +235,6 @@ function TabRouter(_ref) {
239
235
  return _BaseRouter.default.getStateForAction(state, action);
240
236
  }
241
237
  },
242
- shouldActionChangeFocus(action) {
243
- return action.type === 'NAVIGATE';
244
- },
245
238
  actionCreators: TabActions
246
239
  };
247
240
  return router;
@@ -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","merge","path","previousKey","slice","shouldActionChangeFocus","actionCreators"],"sourceRoot":"../../src","sources":["TabRouter.tsx"],"mappings":"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"}
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","merge","path","previousKey","slice","actionCreators"],"sourceRoot":"../../src","sources":["TabRouter.tsx"],"mappings":"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"}
@@ -48,7 +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
54
  export default BaseRouter;
@@ -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;EACjBC,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;EACnC;AACF,CAAC;AAED,eAAeJ,UAAU"}
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;EACjBC,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;AAED,eAAeJ,UAAU"}
@@ -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('key') && !payload.hasOwnProperty('name')) {
19
- throw new Error('You need to specify name or key when calling navigate with an object as the argument. See https://reactnavigation.org/docs/navigation-actions#navigate for usage.');
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":"AAgDA,OAAO,SAASA,MAAM,GAAW;EAC/B,OAAO;IAAEC,IAAI,EAAE;EAAU,CAAC;AAC5B;AAeA;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,KAAK,CAAC,IAAI,CAACH,OAAO,CAACG,cAAc,CAAC,MAAM,CAAC,EAAE;MACrE,MAAM,IAAIC,KAAK,CACb,mKAAmK,CACpK;IACH;IAEA,OAAO;MAAEN,IAAI,EAAE,UAAU;MAAEE;IAAQ,CAAC;EACtC;AACF;AAEA,OAAO,SAASK,KAAK,CAACC,KAA6B,EAAU;EAC3D,OAAO;IAAER,IAAI,EAAE,OAAO;IAAEE,OAAO,EAAEM;EAAM,CAAC;AAC1C;AAEA,OAAO,SAASC,SAAS,CAACL,MAAc,EAAU;EAChD,OAAO;IAAEJ,IAAI,EAAE,YAAY;IAAEE,OAAO,EAAE;MAAEE;IAAO;EAAE,CAAC;AACpD"}
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"}
@@ -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","TabRouter","TabActions","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
+ {"version":3,"names":["nanoid","TabRouter","TabActions","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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"}