@react-navigation/routers 8.0.0-alpha.1 → 8.0.0-alpha.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/routers",
   "description": "Routers to help build custom navigators",
-  "version": "8.0.0-alpha.1",
+  "version": "8.0.0-alpha.10",
   "keywords": [
     "react",
     "react-native",
@@ -41,13 +41,13 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "nanoid": "^3.3.11"
+    "nanoid": "^5.1.7"
   },
   "devDependencies": {
-    "@jest/globals": "^30.0.0",
-    "del-cli": "^6.0.0",
-    "react-native-builder-bob": "^0.40.12",
-    "typescript": "^5.9.2"
+    "@jest/globals": "^30.3.0",
+    "del-cli": "^7.0.0",
+    "react-native-builder-bob": "^0.41.0",
+    "typescript": "^6.0.2"
   },
   "react-native-builder-bob": {
     "source": "src",
@@ -67,5 +67,5 @@
       ]
     ]
   },
-  "gitHead": "9664da8fff3bd7ed575bf12ddfcc47b3a42be997"
+  "gitHead": "11b013e6d14d19aa56f1bcbd3255b4e19083cd6b"
 }

package/src/BaseRouter.tsx

@@ -71,10 +71,12 @@ export const BaseRouter = {
       case 'RESET': {
         const nextState = action.payload as State | PartialState<State>;
 
+        const routeNamesSet = new Set(state.routeNames);
+
         if (
           nextState.routes.length === 0 ||
           nextState.routes.some(
-            (route: { name: string }) => !state.routeNames.includes(route.name)
+            (route: { name: string }) => !routeNamesSet.has(route.name)
           )
         ) {
           return null;
@@ -83,9 +85,7 @@ export const BaseRouter = {
         if (nextState.stale === false) {
           if (
             state.routeNames.length !== nextState.routeNames.length ||
-            nextState.routeNames.some(
-              (name) => !state.routeNames.includes(name)
-            )
+            nextState.routeNames.some((name) => !routeNamesSet.has(name))
           ) {
             return null;
           }

package/src/CommonActions.tsx

@@ -9,59 +9,59 @@ type ResetState =
 
 type GoBackAction = {
   type: 'GO_BACK';
-  source?: string;
-  target?: string;
+  source?: string | undefined;
+  target?: string | undefined;
 };
 
 type NavigateAction = {
   type: 'NAVIGATE';
   payload: {
     name: string;
-    params?: object;
-    path?: string;
-    merge?: boolean;
-    pop?: boolean;
+    params?: object | undefined;
+    path?: string | undefined;
+    merge?: boolean | undefined;
+    pop?: boolean | undefined;
   };
-  source?: string;
-  target?: string;
+  source?: string | undefined;
+  target?: string | undefined;
 };
 
 type ResetAction = {
   type: 'RESET';
-  payload: ResetState | undefined;
-  source?: string;
-  target?: string;
+  payload: ResetState;
+  source?: string | undefined;
+  target?: string | undefined;
 };
 
 type SetParamsAction = {
   type: 'SET_PARAMS';
-  payload: { params?: object };
-  source?: string;
-  target?: string;
+  payload: { params?: object | undefined };
+  source?: string | undefined;
+  target?: string | undefined;
 };
 
 type ReplaceParamsAction = {
   type: 'REPLACE_PARAMS';
-  payload: { params?: object };
-  source?: string;
-  target?: string;
+  payload: { params?: object | undefined };
+  source?: string | undefined;
+  target?: string | undefined;
 };
 
 type PushParamsAction = {
   type: 'PUSH_PARAMS';
-  payload: { params?: object };
-  source?: string;
-  target?: string;
+  payload: { params?: object | undefined };
+  source?: string | undefined;
+  target?: string | undefined;
 };
 
 type PreloadAction = {
   type: 'PRELOAD';
   payload: {
     name: string;
-    params?: object;
+    params?: object | undefined;
   };
-  source?: string;
-  target?: string;
+  source?: string | undefined;
+  target?: string | undefined;
 };
 
 export type Action =
@@ -79,19 +79,21 @@ export function goBack(): Action {
 
 export function navigate(
   name: string,
-  params?: object,
-  options?: {
-    merge?: boolean;
-    pop?: boolean;
-  }
+  params?: object | undefined,
+  options?:
+    | {
+        merge?: boolean | undefined;
+        pop?: boolean | undefined;
+      }
+    | undefined
 ): Action;
 
 export function navigate(options: {
   name: string;
-  params?: object;
-  path?: string;
-  merge?: boolean;
-  pop?: boolean;
+  params?: object | undefined;
+  path?: string | undefined;
+  merge?: boolean | undefined;
+  pop?: boolean | undefined;
 }): Action;
 
 export function navigate(...args: any): Action {
@@ -120,7 +122,7 @@ export function navigate(...args: any): Action {
   }
 }
 
-export function reset(state: ResetState | undefined) {
+export function reset(state: ResetState) {
   return { type: 'RESET', payload: state } as const satisfies ResetAction;
 }
 
@@ -145,7 +147,7 @@ export function pushParams(params: object) {
   } as const satisfies PushParamsAction;
 }
 
-export function preload(name: string, params?: object) {
+export function preload(name: string, params?: object | undefined) {
   return {
     type: 'PRELOAD',
     payload: { name, params },

package/src/DrawerRouter.tsx

@@ -20,12 +20,12 @@ export type DrawerActionType =
   | TabActionType
   | {
       type: 'OPEN_DRAWER' | 'CLOSE_DRAWER' | 'TOGGLE_DRAWER';
-      source?: string;
-      target?: string;
+      source?: string | undefined;
+      target?: string | undefined;
     };
 
 export type DrawerRouterOptions = TabRouterOptions & {
-  defaultStatus?: DrawerStatus;
+  defaultStatus?: DrawerStatus | undefined;
 };
 
 export type DrawerNavigationState<ParamList extends ParamListBase> = Omit<