npm - @react-navigation/routers - Versions diffs - 8.0.0-alpha.15 → 8.0.0-alpha.17 - Mend

@react-navigation/routers 8.0.0-alpha.15 → 8.0.0-alpha.17

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 (16) hide show

package/lib/module/CommonActions.js.map +1 -1
package/lib/module/StackRouter.js +8 -6
package/lib/module/StackRouter.js.map +1 -1
package/lib/module/SwitchRouter.js +22 -5
package/lib/module/SwitchRouter.js.map +1 -1
package/lib/typescript/src/CommonActions.d.ts +12 -2
package/lib/typescript/src/CommonActions.d.ts.map +1 -1
package/lib/typescript/src/StackRouter.d.ts.map +1 -1
package/lib/typescript/src/SwitchRouter.d.ts.map +1 -1
package/lib/typescript/src/types.d.ts +3 -3
package/lib/typescript/src/types.d.ts.map +1 -1
package/package.json +3 -3
package/src/CommonActions.tsx +4 -4
package/src/StackRouter.tsx +12 -8
package/src/SwitchRouter.tsx +33 -5
package/src/types.tsx +10 -3

package/lib/module/CommonActions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["goBack","type","navigate","name","params","options","payload","merge","pop","reset","state","setParams","replaceParams","pushParams","preload"],"sourceRoot":"../../src","sources":["CommonActions.tsx"],"mappings":";;AA2EA,OAAO,SAASA,MAAMA,CAAA,~~EAAW~~;~~EAC/B~~,OAAO;IAAEC,IAAI,EAAE;EAAU,CAAC;AAC5B;AAEA,OAAO,SAASC,QAAQA,CACtBC,IAAY,EACZC,MAA2B,EAC3BC,OAKa,~~EACL~~;~~EACR~~,OAAO;IACLJ,IAAI,EAAE,UAAU;IAChBK,OAAO,EAAE;MACPH,IAAI;MACJC,MAAM;MACNG,KAAK,EAAEF,OAAO,EAAEE,KAAK;MACrBC,GAAG,EAAEH,OAAO,EAAEG;IAChB;EACF,CAAC;AACH;AAEA,OAAO,SAASC,KAAKA,CAACC,KAAiB,EAAE;EACvC,OAAO;IAAET,IAAI,EAAE,OAAO;IAAEK,OAAO,EAAEI;EAAM,CAAC;AAC1C;AAEA,OAAO,SAASC,SAASA,CAACP,MAAc,EAAE;EACxC,OAAO;IACLH,IAAI,EAAE,YAAY;IAClBK,OAAO,EAAE;MAAEF;IAAO;EACpB,CAAC;AACH;AAEA,OAAO,SAASQ,aAAaA,CAACR,MAAc,EAAE;EAC5C,OAAO;IACLH,IAAI,EAAE,gBAAgB;IACtBK,OAAO,EAAE;MAAEF;IAAO;EACpB,CAAC;AACH;AAEA,OAAO,SAASS,UAAUA,CAACT,MAAc,EAAE;EACzC,OAAO;IACLH,IAAI,EAAE,aAAa;IACnBK,OAAO,EAAE;MAAEF;IAAO;EACpB,CAAC;AACH;AAEA,OAAO,SAASU,OAAOA,CAACX,IAAY,EAAEC,MAA2B,EAAE;EACjE,OAAO;IACLH,IAAI,EAAE,SAAS;IACfK,OAAO,EAAE;MAAEH,IAAI;MAAEC;IAAO;EAC1B,CAAC;AACH","ignoreList":[]}
1	+ {"version":3,"names":["goBack","type","navigate","name","params","options","payload","merge","pop","reset","state","setParams","replaceParams","pushParams","preload"],"sourceRoot":"../../src","sources":["CommonActions.tsx"],"mappings":";;AA2EA,OAAO,SAASA,MAAMA,CAAA,EAAG;EACvB,OAAO;IAAEC,IAAI,EAAE;EAAU,CAAC;AAC5B;AAEA,OAAO,SAASC,QAAQA,CACtBC,IAAY,EACZC,MAA2B,EAC3BC,OAKa,EACb;EACA,OAAO;IACLJ,IAAI,EAAE,UAAU;IAChBK,OAAO,EAAE;MACPH,IAAI;MACJC,MAAM;MACNG,KAAK,EAAEF,OAAO,EAAEE,KAAK;MACrBC,GAAG,EAAEH,OAAO,EAAEG;IAChB;EACF,CAAC;AACH;AAEA,OAAO,SAASC,KAAKA,CAACC,KAAiB,EAAE;EACvC,OAAO;IAAET,IAAI,EAAE,OAAO;IAAEK,OAAO,EAAEI;EAAM,CAAC;AAC1C;AAEA,OAAO,SAASC,SAASA,CAACP,MAAc,EAAE;EACxC,OAAO;IACLH,IAAI,EAAE,YAAY;IAClBK,OAAO,EAAE;MAAEF;IAAO;EACpB,CAAC;AACH;AAEA,OAAO,SAASQ,aAAaA,CAACR,MAAc,EAAE;EAC5C,OAAO;IACLH,IAAI,EAAE,gBAAgB;IACtBK,OAAO,EAAE;MAAEF;IAAO;EACpB,CAAC;AACH;AAEA,OAAO,SAASS,UAAUA,CAACT,MAAc,EAAE;EACzC,OAAO;IACLH,IAAI,EAAE,aAAa;IACnBK,OAAO,EAAE;MAAEF;IAAO;EACpB,CAAC;AACH;AAEA,OAAO,SAASU,OAAOA,CAACX,IAAY,EAAEC,MAA2B,EAAE;EACjE,OAAO;IACLH,IAAI,EAAE,SAAS;IACfK,OAAO,EAAE;MAAEH,IAAI;MAAEC;IAAO;EAC1B,CAAC;AACH","ignoreList":[]}

