@react-navigation/routers 8.0.0-alpha.19 → 8.0.0-alpha.20

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 (6) hide show
  1. package/lib/module/StackRouter.js +4 -25
  2. package/lib/module/StackRouter.js.map +1 -1
  3. package/lib/typescript/src/StackRouter.d.ts +9 -13
  4. package/lib/typescript/src/StackRouter.d.ts.map +1 -1
  5. package/package.json +2 -2
  6. package/src/StackRouter.tsx +14 -46
package/lib/module/StackRouter.js CHANGED
@@ -54,11 +54,10 @@ export const StackActions = {
54
54
  }
55
55
  };
56
56
  },
57
- remove(name, count = 1) {
57
+ dismiss(count = 1) {
58
58
  return {
59
- type: 'REMOVE',
59
+ type: 'DISMISS',
60
60
  payload: {
61
- name,
62
61
  count
63
62
  }
64
63
  };
@@ -420,29 +419,9 @@ export function StackRouter(options) {
420
419
  }
421
420
  return null;
422
421
  }
423
- case 'REMOVE':
422
+ case 'DISMISS':
424
423
  {
425
- if (!state.routeNames.includes(action.payload.name)) {
426
- return null;
427
- }
428
- let currentIndex = action.source !== undefined ? state.routes.findIndex(r => r.key === action.source) : state.index;
429
- if (currentIndex === -1) {
430
- return null;
431
- }
432
- if (currentIndex > state.index) {
433
- const route = state.routes[currentIndex];
434
- if (route?.name !== action.payload.name) {
435
- return null;
436
- }
437
- return {
438
- ...state,
439
- routes: state.routes.filter(r => r.key !== route.key),
440
- retainedRouteKeys: state.retainedRouteKeys.filter(key => key !== route.key)
441
- };
442
- }
443
- if (routes[currentIndex]?.name !== action.payload.name) {
444
- currentIndex = routes.findLastIndex(route => route.name === action.payload.name);
445
- }
424
+ const currentIndex = action.source !== undefined ? routes.findIndex(route => route.key === action.source) : state.index;
446
425
  if (currentIndex === -1 || routes.length === 1 || action.payload.count < 1) {
447
426
  return null;
448
427
  }
package/lib/module/StackRouter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["nanoid","BaseRouter","createParamsFromAction","createRouteFromAction","StackActions","replace","name","params","type","payload","push","pop","count","popToTop","popTo","options","merge","retain","enable","remove","retainRoutes","previousState","nextState","retainedRouteKeys","length","retainedRouteKeySet","Set","nextRouteKeySet","routes","map","route","key","retainedRoutes","getActiveRoutes","filter","has","removedRetainedRouteKeys","getStateWithRoutes","getPreloadedRoutes","concat","getRetainedRoutes","state","slice","index","getInactiveRoutes","activeRoutes","preloadedRoutes","routeKeySet","filteredRetainedRoutes","filteredPreloadedRoutes","StackRouter","router","getInitialState","routeNames","routeParamList","initialRouteName","undefined","includes","Error","stale","getRehydratedState","partialState","Math","min","max","routeKeys","getStateForRouteNamesChange","routeKeyChanges","getStateForRouteFocus","find","at","indexOf","getStateForAction","action","inactiveRoutes","currentIndex","source","findIndex","r","getId","routeGetIdList","id","i","remainingRoutes","history","j","historyEntry","findLast","nextRoutes","path","end","last","removed","currentRoute","findLastIndex","firstIndex","historyIndex","baseParams","target","routeKey","some","actionCreators"],"sourceRoot":"../../src","sources":["StackRouter.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["nanoid","BaseRouter","createParamsFromAction","createRouteFromAction","StackActions","replace","name","params","type","payload","push","pop","count","popToTop","popTo","options","merge","retain","enable","dismiss","retainRoutes","previousState","nextState","retainedRouteKeys","length","retainedRouteKeySet","Set","nextRouteKeySet","routes","map","route","key","retainedRoutes","getActiveRoutes","filter","has","removedRetainedRouteKeys","getStateWithRoutes","getPreloadedRoutes","concat","getRetainedRoutes","state","slice","index","getInactiveRoutes","activeRoutes","preloadedRoutes","routeKeySet","filteredRetainedRoutes","filteredPreloadedRoutes","StackRouter","router","getInitialState","routeNames","routeParamList","initialRouteName","undefined","includes","Error","stale","getRehydratedState","partialState","Math","min","max","routeKeys","getStateForRouteNamesChange","routeKeyChanges","getStateForRouteFocus","find","at","indexOf","getStateForAction","action","inactiveRoutes","currentIndex","source","findIndex","r","getId","routeGetIdList","id","i","remainingRoutes","history","j","historyEntry","findLast","nextRoutes","path","end","last","removed","currentRoute","firstIndex","historyIndex","baseParams","target","routeKey","some","actionCreators"],"sourceRoot":"../../src","sources":["StackRouter.tsx"],"mappings":"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","ignoreList":[]}
package/lib/typescript/src/StackRouter.d.ts CHANGED
@@ -43,9 +43,8 @@ export type StackActionType = {
43
43
  source?: string | undefined;
44
44
  target?: string | undefined;
45
45
  } | {
46
- type: 'REMOVE';
46
+ type: 'DISMISS';
47
47
  payload: {
48
- name: string;
49
48
  count: number;
50
49
  };
51
50
  source?: string | undefined;
@@ -66,7 +65,7 @@ export type StackNavigationState<ParamList extends ParamListBase> = NavigationSt
66
65
  };
67
66
  export type StackActionHelpers<ParamList extends ParamListBase> = {
68
67
  /**
69
- * Replace the current route with a new one.
68
+ * Replace the current screen with a new one.
70
69
  *
71
70
  * @param screen Name of the new route that will replace the current one.
72
71
  * @param [params] Params object for the new route.
@@ -81,12 +80,13 @@ export type StackActionHelpers<ParamList extends ParamListBase> = {
81
80
  push<RouteName extends keyof ParamList>(...args: RouteName extends unknown ? undefined extends ParamList[RouteName] ? [screen: RouteName, params?: ParamList[RouteName]] : [screen: RouteName, params: ParamList[RouteName]] : never): void;
82
81
  /**
83
82
  * Pop a history entry from the stack.
83
+ * Also dismisses any screens above the current one.
84
84
  *
85
85
  * @param [count=1] Number of history entries to pop. Defaults to 1.
86
86
  */
87
87
  pop(count?: number): void;
88
88
  /**
89
- * Pop to the first route in the stack, dismissing all other screens.
89
+ * Pop to the first screen in the stack, dismissing all other screens.
90
90
  */
91
91
  popToTop(): void;
92
92
  /**
@@ -120,14 +120,11 @@ export type StackActionHelpers<ParamList extends ParamListBase> = {
120
120
  */
121
121
  retain(enable: boolean): void;
122
122
  /**
123
- * Remove the specified screen from the stack.
124
- *
125
- * The `count` parameter has no effect when removing preloaded or retained screens.
123
+ * Dismiss a screen from the stack.
126
124
  *
127
- * @param screen Name of the route to remove.
128
- * @param [count=1] Number of screens to remove. Defaults to 1.
125
+ * @param [count=1] Number of screens to dismiss. Defaults to 1.
129
126
  */
130
- remove(screen: keyof ParamList, count?: number): void;
127
+ dismiss(count?: number): void;
131
128
  };
132
129
  export declare const StackActions: {
133
130
  replace(name: string, params?: object): {
@@ -169,10 +166,9 @@ export declare const StackActions: {
169
166
  readonly enable: boolean;
170
167
  };
171
168
  };
172
- remove(name: string, count?: number): {
173
- readonly type: "REMOVE";
169
+ dismiss(count?: number): {
170
+ readonly type: "DISMISS";
174
171
  readonly payload: {
175
- readonly name: string;
176
172
  readonly count: number;
177
173
  };
178
174
  };
package/lib/typescript/src/StackRouter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"StackRouter.d.ts","sourceRoot":"","sources":["../../../src/StackRouter.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAEV,oBAAoB,EACpB,eAAe,EACf,aAAa,EAEb,MAAM,EACP,MAAM,YAAS,CAAC;AAEjB,MAAM,MAAM,eAAe,GACvB;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IACvD,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IACvD,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,GACD;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;KAC7B,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEN,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEtD,MAAM,MAAM,oBAAoB,CAAC,SAAS,SAAS,aAAa,IAC9D,eAAe,CAAC,SAAS,CAAC,GAAG;IAC3B;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;IACd;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAEJ,MAAM,MAAM,kBAAkB,CAAC,SAAS,SAAS,aAAa,IAAI;IAChE;;;;;OAKG;IACH,OAAO,CAAC,SAAS,SAAS,MAAM,SAAS,EACvC,GAAG,IAAI,EAAE,SAAS,SAAS,OAAO,GAC9B,SAAS,SAAS,SAAS,CAAC,SAAS,CAAC,GACpC,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,GAClD,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,GACnD,KAAK,GACR,IAAI,CAAC;IAER;;;;;OAKG;IACH,IAAI,CAAC,SAAS,SAAS,MAAM,SAAS,EACpC,GAAG,IAAI,EAAE,SAAS,SAAS,OAAO,GAC9B,SAAS,SAAS,SAAS,CAAC,SAAS,CAAC,GACpC,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,GAClD,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,GACnD,KAAK,GACR,IAAI,CAAC;IAER;;;;OAIG;IACH,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE1B;;OAEG;IACH,QAAQ,IAAI,IAAI,CAAC;IAEjB;;;;;;;OAOG;IACH,KAAK,CAAC,SAAS,SAAS,MAAM,SAAS,EACrC,GAAG,IAAI,EAAE,SAAS,SAAS,OAAO,GAC9B,SAAS,SAAS,SAAS,CAAC,SAAS,CAAC,GACpC;QACE,MAAM,EAAE,SAAS;QACjB,MAAM,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC;QAC7B,OAAO,CAAC,EAAE;YAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;SAAE;KAC1C,GACD;QACE,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC;QAC5B,OAAO,CAAC,EAAE;YAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;SAAE;KAC1C,GACH,KAAK,GACR,IAAI,CAAC;IAER;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IAE9B;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvD,CAAC;AAEF,eAAO,MAAM,YAAY;kBACT,MAAM,WAAW,MAAM;;;;;;;eAM1B,MAAM,WAAW,MAAM;;;;;;;gBAMvB,MAAM;;;;;;;;;gBAUT,MAAM,WACH,MAAM,YACL;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;KAAE;;;;;;;;mBAW5B,OAAO;;;;;;iBAMT,MAAM,UAAS,MAAM;;;;;;;CAMnC,CAAC;AA6FF,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,sGAgzBtD"}
1
+ {"version":3,"file":"StackRouter.d.ts","sourceRoot":"","sources":["../../../src/StackRouter.tsx"],"names":[],"mappings":"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"}
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": "8.0.0-alpha.19",
4
+ "version": "8.0.0-alpha.20",
5
5
  "keywords": [
6
6
  "react",
7
7
  "react-native",
@@ -67,5 +67,5 @@
67
67
  ]
68
68
  ]
69
69
  },
70
- "gitHead": "110f8e897f476977b7227e5f0326996106a742f0"
70
+ "gitHead": "201473e290e52fc2847cd61025cf068f7ec1a54d"
71
71
  }
package/src/StackRouter.tsx CHANGED
@@ -53,8 +53,8 @@ export type StackActionType =
53
53
  target?: string | undefined;
54
54
  }
55
55
  | {
56
- type: 'REMOVE';
57
- payload: { name: string; count: number };
56
+ type: 'DISMISS';
57
+ payload: { count: number };
58
58
  source?: string | undefined;
59
59
  target?: string | undefined;
60
60
  };
@@ -77,7 +77,7 @@ export type StackNavigationState<ParamList extends ParamListBase> =
77
77
 
78
78
  export type StackActionHelpers<ParamList extends ParamListBase> = {
79
79
  /**
80
- * Replace the current route with a new one.
80
+ * Replace the current screen with a new one.
81
81
  *
82
82
  * @param screen Name of the new route that will replace the current one.
83
83
  * @param [params] Params object for the new route.
@@ -106,13 +106,14 @@ export type StackActionHelpers<ParamList extends ParamListBase> = {
106
106
 
107
107
  /**
108
108
  * Pop a history entry from the stack.
109
+ * Also dismisses any screens above the current one.
109
110
  *
110
111
  * @param [count=1] Number of history entries to pop. Defaults to 1.
111
112
  */
112
113
  pop(count?: number): void;
113
114
 
114
115
  /**
115
- * Pop to the first route in the stack, dismissing all other screens.
116
+ * Pop to the first screen in the stack, dismissing all other screens.
116
117
  */
117
118
  popToTop(): void;
118
119
 
@@ -151,14 +152,11 @@ export type StackActionHelpers<ParamList extends ParamListBase> = {
151
152
  retain(enable: boolean): void;
152
153
 
153
154
  /**
154
- * Remove the specified screen from the stack.
155
- *
156
- * The `count` parameter has no effect when removing preloaded or retained screens.
155
+ * Dismiss a screen from the stack.
157
156
  *
158
- * @param screen Name of the route to remove.
159
- * @param [count=1] Number of screens to remove. Defaults to 1.
157
+ * @param [count=1] Number of screens to dismiss. Defaults to 1.
160
158
  */
161
- remove(screen: keyof ParamList, count?: number): void;
159
+ dismiss(count?: number): void;
162
160
  };
163
161
 
164
162
  export const StackActions = {
@@ -203,10 +201,10 @@ export const StackActions = {
203
201
  payload: { enable },
204
202
  } as const satisfies StackActionType;
205
203
  },
206
- remove(name: string, count: number = 1) {
204
+ dismiss(count: number = 1) {
207
205
  return {
208
- type: 'REMOVE',
209
- payload: { name, count },
206
+ type: 'DISMISS',
207
+ payload: { count },
210
208
  } as const satisfies StackActionType;
211
209
  },
212
210
  };
@@ -766,42 +764,12 @@ export function StackRouter(options: StackRouterOptions) {
766
764
  return null;
767
765
  }
768
766
 
769
- case 'REMOVE': {
770
- if (!state.routeNames.includes(action.payload.name)) {
771
- return null;
772
- }
773
-
774
- let currentIndex =
767
+ case 'DISMISS': {
768
+ const currentIndex =
775
769
  action.source !== undefined
776
- ? state.routes.findIndex((r) => r.key === action.source)
770
+ ? routes.findIndex((route) => route.key === action.source)
777
771
  : state.index;
778
772
 
779
- if (currentIndex === -1) {
780
- return null;
781
- }
782
-
783
- if (currentIndex > state.index) {
784
- const route = state.routes[currentIndex];
785
-
786
- if (route?.name !== action.payload.name) {
787
- return null;
788
- }
789
-
790
- return {
791
- ...state,
792
- routes: state.routes.filter((r) => r.key !== route.key),
793
- retainedRouteKeys: state.retainedRouteKeys.filter(
794
- (key) => key !== route.key
795
- ),
796
- };
797
- }
798
-
799
- if (routes[currentIndex]?.name !== action.payload.name) {
800
- currentIndex = routes.findLastIndex(
801
- (route) => route.name === action.payload.name
802
- );
803
- }
804
-
805
773
  if (
806
774
  currentIndex === -1 ||
807
775
  routes.length === 1 ||