@react-navigation/routers 6.1.8 → 7.0.0-alpha.1

package/src/StackRouter.tsx

@@ -1,6 +1,6 @@
 import { nanoid } from 'nanoid/non-secure';
 
-import BaseRouter from './BaseRouter';
+import { BaseRouter } from './BaseRouter';
 import type {
   CommonNavigationAction,
   DefaultRouterOptions,
@@ -13,7 +13,7 @@ import type {
 export type StackActionType =
   | {
       type: 'REPLACE';
-      payload: { name: string; key?: string | undefined; params?: object };
+      payload: { name: string; params?: object };
       source?: string;
       target?: string;
     }
@@ -33,6 +33,16 @@ export type StackActionType =
       type: 'POP_TO_TOP';
       source?: string;
       target?: string;
+    }
+  | {
+      type: 'POP_TO';
+      payload: {
+        name: string;
+        params?: object;
+        merge?: boolean;
+      };
+      source?: string;
+      target?: string;
     };
 
 export type StackRouterOptions = DefaultRouterOptions;
@@ -79,6 +89,30 @@ export type StackActionHelpers<ParamList extends ParamListBase> = {
    * Pop to the first route in the stack, dismissing all other screens.
    */
   popToTop(): void;
+
+  /**
+   * Pop any screens to go back to the specified screen.
+   * If the specified screen doesn't exist, it'll be added to the stack.
+   *
+   * @param name Name of the route to navigate to.
+   * @param [params] Params object for the route.
+   * @param [merge] Whether to merge the params onto the route.
+   */
+  popTo<RouteName extends keyof ParamList>(
+    ...args: // This condition allows us to iterate over a union type, similar to navigate
+    RouteName extends unknown
+      ? // This condition checks if the params are optional,
+        // which means it's either undefined or a union with undefined
+        undefined extends ParamList[RouteName]
+        ?
+            | [screen: RouteName]
+            | [screen: RouteName, params: ParamList[RouteName]]
+            | [screen: RouteName, params: ParamList[RouteName], merge: boolean]
+        :
+            | [screen: RouteName, params: ParamList[RouteName]]
+            | [screen: RouteName, params: ParamList[RouteName], merge: boolean]
+      : never
+  ): void;
 };
 
 export const StackActions = {
@@ -94,9 +128,12 @@ export const StackActions = {
   popToTop(): StackActionType {
     return { type: 'POP_TO_TOP' };
   },
+  popTo(name: string, params?: object, merge?: boolean): StackActionType {
+    return { type: 'POP_TO', payload: { name, params, merge } };
+  },
 };
 
-export default function StackRouter(options: StackRouterOptions) {
+export function StackRouter(options: StackRouterOptions) {
   const router: Router<
     StackNavigationState<ParamListBase>,
     CommonNavigationAction | StackActionType
@@ -235,7 +272,7 @@ export default function StackRouter(options: StackRouterOptions) {
             return null;
           }
 
-          const { name, key, params } = action.payload;
+          const { name, params } = action.payload;
 
           if (!state.routeNames.includes(name)) {
             return null;
@@ -246,7 +283,7 @@ export default function StackRouter(options: StackRouterOptions) {
             routes: state.routes.map((route, i) =>
               i === index
                 ? {
-                    key: key !== undefined ? key : `${name}-${nanoid()}`,
+                    key: `${name}-${nanoid()}`,
                     name,
                     params:
                       routeParamList[name] !== undefined
@@ -262,24 +299,124 @@ export default function StackRouter(options: StackRouterOptions) {
         }
 
         case 'PUSH':
-          if (state.routeNames.includes(action.payload.name)) {
-            const getId = options.routeGetIdList[action.payload.name];
-            const id = getId?.({ params: action.payload.params });
-
-            const route = id
-              ? state.routes.find(
-                  (route) =>
-                    route.name === action.payload.name &&
-                    id === getId?.({ params: route.params })
-                )
-              : undefined;
-
-            let routes: Route<string>[];
-
-            if (route) {
-              routes = state.routes.filter((r) => r.key !== route.key);
-              routes.push({
-                ...route,
+        case 'NAVIGATE': {
+          if (!state.routeNames.includes(action.payload.name)) {
+            return null;
+          }
+
+          const getId = options.routeGetIdList[action.payload.name];
+          const id = getId?.({ params: action.payload.params });
+
+          let route: Route<string> | undefined;
+
+          if (id !== undefined) {
+            route = state.routes.find(
+              (route) =>
+                route.name === action.payload.name &&
+                id === getId?.({ params: route.params })
+            );
+          } else {
+            const currentRoute = state.routes[state.index];
+
+            // If the route matches the current one, then navigate to it
+            if (
+              action.type === 'NAVIGATE' &&
+              action.payload.name === currentRoute.name
+            ) {
+              route = currentRoute;
+            }
+          }
+
+          let params;
+
+          if (action.type === 'NAVIGATE' && action.payload.merge && route) {
+            params =
+              action.payload.params !== undefined ||
+              routeParamList[action.payload.name] !== undefined
+                ? {
+                    ...routeParamList[action.payload.name],
+                    ...route.params,
+                    ...action.payload.params,
+                  }
+                : route.params;
+          } else {
+            params =
+              routeParamList[action.payload.name] !== undefined
+                ? {
+                    ...routeParamList[action.payload.name],
+                    ...action.payload.params,
+                  }
+                : action.payload.params;
+          }
+
+          let routes: Route<string>[];
+
+          if (route) {
+            const routeKey = route.key;
+
+            routes = state.routes.filter((r) => r.key !== routeKey);
+            routes.push({
+              ...route,
+              path:
+                action.type === 'NAVIGATE' && action.payload.path !== undefined
+                  ? action.payload.path
+                  : route.path,
+              params,
+            });
+          } else {
+            routes = [
+              ...state.routes,
+              {
+                key: `${action.payload.name}-${nanoid()}`,
+                name: action.payload.name,
+                path:
+                  action.type === 'NAVIGATE' ? action.payload.path : undefined,
+                params,
+              },
+            ];
+          }
+
+          return {
+            ...state,
+            index: routes.length - 1,
+            routes,
+          };
+        }
+
+        case 'NAVIGATE_DEPRECATED': {
+          if (!state.routeNames.includes(action.payload.name)) {
+            return null;
+          }
+
+          // If the route already exists, navigate to that
+          let index = -1;
+
+          const getId = options.routeGetIdList[action.payload.name];
+          const id = getId?.({ params: action.payload.params });
+
+          if (id) {
+            index = state.routes.findIndex(
+              (route) =>
+                route.name === action.payload.name &&
+                id === getId?.({ params: route.params })
+            );
+          } else if (state.routes[state.index].name === action.payload.name) {
+            index = state.index;
+          } else {
+            for (let i = state.routes.length - 1; i >= 0; i--) {
+              if (state.routes[i].name === action.payload.name) {
+                index = i;
+                break;
+              }
+            }
+          }
+
+          if (index === -1) {
+            const routes = [
+              ...state.routes,
+              {
+                key: `${action.payload.name}-${nanoid()}`,
+                name: action.payload.name,
                 params:
                   routeParamList[action.payload.name] !== undefined
                     ? {
@@ -287,32 +424,51 @@ export default function StackRouter(options: StackRouterOptions) {
                         ...action.payload.params,
                       }
                     : action.payload.params,
-              });
-            } else {
-              routes = [
-                ...state.routes,
-                {
-                  key: `${action.payload.name}-${nanoid()}`,
-                  name: action.payload.name,
-                  params:
-                    routeParamList[action.payload.name] !== undefined
-                      ? {
-                          ...routeParamList[action.payload.name],
-                          ...action.payload.params,
-                        }
-                      : action.payload.params,
-                },
-              ];
-            }
+              },
+            ];
 
             return {
               ...state,
-              index: routes.length - 1,
               routes,
+              index: routes.length - 1,
             };
           }
 
-          return null;
+          const route = state.routes[index];
+
+          let params;
+
+          if (action.payload.merge) {
+            params =
+              action.payload.params !== undefined ||
+              routeParamList[route.name] !== undefined
+                ? {
+                    ...routeParamList[route.name],
+                    ...route.params,
+                    ...action.payload.params,
+                  }
+                : route.params;
+          } else {
+            params =
+              routeParamList[route.name] !== undefined
+                ? {
+                    ...routeParamList[route.name],
+                    ...action.payload.params,
+                  }
+                : action.payload.params;
+          }
+
+          return {
+            ...state,
+            index,
+            routes: [
+              ...state.routes.slice(0, index),
+              params !== route.params
+                ? { ...route, params }
+                : state.routes[index],
+            ],
+          };
+        }
 
         case 'POP': {
           const index =
@@ -346,126 +502,93 @@ export default function StackRouter(options: StackRouterOptions) {
             options
           );
 
-        case 'NAVIGATE':
-          if (
-            action.payload.name !== undefined &&
-            !state.routeNames.includes(action.payload.name)
-          ) {
+        case 'POP_TO': {
+          if (!state.routeNames.includes(action.payload.name)) {
             return null;
           }
 
-          if (action.payload.key || action.payload.name) {
-            // If the route already exists, navigate to that
-            let index = -1;
-
-            const getId =
-              // `getId` and `key` can't be used together
-              action.payload.key === undefined &&
-              action.payload.name !== undefined
-                ? options.routeGetIdList[action.payload.name]
-                : undefined;
-            const id = getId?.({ params: action.payload.params });
-
-            if (id) {
-              index = state.routes.findIndex(
-                (route) =>
-                  route.name === action.payload.name &&
-                  id === getId?.({ params: route.params })
-              );
-            } else if (
-              (state.routes[state.index].name === action.payload.name &&
-                action.payload.key === undefined) ||
-              state.routes[state.index].key === action.payload.key
-            ) {
-              index = state.index;
-            } else {
-              for (let i = state.routes.length - 1; i >= 0; i--) {
-                if (
-                  (state.routes[i].name === action.payload.name &&
-                    action.payload.key === undefined) ||
-                  state.routes[i].key === action.payload.key
-                ) {
-                  index = i;
-                  break;
-                }
-              }
-            }
+          // If the route already exists, navigate to that
+          let index = -1;
 
-            if (
-              index === -1 &&
-              action.payload.key &&
-              action.payload.name === undefined
-            ) {
-              return null;
-            }
+          const getId = options.routeGetIdList[action.payload.name];
+          const id = getId?.({ params: action.payload.params });
 
-            if (index === -1 && action.payload.name !== undefined) {
-              const routes = [
-                ...state.routes,
-                {
-                  key:
-                    action.payload.key ?? `${action.payload.name}-${nanoid()}`,
-                  name: action.payload.name,
-                  path: action.payload.path,
-                  params:
-                    routeParamList[action.payload.name] !== undefined
-                      ? {
-                          ...routeParamList[action.payload.name],
-                          ...action.payload.params,
-                        }
-                      : action.payload.params,
-                },
-              ];
-
-              return {
-                ...state,
-                routes,
-                index: routes.length - 1,
-              };
+          if (id) {
+            index = state.routes.findIndex(
+              (route) =>
+                route.name === action.payload.name &&
+                id === getId?.({ params: route.params })
+            );
+          } else if (state.routes[state.index].name === action.payload.name) {
+            index = state.index;
+          } else {
+            for (let i = state.routes.length - 1; i >= 0; i--) {
+              if (state.routes[i].name === action.payload.name) {
+                index = i;
+                break;
+              }
             }
+          }
 
-            const route = state.routes[index];
-
-            let params;
-
-            if (action.payload.merge) {
-              params =
-                action.payload.params !== undefined ||
-                routeParamList[route.name] !== undefined
-                  ? {
-                      ...routeParamList[route.name],
-                      ...route.params,
-                      ...action.payload.params,
-                    }
-                  : route.params;
-            } else {
-              params =
-                routeParamList[route.name] !== undefined
-                  ? {
-                      ...routeParamList[route.name],
-                      ...action.payload.params,
-                    }
-                  : action.payload.params;
-            }
+          // If the route doesn't exist, remove the current route and add the new one
+          if (index === -1) {
+            const routes = [
+              ...state.routes.slice(0, -1),
+              {
+                key: `${action.payload.name}-${nanoid()}`,
+                name: action.payload.name,
+                params:
+                  routeParamList[action.payload.name] !== undefined
+                    ? {
+                        ...routeParamList[action.payload.name],
+                        ...action.payload.params,
+                      }
+                    : action.payload.params,
+              },
+            ];
 
             return {
               ...state,
-              index,
-              routes: [
-                ...state.routes.slice(0, index),
-                params !== route.params ||
-                (action.payload.path && action.payload.path !== route.path)
-                  ? {
-                      ...route,
-                      path: action.payload.path ?? route.path,
-                      params,
-                    }
-                  : state.routes[index],
-              ],
+              routes,
+              index: routes.length - 1,
             };
           }
 
-          return null;
+          const route = state.routes[index];
+
+          let params;
+
+          if (action.payload.merge) {
+            params =
+              action.payload.params !== undefined ||
+              routeParamList[route.name] !== undefined
+                ? {
+                    ...routeParamList[route.name],
+                    ...route.params,
+                    ...action.payload.params,
+                  }
+                : route.params;
+          } else {
+            params =
+              routeParamList[route.name] !== undefined
+                ? {
+                    ...routeParamList[route.name],
+                    ...action.payload.params,
+                  }
+                : action.payload.params;
+          }
+
+          return {
+            ...state,
+            index,
+            routes: [
+              ...state.routes.slice(0, index),
+              params !== route.params
+                ? { ...route, params }
+                : state.routes[index],
+            ],
+          };
+        }
 
         case 'GO_BACK':
           if (state.index > 0) {

package/src/TabRouter.tsx

@@ -1,6 +1,6 @@
 import { nanoid } from 'nanoid/non-secure';
 
-import BaseRouter from './BaseRouter';
+import { BaseRouter } from './BaseRouter';
 import type {
   CommonNavigationAction,
   DefaultRouterOptions,
@@ -139,7 +139,7 @@ const changeIndex = (
   };
 };
 
-export default function TabRouter({
+export function TabRouter({
   initialRouteName,
   backBehavior = 'firstRoute',
 }: TabRouterOptions) {
@@ -293,18 +293,11 @@ export default function TabRouter({
     getStateForAction(state, action, { routeParamList, routeGetIdList }) {
       switch (action.type) {
         case 'JUMP_TO':
-        case 'NAVIGATE': {
-          let index = -1;
-
-          if (action.type === 'NAVIGATE' && action.payload.key) {
-            index = state.routes.findIndex(
-              (route) => route.key === action.payload.key
-            );
-          } else {
-            index = state.routes.findIndex(
-              (route) => route.name === action.payload.name
-            );
-          }
+        case 'NAVIGATE':
+        case 'NAVIGATE_DEPRECATED': {
+          const index = state.routes.findIndex(
+            (route) => route.name === action.payload.name
+          );
 
           if (index === -1) {
             return null;
@@ -313,8 +306,8 @@ export default function TabRouter({
           return changeIndex(
             {
               ...state,
-              routes: state.routes.map((route, i) => {
-                if (i !== index) {
+              routes: state.routes.map((route) => {
+                if (route.name !== action.payload.name) {
                   return route;
                 }
 
@@ -331,7 +324,8 @@ export default function TabRouter({
                 let params;
 
                 if (
-                  action.type === 'NAVIGATE' &&
+                  (action.type === 'NAVIGATE' ||
+                    action.type === 'NAVIGATE_DEPRECATED') &&
                   action.payload.merge &&
                   currentId === nextId
                 ) {
@@ -396,10 +390,6 @@ export default function TabRouter({
       }
     },
 
-    shouldActionChangeFocus(action) {
-      return action.type === 'NAVIGATE';
-    },
-
     actionCreators: TabActions,
   };
 

package/src/index.tsx

@@ -2,7 +2,7 @@ import * as CommonActions from './CommonActions';
 
 export { CommonActions };
 
-export { default as BaseRouter } from './BaseRouter';
+export { BaseRouter } from './BaseRouter';
 export type {
   DrawerActionHelpers,
   DrawerActionType,
@@ -10,19 +10,19 @@ export type {
   DrawerRouterOptions,
   DrawerStatus,
 } from './DrawerRouter';
-export { DrawerActions, default as DrawerRouter } from './DrawerRouter';
+export { DrawerActions, DrawerRouter } from './DrawerRouter';
 export type {
   StackActionHelpers,
   StackActionType,
   StackNavigationState,
   StackRouterOptions,
 } from './StackRouter';
-export { StackActions, default as StackRouter } from './StackRouter';
+export { StackActions, StackRouter } from './StackRouter';
 export type {
   TabActionHelpers,
   TabActionType,
   TabNavigationState,
   TabRouterOptions,
 } from './TabRouter';
-export { TabActions, default as TabRouter } from './TabRouter';
+export { TabActions, TabRouter } from './TabRouter';
 export * from './types';