package/lib/module/StackRouter.js CHANGED Viewed

@@ -183,12 +183,14 @@ export function StackRouter(options) {
       }, routes, preloadedRoutes, retainedRoutes);
     },
     getStateForRouteFocus(state, key) {
-      const routes = getActiveRoutes(state);
-      const index = routes.findIndex(r => r.key === key);
-      if (index === -1 || index === state.index) {
+      const activeRoutes = getActiveRoutes(state);
+      const route = state.routes.find(route => route.key === key);
+      if (route == null || route === activeRoutes.at(-1)) {
         return state;
       }
-      return retainRoutes(state, getStateWithRoutes(state, routes.slice(0, index + 1)));
+      const index = activeRoutes.indexOf(route);
+      const routes = index === -1 ? activeRoutes.concat(route) : activeRoutes.slice(0, index + 1);
+      return retainRoutes(state, getStateWithRoutes(state, routes));
     },
     getStateForAction(state, action, options) {
       const {
@@ -635,9 +637,9 @@ export function StackRouter(options) {
               action,
               routeParamList
             });
-            const route = preloadedRoutes.findLast(route => route.name === action.payload.name && (id === undefined || id === getId?.({
+            const route = preloadedRoutes.findLast(route => route.name === action.payload.name && id === getId?.({
               params: route.params
-            })));
+            }));
             if (route) {
               return getStateWithRoutes(state, routes, preloadedRoutes.map(r => r.key === route.key && r.params !== params ? {
                 ...r,

package/lib/module/StackRouter.js.map CHANGED Viewed

	@@ -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","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","findIndex","r","getStateForAction","action","inactiveRoutes","currentIndex","target","source","getId","routeGetIdList","id","find","i","currentRoute","history","j","historyEntry","findLast","nextRoutes","path","some","lastRoute","removedFromIndex","sourceIndex","end","last","at","removed","findLastIndex","historyIndex","baseParams","routeKey","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","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","target","source","findIndex","r","getId","routeGetIdList","id","i","currentRoute","history","j","historyEntry","findLast","nextRoutes","path","some","lastRoute","removedFromIndex","sourceIndex","end","last","removed","findLastIndex","historyIndex","baseParams","routeKey","actionCreators"],"sourceRoot":"../../src","sources":["StackRouter.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/SwitchRouter.js CHANGED Viewed

@@ -74,6 +74,16 @@ const changeIndex = (state, index, backBehavior, initialRouteName) => {
     } else if (backBehavior === 'fullHistory') {
       const lastHistoryRouteItemIndex = history.findLastIndex(item => item.type === 'route');
       const lastHistoryRouteItem = history[lastHistoryRouteItemIndex];
+      if (lastHistoryRouteItem?.type === 'route' && currentRoute.key !== lastHistoryRouteItem.key) {
+        const previousRoute = state.routes.find(route => route.key === lastHistoryRouteItem.key);
+        if (previousRoute != null && previousRoute.params !== lastHistoryRouteItem.params) {
+          history = [...history];
+          history[lastHistoryRouteItemIndex] = {
+            ...lastHistoryRouteItem,
+            params: previousRoute.params
+          };
+        }
+      }
       if (lastHistoryRouteItem?.type === 'route' && currentRoute.key === lastHistoryRouteItem.key) {
         // For full-history, only remove if it matches the last route
         // Useful for drawer, if current route was in history, then drawer state changed
@@ -242,10 +252,14 @@ export function SwitchRouter({
                 routeParamList
               });
             }
-            const path = action.type === 'NAVIGATE' && action.payload.path != null ? action.payload.path : route.path;
-            const nextRoute = params !== route.params || path !== route.path || key !== route.key ? {
-              ...route,
+            const path = action.type === 'NAVIGATE' && action.payload.path != null ? action.payload.path : key === route.key ? route.path : undefined;
+            const nextRoute = key !== route.key ? {
               key,
+              name: route.name,
+              path,
+              params
+            } : params !== route.params || path !== route.path ? {
+              ...route,
               path,
               params
             } : route;
@@ -336,9 +350,12 @@ export function SwitchRouter({
               action,
               routeParamList
             });
-            const newRoute = params !== route.params ? {
-              ...route,
+            const newRoute = key !== route.key ? {
               key,
+              name: route.name,
+              params
+            } : params !== route.params ? {
+              ...route,
               params
             } : route;
             let history = state.history;

package/lib/module/SwitchRouter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["nanoid","BaseRouter","createParamsFromAction","TYPE_ROUTE","getRouteHistory","routes","index","backBehavior","initialRouteName","route","Error","history","type","key","params","undefined","initialRouteIndex","i","unshift","findIndex","name","changeIndex","state","currentRoute","filter","it","lastHistoryRouteItemIndex","findLastIndex","item","lastHistoryRouteItem","slice","concat","SwitchRouter","router","getInitialState","routeNames","routeParamList","includes","indexOf","map","stale","preloadedRouteKeys","getRehydratedState","find","r","Math","min","max","length","routeKeys","push","stateData","getStateForRouteNamesChange","routeKeyChanges","Set","has","previousRouteItem","findLast","getStateForRouteFocus","getStateForAction","action","routeGetIdList","payload","getId","currentId","nextId","merge","path","nextRoute","routeIndex","updatedState","focusedRoute","lastHistoryItem","last","pop","previousHistoryItem","previousKey","previousRoute","newRoute","record"],"sourceRoot":"../../src","sources":["SwitchRouter.tsx"],"mappings":"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","ignoreList":[]}
1	+ {"version":3,"names":["nanoid","BaseRouter","createParamsFromAction","TYPE_ROUTE","getRouteHistory","routes","index","backBehavior","initialRouteName","route","Error","history","type","key","params","undefined","initialRouteIndex","i","unshift","findIndex","name","changeIndex","state","currentRoute","filter","it","lastHistoryRouteItemIndex","findLastIndex","item","lastHistoryRouteItem","previousRoute","find","slice","concat","SwitchRouter","router","getInitialState","routeNames","routeParamList","includes","indexOf","map","stale","preloadedRouteKeys","getRehydratedState","r","Math","min","max","length","routeKeys","push","stateData","getStateForRouteNamesChange","routeKeyChanges","Set","has","previousRouteItem","findLast","getStateForRouteFocus","getStateForAction","action","routeGetIdList","payload","getId","currentId","nextId","merge","path","nextRoute","routeIndex","updatedState","focusedRoute","lastHistoryItem","last","pop","previousHistoryItem","previousKey","newRoute","record"],"sourceRoot":"../../src","sources":["SwitchRouter.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/CommonActions.d.ts CHANGED Viewed

@@ -59,11 +59,21 @@ type PreloadAction = {
     target?: string | undefined;
 };
 export type Action = GoBackAction | NavigateAction | ResetAction | SetParamsAction | ReplaceParamsAction | PushParamsAction | PreloadAction;
-export declare function goBack(): Action;
+export declare function goBack(): {
+    readonly type: "GO_BACK";
+};
 export declare function navigate(name: string, params?: object | undefined, options?: {
     merge?: boolean | undefined;
     pop?: boolean | undefined;
-} | undefined): Action;
+} | undefined): {
+    readonly type: "NAVIGATE";
+    readonly payload: {
+        readonly name: string;
+        readonly params: object | undefined;
+        readonly merge: boolean | undefined;
+        readonly pop: boolean | undefined;
+    };
+};
 export declare function reset(state: ResetState): {
     readonly type: "RESET";
     readonly payload: ResetState;

package/lib/typescript/src/CommonActions.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CommonActions.d.ts","sourceRoot":"","sources":["../../../src/CommonActions.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,YAAS,CAAC;AAEpE,KAAK,UAAU,GACX,YAAY,CAAC,eAAe,CAAC,GAC7B,eAAe,GACf,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,GAAG;IACjC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;CACtC,CAAC,CAAC;AAEP,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1B,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAC5B,GAAG,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;KAC3B,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IACzC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IACzC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,aAAa,CAAC;IACpB,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IACzC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KAC7B,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,MAAM,GACd,YAAY,GACZ,cAAc,GACd,WAAW,GACX,eAAe,GACf,mBAAmB,GACnB,gBAAgB,GAChB,aAAa,CAAC;AAElB,wBAAgB,MAAM~~,IAAI,MAAM,CAE/B~~;AAED,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,CAAC,EACJ;IACE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,GAAG,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC3B,GACD,SAAS~~,GACZ,MAAM,CAUR~~;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU;;;EAEtC;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM;;;;;EAKvC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM;;;;;EAK3C;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM;;;;;EAKxC;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS;;;;;;EAKhE"}
1	+ {"version":3,"file":"CommonActions.d.ts","sourceRoot":"","sources":["../../../src/CommonActions.tsx"],"names":[],"mappings":"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"}

package/lib/typescript/src/StackRouter.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StackRouter.d.ts","sourceRoot":"","sources":["../../../src/StackRouter.tsx"],"names":[],"mappings":"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~~sGAiyBtD~~"}
1	+ {"version":3,"file":"StackRouter.d.ts","sourceRoot":"","sources":["../../../src/StackRouter.tsx"],"names":[],"mappings":"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"}

package/lib/typescript/src/SwitchRouter.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SwitchRouter.d.ts","sourceRoot":"","sources":["../../../src/SwitchRouter.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,sBAAsB,EACtB,oBAAoB,EACpB,eAAe,EACf,YAAY,EAEZ,mBAAmB,EACpB,MAAM,YAAS,CAAC;AAEjB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,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,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,oBAAoB,GAAG;IACvD;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF,KAAK,YAAY,GACb,YAAY,GACZ,cAAc,GACd,OAAO,GACP,SAAS,GACT,aAAa,GACb,MAAM,CAAC;AAEX,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC3B,CAAC;AAEF,KAAK,iBAAiB,CAAC,OAAO,IAAI,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,MAAM,CAAC,GAAG;IAC5E,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,GAAG,EAAE,iBAAiB,CAAC,YAAY,CAAC,GAAG;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAC;IACvD,MAAM,EAAE,iBAAiB,CAAC,YAAY,GAAG,aAAa,CAAC,GAAG;QACxD,IAAI,EAAE,QAAQ,CAAC;QACf,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,KAAK,gBAAgB,GAAG,KAAK,GAAG,QAAQ,CAAC;~~AAwJzC~~,wBAAgB,YAAY,CAAC,IAAI,SAAS,gBAAgB,EAAE,EAC1D,gBAAgB,EAChB,YAA2B,GAC5B,EAAE,mBAAmB;qDASf,mBAAmB,GAAG,iBAAiB,CAAC,YAAY,CAAC;8BAwB/C,YAAY,4BAAO,kCACM,mBAAmB,GAClD,iBAAiB,CAAC,YAAY,CAAC;qHA8D7B,mBAAmB,GAAG;QAAE,eAAe,EAAE,MAAM,EAAE,CAAA;KAAE;kEAwDf,MAAM;iEAerC,gBAAgB,GAAG,sBAAsB,sCACb,mBAAmB,GACtD,6BAAQ,YAAY,4BAAO,GAAG,IAAI;;;;;~~kBAtX5B~~,CAAC;gBACD,CAAC;iBAGJ,CAAC;eAA8B,CAAC;;;;;~~EAwlBzC~~"}
1	+ {"version":3,"file":"SwitchRouter.d.ts","sourceRoot":"","sources":["../../../src/SwitchRouter.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,sBAAsB,EACtB,oBAAoB,EACpB,eAAe,EACf,YAAY,EAEZ,mBAAmB,EACpB,MAAM,YAAS,CAAC;AAEjB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,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,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,oBAAoB,GAAG;IACvD;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF,KAAK,YAAY,GACb,YAAY,GACZ,cAAc,GACd,OAAO,GACP,SAAS,GACT,aAAa,GACb,MAAM,CAAC;AAEX,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC3B,CAAC;AAEF,KAAK,iBAAiB,CAAC,OAAO,IAAI,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,MAAM,CAAC,GAAG;IAC5E,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,GAAG,EAAE,iBAAiB,CAAC,YAAY,CAAC,GAAG;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAC;IACvD,MAAM,EAAE,iBAAiB,CAAC,YAAY,GAAG,aAAa,CAAC,GAAG;QACxD,IAAI,EAAE,QAAQ,CAAC;QACf,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,KAAK,gBAAgB,GAAG,KAAK,GAAG,QAAQ,CAAC;AA4KzC,wBAAgB,YAAY,CAAC,IAAI,SAAS,gBAAgB,EAAE,EAC1D,gBAAgB,EAChB,YAA2B,GAC5B,EAAE,mBAAmB;qDASf,mBAAmB,GAAG,iBAAiB,CAAC,YAAY,CAAC;8BAwB/C,YAAY,4BAAO,kCACM,mBAAmB,GAClD,iBAAiB,CAAC,YAAY,CAAC;qHA8D7B,mBAAmB,GAAG;QAAE,eAAe,EAAE,MAAM,EAAE,CAAA;KAAE;kEAwDf,MAAM;iEAerC,gBAAgB,GAAG,sBAAsB,sCACb,mBAAmB,GACtD,6BAAQ,YAAY,4BAAO,GAAG,IAAI;;;;;kBA1Y5B,CAAC;gBACD,CAAC;iBAGJ,CAAC;eAA8B,CAAC;;;;;EAonBzC"}

package/lib/typescript/src/types.d.ts CHANGED Viewed

@@ -42,11 +42,11 @@ export type InitialState = Readonly<Partial<Omit<NavigationState, 'stale' | 'rou
 }>;
 export type PartialRoute<R extends Route<string>> = Omit<R, 'key'> & {
     key?: string | undefined;
-    state?: PartialState<NavigationState> | undefined;
+    state?: NavigationState | PartialState<NavigationState> | undefined;
 };
 export type PartialState<State extends NavigationState> = Partial<Omit<State, 'stale' | 'routes'>> & Readonly<{
     stale?: true | undefined;
-    routes: PartialRoute<Route<State['routeNames'][number]>>[];
+    routes: PartialRoute<State['routes'][number]>[];
 }>;
 export type Route<RouteName extends string, Params extends unknown | object | undefined = object | undefined> = Readonly<{
     /**
@@ -67,7 +67,7 @@ export type Route<RouteName extends string, Params extends unknown | object | un
      */
     history?: {
         type: 'params';
-        params: object;
+        params: undefined extends Params ? Readonly<Params> | undefined : Readonly<Params>;
     }[] | undefined;
 } & (undefined extends Params ? {
     /**

package/lib/typescript/src/types.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,aAAa,MAAM,oBAAiB,CAAC;AAEtD,MAAM,MAAM,sBAAsB,GAAG,aAAa,CAAC,MAAM,CAAC;AAE1D,MAAM,MAAM,eAAe,CACzB,SAAS,SAAS,aAAa,EAC/B,SAAS,SAAS,MAAM,SAAS,IAC/B,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG;IAC5D,KAAK,CAAC,EAAE,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;CACrE,CAAC;AAEF,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,aAAa,GAAG,aAAa,IACzE,QAAQ,CAAC;IACP;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC,MAAM,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC;IAC/C;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;IAChC;;OAEG;IACH,MAAM,EAAE,eAAe,CAAC,SAAS,EAAE,MAAM,SAAS,CAAC,EAAE,CAAC;IACtD;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd,CAAC,CAAC;AAEL,MAAM,MAAM,YAAY,GAAG,QAAQ,CACjC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,QAAQ,CAAC,CAAC,GAAG;IACnD,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG;QACpC,KAAK,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;KAClC,CAAC,EAAE,CAAC;CACN,CACF,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG;IACnE,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,CAAC,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;~~CACnD~~,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,KAAK,SAAS,eAAe,IAAI,OAAO,CAC/D,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,QAAQ,CAAC,CAChC,GACC,QAAQ,CAAC;IACP,KAAK,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,~~KAAK~~,CAAC,~~YAAY,~~CAAC,~~CAAC,~~MAAM,CAAC,CAAC,~~CAAC,~~EAAE,CAAC;~~CAC5D~~,CAAC,CAAC;AAEL,MAAM,MAAM,KAAK,CACf,SAAS,SAAS,MAAM,EACxB,MAAM,SAAS,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,IAC9D,QAAQ,CACV;IACE;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,IAAI,EAAE,SAAS,CAAC;IAChB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B;;OAEG;IACH,OAAO,CAAC,~~EAAE~~;~~QAAE~~,IAAI,EAAE,QAAQ,CAAC;~~QAAC~~,MAAM,EAAE,MAAM,~~CAAA~~;~~KAAE~~,EAAE,~~GAAG~~,SAAS,CAAC;~~CAC5D~~,GAAG,CAAC,SAAS,SAAS,MAAM,GACzB;IACE;;OAEG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;CACvC,GACD;IACE;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC1B,CAAC,CACP,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;AAE/D,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACtC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,MAAM,cAAc,CAAC,MAAM,SAAS,gBAAgB,IAAI;IAC5D,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,SAAS,SAAS,MAAM,GAAG,MAAM,IAAI;IACpE;;;OAGG;IACH,gBAAgB,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,aAAa,CACvB,KAAK,SAAS,eAAe,EAC7B,MAAM,SAAS,gBAAgB,EAC/B,aAAa,SAAS,oBAAoB,IACxC,CAAC,OAAO,EAAE,aAAa,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAEtD,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,EAAE,aAAa,CAAC;IAC9B,cAAc,EAAE,MAAM,CACpB,MAAM,EACJ,CAAC,CAAC,OAAO,EAAE;QACT,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;KAC1C,KAAK,MAAM,GAAG,SAAS,CAAC,GACzB,SAAS,CACZ,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,MAAM,CAChB,KAAK,SAAS,eAAe,EAC7B,MAAM,SAAS,gBAAgB,IAC7B;IACF;;;OAGG;IACH,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAEpB;;;;;OAKG;IACH,eAAe,CAAC,OAAO,EAAE,mBAAmB,GAAG,KAAK,CAAC;IAErD;;;;;;OAMG;IACH,kBAAkB,CAChB,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC,GAAG,KAAK,EACzC,OAAO,EAAE,mBAAmB,GAC3B,KAAK,CAAC;IAET;;;;;;OAMG;IACH,2BAA2B,CACzB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,mBAAmB,GAAG;QAC7B;;;WAGG;QACH,eAAe,EAAE,MAAM,EAAE,CAAC;KAC3B,GACA,KAAK,CAAC;IAET;;;;;OAKG;IACH,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC;IAExD;;;;;;;;OAQG;IACH,iBAAiB,CACf,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,mBAAmB,GAC3B,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IAEtC;;;;OAIG;IACH,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC;IAE3D;;OAEG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;CACzC,CAAC"}
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.tsx"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/routers",
   "description": "Routers to help build custom navigators",
-  "version": "8.0.0-alpha.15",
+  "version": "8.0.0-alpha.17",
   "keywords": [
     "react",
     "react-native",
@@ -44,7 +44,7 @@
     "nanoid": "^5.1.11"
   },
   "devDependencies": {
-    "@jest/globals": "^29.7.0",
+    "@jest/globals": "^30.4.1",
     "del-cli": "^7.0.0",
     "react-native-builder-bob": "^0.43.0",
     "typescript": "^6.0.3"
@@ -67,5 +67,5 @@
       ]
     ]
   },
-  "gitHead": "b0135879fbe4aa4a657798845483b7e78c307778"
+  "gitHead": "f8dd4e8fa7b0c7ec159f9f58ab31660aca8f1bf6"
 }

package/src/CommonActions.tsx CHANGED Viewed

@@ -73,8 +73,8 @@ export type Action =
   | PushParamsAction
   | PreloadAction;
-export function goBack(): Action {
-  return { type: 'GO_BACK' };
+export function goBack() {
+  return { type: 'GO_BACK' } as const satisfies GoBackAction;
 }
 export function navigate(
@@ -86,7 +86,7 @@ export function navigate(
         pop?: boolean | undefined;
       }
     | undefined
-): Action {
+) {
   return {
     type: 'NAVIGATE',
     payload: {
@@ -95,7 +95,7 @@ export function navigate(
       merge: options?.merge,
       pop: options?.pop,
     },
-  };
+  } as const satisfies NavigateAction;
 }
 export function reset(state: ResetState) {

package/src/StackRouter.tsx CHANGED Viewed

@@ -438,17 +438,21 @@ export function StackRouter(options: StackRouterOptions) {
     },
     getStateForRouteFocus(state, key) {
-      const routes = getActiveRoutes(state);
-      const index = routes.findIndex((r) => r.key === key);
+      const activeRoutes = getActiveRoutes(state);
+      const route = state.routes.find((route) => route.key === key);
-      if (index === -1 || index === state.index) {
+      if (route == null || route === activeRoutes.at(-1)) {
         return state;
       }
-      return retainRoutes(
-        state,
-        getStateWithRoutes(state, routes.slice(0, index + 1))
-      );
+      const index = activeRoutes.indexOf(route);
+      const routes =
+        index === -1
+          ? activeRoutes.concat(route)
+          : activeRoutes.slice(0, index + 1);
+      return retainRoutes(state, getStateWithRoutes(state, routes));
     },
     getStateForAction(state, action, options) {
@@ -1041,7 +1045,7 @@ export function StackRouter(options: StackRouterOptions) {
           const route = preloadedRoutes.findLast(
             (route) =>
               route.name === action.payload.name &&
-              (id === undefined || id === getId?.({ params: route.params }))
+              id === getId?.({ params: route.params })
           );
           if (route) {

package/src/SwitchRouter.tsx CHANGED Viewed

@@ -182,6 +182,26 @@ const changeIndex = <Type extends SwitchRouterType>(
       const lastHistoryRouteItem = history[lastHistoryRouteItemIndex];
+      if (
+        lastHistoryRouteItem?.type === 'route' &&
+        currentRoute.key !== lastHistoryRouteItem.key
+      ) {
+        const previousRoute = state.routes.find(
+          (route) => route.key === lastHistoryRouteItem.key
+        );
+        if (
+          previousRoute != null &&
+          previousRoute.params !== lastHistoryRouteItem.params
+        ) {
+          history = [...history];
+          history[lastHistoryRouteItemIndex] = {
+            ...lastHistoryRouteItem,
+            params: previousRoute.params,
+          };
+        }
+      }
       if (
         lastHistoryRouteItem?.type === 'route' &&
         currentRoute.key === lastHistoryRouteItem.key
@@ -437,12 +457,16 @@ export function SwitchRouter<Type extends SwitchRouterType>({
           const path =
             action.type === 'NAVIGATE' && action.payload.path != null
               ? action.payload.path
-              : route.path;
+              : key === route.key
+                ? route.path
+                : undefined;
           const nextRoute =
-            params !== route.params || path !== route.path || key !== route.key
-              ? { ...route, key, path, params }
-              : route;
+            key !== route.key
+              ? { key, name: route.name, path, params }
+              : params !== route.params || path !== route.path
+                ? { ...route, path, params }
+                : route;
           const routes = state.routes.map((item, routeIndex) =>
             routeIndex === index ? nextRoute : item
@@ -580,7 +604,11 @@ export function SwitchRouter<Type extends SwitchRouterType>({
           const params = createParamsFromAction({ action, routeParamList });
           const newRoute =
-            params !== route.params ? { ...route, key, params } : route;
+            key !== route.key
+              ? { key, name: route.name, params }
+              : params !== route.params
+                ? { ...route, params }
+                : route;
           let history = state.history;

package/src/types.tsx CHANGED Viewed

@@ -53,7 +53,7 @@ export type InitialState = Readonly<
 export type PartialRoute<R extends Route<string>> = Omit<R, 'key'> & {
   key?: string | undefined;
-  state?: PartialState<NavigationState> | undefined;
+  state?: NavigationState | PartialState<NavigationState> | undefined;
 };
 export type PartialState<State extends NavigationState> = Partial<
@@ -61,7 +61,7 @@ export type PartialState<State extends NavigationState> = Partial<
 > &
   Readonly<{
     stale?: true | undefined;
-    routes: PartialRoute<Route<State['routeNames'][number]>>[];
+    routes: PartialRoute<State['routes'][number]>[];
   }>;
 export type Route<
@@ -85,7 +85,14 @@ export type Route<
     /**
      * History of param changes for this route.
      */
-    history?: { type: 'params'; params: object }[] | undefined;
+    history?:
+      | {
+          type: 'params';
+          params: undefined extends Params
+            ? Readonly<Params> | undefined
+            : Readonly<Params>;
+        }[]
+      | undefined;
   } & (undefined extends Params
     ? {
         /**