@react-navigation/routers 7.6.0 → 7.6.1

package/lib/module/BaseRouter.js

@@ -1,56 +1,61 @@
 "use strict";
 
 import { nanoid } from 'nanoid/non-secure';
-/**
- * Base router object that can be used when writing custom routers.
- * This provides few helper methods to handle common actions such as `RESET`.
- */
-export const BaseRouter = {
-  getStateForAction(state, action) {
-    switch (action.type) {
-      case 'SET_PARAMS':
-      case 'REPLACE_PARAMS':
-        {
-          const index = action.source ? state.routes.findIndex(r => r.key === action.source) : state.index;
-          if (index === -1) {
+function getStateForAction(state, action) {
+  switch (action.type) {
+    case 'SET_PARAMS':
+    case 'REPLACE_PARAMS':
+      {
+        const index = action.source ? state.routes.findIndex(r => r.key === action.source) : state.index;
+        if (index === -1) {
+          return null;
+        }
+        return {
+          ...state,
+          routes: state.routes.map((r, i) => i === index ? {
+            ...r,
+            params: action.type === 'REPLACE_PARAMS' ? action.payload.params : {
+              ...r.params,
+              ...action.payload.params
+            }
+          } : r)
+        };
+      }
+    case 'RESET':
+      {
+        const nextState = action.payload;
+        if (nextState == null) {
+          return null;
+        }
+        const routeNamesSet = new Set(state.routeNames);
+        if (nextState.routes.length === 0 || nextState.routes.some(route => !routeNamesSet.has(route.name))) {
+          return null;
+        }
+        if (nextState.stale === false) {
+          if (state.routeNames.length !== nextState.routeNames.length || nextState.routeNames.some(name => !routeNamesSet.has(name)) || !Number.isInteger(nextState.index) || nextState.index < 0 || nextState.index >= nextState.routes.length) {
             return null;
           }
           return {
-            ...state,
-            routes: state.routes.map((r, i) => i === index ? {
-              ...r,
-              params: action.type === 'REPLACE_PARAMS' ? action.payload.params : {
-                ...r.params,
-                ...action.payload.params
-              }
-            } : r)
+            ...nextState,
+            routes: nextState.routes.map(route => 'key' in route && route.key ? route : {
+              ...route,
+              key: `${route.name}-${nanoid()}`
+            })
           };
         }
-      case 'RESET':
-        {
-          const nextState = action.payload;
-          const routeNamesSet = new Set(state.routeNames);
-          if (nextState.routes.length === 0 || nextState.routes.some(route => !routeNamesSet.has(route.name))) {
-            return null;
-          }
-          if (nextState.stale === false) {
-            if (state.routeNames.length !== nextState.routeNames.length || nextState.routeNames.some(name => !routeNamesSet.has(name))) {
-              return null;
-            }
-            return {
-              ...nextState,
-              routes: nextState.routes.map(route => route.key ? route : {
-                ...route,
-                key: `${route.name}-${nanoid()}`
-              })
-            };
-          }
-          return nextState;
-        }
-      default:
-        return null;
-    }
-  },
+        return nextState;
+      }
+    default:
+      return null;
+  }
+}
+
+/**
+ * Base router object that can be used when writing custom routers.
+ * This provides few helper methods to handle common actions such as `RESET`.
+ */
+export const BaseRouter = {
+  getStateForAction,
   shouldActionChangeFocus(action) {
     return action.type === 'NAVIGATE' || action.type === 'NAVIGATE_DEPRECATED';
   }

package/lib/module/BaseRouter.js.map

@@ -1 +1 @@
-{"version":3,"names":["nanoid","BaseRouter","getStateForAction","state","action","type","index","source","routes","findIndex","r","key","map","i","params","payload","nextState","routeNamesSet","Set","routeNames","length","some","route","has","name","stale","shouldActionChangeFocus"],"sourceRoot":"../../src","sources":["BaseRouter.tsx"],"mappings":";;AAAA,SAASA,MAAM,QAAQ,mBAAmB;AAQ1C;AACA;AACA;AACA;AACA,OAAO,MAAMC,UAAU,GAAG;EACxBC,iBAAiBA,CACfC,KAAY,EACZC,MAA8B,EACM;IACpC,QAAQA,MAAM,CAACC,IAAI;MACjB,KAAK,YAAY;MACjB,KAAK,gBAAgB;QAAE;UACrB,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;cACE,GAAGI,CAAC;cACJI,MAAM,EACJV,MAAM,CAACC,IAAI,KAAK,gBAAgB,GAC5BD,MAAM,CAACW,OAAO,CAACD,MAAM,GACrB;gBAAE,GAAGJ,CAAC,CAACI,MAAM;gBAAE,GAAGV,MAAM,CAACW,OAAO,CAACD;cAAO;YAChD,CAAC,GACDJ,CACN;UACF,CAAC;QACH;MAEA,KAAK,OAAO;QAAE;UACZ,MAAMM,SAAS,GAAGZ,MAAM,CAACW,OAAsC;UAE/D,MAAME,aAAa,GAAG,IAAIC,GAAG,CAACf,KAAK,CAACgB,UAAU,CAAC;UAE/C,IACEH,SAAS,CAACR,MAAM,CAACY,MAAM,KAAK,CAAC,IAC7BJ,SAAS,CAACR,MAAM,CAACa,IAAI,CAClBC,KAAuB,IAAK,CAACL,aAAa,CAACM,GAAG,CAACD,KAAK,CAACE,IAAI,CAC5D,CAAC,EACD;YACA,OAAO,IAAI;UACb;UAEA,IAAIR,SAAS,CAACS,KAAK,KAAK,KAAK,EAAE;YAC7B,IACEtB,KAAK,CAACgB,UAAU,CAACC,MAAM,KAAKJ,SAAS,CAACG,UAAU,CAACC,MAAM,IACvDJ,SAAS,CAACG,UAAU,CAACE,IAAI,CAAEG,IAAI,IAAK,CAACP,aAAa,CAACM,GAAG,CAACC,IAAI,CAAC,CAAC,EAC7D;cACA,OAAO,IAAI;YACb;YAEA,OAAO;cACL,GAAGR,SAAS;cACZR,MAAM,EAAEQ,SAAS,CAACR,MAAM,CAACI,GAAG,CAAEU,KAAK,IACjCA,KAAK,CAACX,GAAG,GAAGW,KAAK,GAAG;gBAAE,GAAGA,KAAK;gBAAEX,GAAG,EAAE,GAAGW,KAAK,CAACE,IAAI,IAAIxB,MAAM,CAAC,CAAC;cAAG,CACnE;YACF,CAAC;UACH;UAEA,OAAOgB,SAAS;QAClB;MAEA;QACE,OAAO,IAAI;IACf;EACF,CAAC;EAEDU,uBAAuBA,CAACtB,MAA8B,EAAE;IACtD,OAAOA,MAAM,CAACC,IAAI,KAAK,UAAU,IAAID,MAAM,CAACC,IAAI,KAAK,qBAAqB;EAC5E;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["nanoid","getStateForAction","state","action","type","index","source","routes","findIndex","r","key","map","i","params","payload","nextState","routeNamesSet","Set","routeNames","length","some","route","has","name","stale","Number","isInteger","BaseRouter","shouldActionChangeFocus"],"sourceRoot":"../../src","sources":["BaseRouter.tsx"],"mappings":";;AAAA,SAASA,MAAM,QAAQ,mBAAmB;AAY1C,SAASC,iBAAiBA,CACxBC,KAAsB,EACtBC,MAA8B,EAC9B;EACA,QAAQA,MAAM,CAACC,IAAI;IACjB,KAAK,YAAY;IACjB,KAAK,gBAAgB;MAAE;QACrB,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;QAEf,IAAIA,KAAK,KAAK,CAAC,CAAC,EAAE;UAChB,OAAO,IAAI;QACb;QAEA,OAAO;UACL,GAAGH,KAAK;UACRK,MAAM,EAAEL,KAAK,CAACK,MAAM,CAACI,GAAG,CAAC,CAACF,CAAC,EAAEG,CAAC,KAC5BA,CAAC,KAAKP,KAAK,GACP;YACE,GAAGI,CAAC;YACJI,MAAM,EACJV,MAAM,CAACC,IAAI,KAAK,gBAAgB,GAC5BD,MAAM,CAACW,OAAO,CAACD,MAAM,GACrB;cAAE,GAAGJ,CAAC,CAACI,MAAM;cAAE,GAAGV,MAAM,CAACW,OAAO,CAACD;YAAO;UAChD,CAAC,GACDJ,CACN;QACF,CAAC;MACH;IAEA,KAAK,OAAO;MAAE;QACZ,MAAMM,SAAS,GAAGZ,MAAM,CAACW,OAAO;QAEhC,IAAIC,SAAS,IAAI,IAAI,EAAE;UACrB,OAAO,IAAI;QACb;QAEA,MAAMC,aAAa,GAAG,IAAIC,GAAG,CAACf,KAAK,CAACgB,UAAU,CAAC;QAE/C,IACEH,SAAS,CAACR,MAAM,CAACY,MAAM,KAAK,CAAC,IAC7BJ,SAAS,CAACR,MAAM,CAACa,IAAI,CAClBC,KAAuB,IAAK,CAACL,aAAa,CAACM,GAAG,CAACD,KAAK,CAACE,IAAI,CAC5D,CAAC,EACD;UACA,OAAO,IAAI;QACb;QAEA,IAAIR,SAAS,CAACS,KAAK,KAAK,KAAK,EAAE;UAC7B,IACEtB,KAAK,CAACgB,UAAU,CAACC,MAAM,KAAKJ,SAAS,CAACG,UAAU,CAACC,MAAM,IACvDJ,SAAS,CAACG,UAAU,CAACE,IAAI,CAAEG,IAAI,IAAK,CAACP,aAAa,CAACM,GAAG,CAACC,IAAI,CAAC,CAAC,IAC7D,CAACE,MAAM,CAACC,SAAS,CAACX,SAAS,CAACV,KAAK,CAAC,IAClCU,SAAS,CAACV,KAAK,GAAG,CAAC,IACnBU,SAAS,CAACV,KAAK,IAAIU,SAAS,CAACR,MAAM,CAACY,MAAM,EAC1C;YACA,OAAO,IAAI;UACb;UAEA,OAAO;YACL,GAAGJ,SAAS;YACZR,MAAM,EAAEQ,SAAS,CAACR,MAAM,CAACI,GAAG,CAAEU,KAAK,IACjC,KAAK,IAAIA,KAAK,IAAIA,KAAK,CAACX,GAAG,GACvBW,KAAK,GACL;cAAE,GAAGA,KAAK;cAAEX,GAAG,EAAE,GAAGW,KAAK,CAACE,IAAI,IAAIvB,MAAM,CAAC,CAAC;YAAG,CACnD;UACF,CAAC;QACH;QAEA,OAAOe,SAAS;MAClB;IAEA;MACE,OAAO,IAAI;EACf;AACF;;AAEA;AACA;AACA;AACA;AACA,OAAO,MAAMY,UAAU,GAAG;EACxB1B,iBAAiB;EAEjB2B,uBAAuBA,CAACzB,MAA8B,EAAE;IACtD,OAAOA,MAAM,CAACC,IAAI,KAAK,UAAU,IAAID,MAAM,CAACC,IAAI,KAAK,qBAAqB;EAC5E;AACF,CAAC","ignoreList":[]}

package/lib/module/DrawerRouter.js

@@ -1,7 +1,8 @@
 "use strict";
 
 import { nanoid } from 'nanoid/non-secure';
-import { TabActions, TabRouter } from "./TabRouter.js";
+import { SwitchRouter } from "./SwitchRouter.js";
+import { TabActions } from "./TabRouter.js";
 export const DrawerActions = {
   ...TabActions,
   openDrawer() {
@@ -24,7 +25,7 @@ export function DrawerRouter({
   defaultStatus = 'closed',
   ...rest
 }) {
-  const router = TabRouter(rest);
+  const router = SwitchRouter(rest);
   const isDrawerInHistory = state => Boolean(state.history?.some(it => it.type === 'drawer'));
   const addDrawerToHistory = state => {
     if (isDrawerInHistory(state)) {
@@ -88,22 +89,22 @@ export function DrawerRouter({
       if (partialState.stale === false) {
         return partialState;
       }
-      let state = router.getRehydratedState(partialState, {
-        routeNames,
-        routeParamList,
-        routeGetIdList
-      });
+      let state = {
+        ...router.getRehydratedState(partialState, {
+          routeNames,
+          routeParamList,
+          routeGetIdList
+        }),
+        default: defaultStatus,
+        type: 'drawer',
+        key: `drawer-${nanoid()}`
+      };
       if (isDrawerInHistory(partialState)) {
         // Re-sync the drawer entry in history to correct it if it was wrong
         state = removeDrawerFromHistory(state);
         state = addDrawerToHistory(state);
       }
-      return {
-        ...state,
-        default: defaultStatus,
-        type: 'drawer',
-        key: `drawer-${nanoid()}`
-      };
+      return state;
     },
     getStateForRouteFocus(state, key) {
       const result = router.getStateForRouteFocus(state, key);
@@ -125,7 +126,7 @@ export function DrawerRouter({
         case 'NAVIGATE_DEPRECATED':
           {
             const result = router.getStateForAction(state, action, options);
-            if (result != null && result.index !== state.index) {
+            if (result != null && result.stale === false && result.index !== state.index) {
               return closeDrawer(result);
             }
             return result;

package/lib/module/DrawerRouter.js.map

@@ -1 +1 @@
-{"version":3,"names":["nanoid","TabActions","TabRouter","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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","ignoreList":[]}
+{"version":3,"names":["nanoid","SwitchRouter","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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","ignoreList":[]}

package/lib/module/SwitchRouter.js

@@ -0,0 +1,352 @@
+"use strict";
+
+import { nanoid } from 'nanoid/non-secure';
+import { BaseRouter } from "./BaseRouter.js";
+import { createParamsFromAction } from "./createParamsFromAction.js";
+const TYPE_ROUTE = 'route';
+const getRouteHistory = (routes, index, backBehavior, initialRouteName) => {
+  const history = [{
+    type: TYPE_ROUTE,
+    key: routes[index].key,
+    params: backBehavior === 'fullHistory' ? routes[index].params : undefined
+  }];
+  let initialRouteIndex;
+  switch (backBehavior) {
+    case 'order':
+      for (let i = index; i > 0; i--) {
+        history.unshift({
+          type: TYPE_ROUTE,
+          key: routes[i - 1].key
+        });
+      }
+      break;
+    case 'firstRoute':
+      if (index !== 0) {
+        history.unshift({
+          type: TYPE_ROUTE,
+          key: routes[0].key
+        });
+      }
+      break;
+    case 'initialRoute':
+      initialRouteIndex = routes.findIndex(route => route.name === initialRouteName);
+      initialRouteIndex = initialRouteIndex === -1 ? 0 : initialRouteIndex;
+      if (index !== initialRouteIndex) {
+        history.unshift({
+          type: TYPE_ROUTE,
+          key: routes[initialRouteIndex].key
+        });
+      }
+      break;
+    case 'history':
+    case 'fullHistory':
+      // The history will fill up on navigation
+      break;
+  }
+  return history;
+};
+const changeIndex = (state, index, backBehavior, initialRouteName) => {
+  let history = state.history;
+  if (backBehavior === 'history' || backBehavior === 'fullHistory') {
+    const currentRoute = state.routes[index];
+    if (backBehavior === 'history') {
+      // Remove the existing key from the history to de-duplicate it
+      history = history.filter(it => it.type === 'route' ? it.key !== currentRoute.key : true);
+    } else if (backBehavior === 'fullHistory') {
+      const lastHistoryRouteItemIndex = history.findLastIndex(item => item.type === 'route');
+      const lastHistoryRouteItem = history[lastHistoryRouteItemIndex];
+      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
+        // Then we only need to move the route to the front
+        history = [...history.slice(0, lastHistoryRouteItemIndex), ...history.slice(lastHistoryRouteItemIndex + 1)];
+      }
+    }
+    history = history.concat({
+      type: TYPE_ROUTE,
+      key: currentRoute.key,
+      params: backBehavior === 'fullHistory' ? currentRoute.params : undefined
+    });
+  } else {
+    // Preserve non-route entries (e.g. drawer status) when rebuilding the history
+    history = [...state.history.filter(it => it.type !== 'route'), ...getRouteHistory(state.routes, index, backBehavior, initialRouteName)];
+  }
+  return {
+    index,
+    history
+  };
+};
+export function SwitchRouter({
+  initialRouteName,
+  backBehavior = 'firstRoute'
+}) {
+  const router = {
+    ...BaseRouter,
+    getInitialState({
+      routeNames,
+      routeParamList
+    }) {
+      const index = initialRouteName !== undefined && routeNames.includes(initialRouteName) ? routeNames.indexOf(initialRouteName) : 0;
+      const routes = routeNames.map(name => ({
+        name,
+        key: `${name}-${nanoid()}`,
+        params: routeParamList[name]
+      }));
+      return {
+        stale: false,
+        key: nanoid(),
+        index,
+        routeNames,
+        history: getRouteHistory(routes, index, backBehavior, initialRouteName),
+        routes,
+        preloadedRouteKeys: []
+      };
+    },
+    getRehydratedState(state, {
+      routeNames,
+      routeParamList
+    }) {
+      const routes = routeNames.map(name => {
+        const route = state.routes.find(r => r.name === name);
+        return {
+          ...route,
+          name,
+          key: route && route.name === name && route.key ? route.key : `${name}-${nanoid()}`,
+          params: routeParamList[name] !== undefined ? {
+            ...routeParamList[name],
+            ...(route ? route.params : undefined)
+          } : route ? route.params : undefined
+        };
+      });
+      const index = Math.min(Math.max(routeNames.indexOf(state.routes[state.index ?? 0]?.name), 0), routes.length - 1);
+      const routeKeys = routes.map(route => route.key);
+      const history = [];
+      for (const item of state.history ?? []) {
+        if (item.type === 'route' && routeKeys.includes(item.key)) {
+          history.push(item);
+        }
+      }
+      const stateData = {
+        stale: false,
+        key: nanoid(),
+        index,
+        routeNames,
+        history,
+        routes,
+        preloadedRouteKeys: state.preloadedRouteKeys?.filter(key => routeKeys.includes(key)) ?? []
+      };
+      return {
+        ...stateData,
+        ...changeIndex(stateData, index, backBehavior, initialRouteName)
+      };
+    },
+    getStateForRouteNamesChange(state, {
+      routeNames,
+      routeParamList,
+      routeKeyChanges
+    }) {
+      const routes = routeNames.map(name => state.routes.find(r => r.name === name && !routeKeyChanges.includes(r.name)) ?? {
+        name,
+        key: `${name}-${nanoid()}`,
+        params: routeParamList[name]
+      });
+      const routeKeys = new Set(routes.map(route => route.key));
+      const currentRoute = state.routes[state.index];
+      if (currentRoute == null) {
+        throw new Error(`Couldn't find a route at index ${state.index}.`);
+      }
+      const history = state.history.filter(
+      // Type will always be 'route' for tabs, but could be different in a router extending this (e.g. drawer)
+      item => item.type !== 'route' || routeKeys.has(item.key));
+      let index = routeNames.indexOf(currentRoute.name);
+      if (index === -1) {
+        // The focused route was removed, so focus the most recently visited surviving route
+        const previousRouteItem = history.findLast(item => item.type === 'route');
+        index = Math.max(0, routes.findIndex(route => route.key === previousRouteItem?.key));
+      }
+      return {
+        ...state,
+        routeNames,
+        routes,
+        ...changeIndex({
+          routes,
+          history
+        }, index, backBehavior, initialRouteName),
+        preloadedRouteKeys: state.preloadedRouteKeys.filter(key => routeKeys.has(key))
+      };
+    },
+    getStateForRouteFocus(state, key) {
+      const index = state.routes.findIndex(r => r.key === key);
+      if (index === -1 || index === state.index) {
+        return state;
+      }
+      return {
+        ...state,
+        ...changeIndex(state, index, backBehavior, initialRouteName)
+      };
+    },
+    getStateForAction(state, action, {
+      routeParamList,
+      routeGetIdList
+    }) {
+      switch (action.type) {
+        case 'JUMP_TO':
+        case 'NAVIGATE':
+        case 'NAVIGATE_DEPRECATED':
+          {
+            const index = state.routes.findIndex(route => route.name === action.payload.name);
+            if (index === -1) {
+              return null;
+            }
+            const route = state.routes[index];
+            if (route == null) {
+              throw new Error(`Couldn't find a route at index ${index}.`);
+            }
+            const getId = routeGetIdList[route.name];
+            const currentId = getId?.({
+              params: route.params
+            });
+            const nextId = getId?.({
+              params: action.payload.params
+            });
+            const key = currentId === nextId ? route.key : `${route.name}-${nanoid()}`;
+            let params;
+            if ((action.type === 'NAVIGATE' || action.type === 'NAVIGATE_DEPRECATED') && action.payload.merge && currentId === nextId) {
+              params = action.payload.params !== undefined || routeParamList[route.name] !== undefined ? {
+                ...routeParamList[route.name],
+                ...route.params,
+                ...action.payload.params
+              } : route.params;
+            } else {
+              params = createParamsFromAction({
+                action,
+                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,
+              key,
+              path,
+              params
+            } : route;
+            const routes = state.routes.map((item, routeIndex) => routeIndex === index ? nextRoute : item);
+            const updatedState = {
+              ...state,
+              routes,
+              history: key === route.key ? state.history : state.history.filter(it => it.type !== 'route' || it.key !== route.key)
+            };
+            return {
+              ...updatedState,
+              ...changeIndex(updatedState, index, backBehavior, initialRouteName),
+              preloadedRouteKeys: updatedState.preloadedRouteKeys.filter(key => key !== route.key && key !== nextRoute.key)
+            };
+          }
+        case 'SET_PARAMS':
+        case 'REPLACE_PARAMS':
+          {
+            const nextState = BaseRouter.getStateForAction(state, action);
+            if (nextState !== null) {
+              const index = nextState.index;
+              if (index != null) {
+                const focusedRoute = nextState.routes[index];
+                const historyItemIndex = state.history.findLastIndex(item => item.type === 'route' && item.key === focusedRoute.key);
+                let updatedHistory = state.history;
+                if (historyItemIndex !== -1) {
+                  updatedHistory = [...state.history];
+                  const item = updatedHistory[historyItemIndex];
+                  if (item.type === 'route') {
+                    updatedHistory[historyItemIndex] = {
+                      ...item,
+                      params: focusedRoute.params
+                    };
+                  }
+                }
+                return {
+                  ...nextState,
+                  history: updatedHistory
+                };
+              }
+            }
+            return nextState;
+          }
+        case 'GO_BACK':
+          {
+            if (state.history.length === 1) {
+              return null;
+            }
+            const previousHistoryItem = state.history[state.history.length - 2];
+            if (previousHistoryItem?.type !== 'route') {
+              return null;
+            }
+            const previousKey = previousHistoryItem.key;
+            const index = state.routes.findLastIndex(route => route.key === previousKey);
+            if (index === -1) {
+              return null;
+            }
+            let routes = state.routes;
+            if (backBehavior === 'fullHistory' && routes[index].params !== previousHistoryItem.params) {
+              routes = [...state.routes];
+              routes[index] = {
+                ...routes[index],
+                params: previousHistoryItem.params
+              };
+            }
+            return {
+              ...state,
+              routes,
+              preloadedRouteKeys: state.preloadedRouteKeys.filter(key => key !== state.routes[index].key),
+              history: state.history.slice(0, -1),
+              index
+            };
+          }
+        case 'PRELOAD':
+          {
+            const routeIndex = state.routes.findIndex(route => route.name === action.payload.name);
+            if (routeIndex === -1) {
+              return null;
+            }
+            const route = state.routes[routeIndex];
+            const getId = routeGetIdList[route.name];
+            const currentId = getId?.({
+              params: route.params
+            });
+            const nextId = getId?.({
+              params: action.payload.params
+            });
+            const key = currentId === nextId ? route.key : `${route.name}-${nanoid()}`;
+            const params = createParamsFromAction({
+              action,
+              routeParamList
+            });
+            const newRoute = params !== route.params ? {
+              ...route,
+              key,
+              params
+            } : route;
+            let history = state.history;
+            if (key !== route.key) {
+              history = history.filter(record => record.type !== 'route' || record.key !== route.key);
+              if (routeIndex === state.index) {
+                history = history.concat({
+                  type: TYPE_ROUTE,
+                  key: newRoute.key,
+                  params: backBehavior === 'fullHistory' ? newRoute.params : undefined
+                });
+              }
+            }
+            return {
+              ...state,
+              preloadedRouteKeys: state.preloadedRouteKeys.filter(key => key !== route.key).concat(newRoute.key),
+              routes: state.routes.map((route, index) => index === routeIndex ? newRoute : route),
+              history
+            };
+          }
+        default:
+          return BaseRouter.getStateForAction(state, action);
+      }
+    }
+  };
+  return router;
+}
+//# sourceMappingURL=SwitchRouter.js.map

package/lib/module/SwitchRouter.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["nanoid","BaseRouter","createParamsFromAction","TYPE_ROUTE","getRouteHistory","routes","index","backBehavior","initialRouteName","history","type","key","params","undefined","initialRouteIndex","i","unshift","findIndex","route","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","Error","has","previousRouteItem","findLast","getStateForRouteFocus","getStateForAction","action","routeGetIdList","payload","getId","currentId","nextId","merge","path","nextRoute","routeIndex","updatedState","nextState","focusedRoute","historyItemIndex","updatedHistory","previousHistoryItem","previousKey","newRoute","record"],"sourceRoot":"../../src","sources":["SwitchRouter.tsx"],"mappings":"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","ignoreList":[]}