@amazon-devices/react-navigation__routers 7.0.9000000000 → 8.0.9000000000-rn-83

package/lib/module/CommonActions.js

@@ -1,16 +1,40 @@
+"use strict";
+
 export function goBack() {
   return {
     type: 'GO_BACK'
   };
 }
-
-// eslint-disable-next-line no-redeclare
-
-// eslint-disable-next-line no-redeclare
 export function navigate(...args) {
   if (typeof args[0] === 'string') {
+    const [name, params, options] = args;
+    if (typeof options === 'boolean') {
+      console.warn(`Passing a boolean as the third argument to 'navigate' is deprecated. Pass '{ merge: true }' instead.`);
+    }
     return {
       type: 'NAVIGATE',
+      payload: {
+        name,
+        params,
+        merge: typeof options === 'boolean' ? options : options?.merge,
+        pop: options?.pop
+      }
+    };
+  } else {
+    const payload = args[0] || {};
+    if (!('name' in payload)) {
+      throw new Error('You need to specify a name when calling navigate with an object as the argument. See https://reactnavigation.org/docs/navigation-actions#navigate for usage.');
+    }
+    return {
+      type: 'NAVIGATE',
+      payload
+    };
+  }
+}
+export function navigateDeprecated(...args) {
+  if (typeof args[0] === 'string') {
+    return {
+      type: 'NAVIGATE_DEPRECATED',
       payload: {
         name: args[0],
         params: args[1]
@@ -18,11 +42,11 @@ export function navigate(...args) {
     };
   } else {
     const payload = args[0] || {};
-    if (!payload.hasOwnProperty('key') && !payload.hasOwnProperty('name')) {
-      throw new Error('You need to specify name or key when calling navigate with an object as the argument. See https://reactnavigation.org/docs/navigation-actions#navigate for usage.');
+    if (!('name' in payload)) {
+      throw new Error('You need to specify a name when calling navigateDeprecated with an object as the argument. See https://reactnavigation.org/docs/navigation-actions#navigatelegacy for usage.');
     }
     return {
-      type: 'NAVIGATE',
+      type: 'NAVIGATE_DEPRECATED',
       payload
     };
   }
@@ -41,4 +65,21 @@ export function setParams(params) {
     }
   };
 }
+export function replaceParams(params) {
+  return {
+    type: 'REPLACE_PARAMS',
+    payload: {
+      params
+    }
+  };
+}
+export function preload(name, params) {
+  return {
+    type: 'PRELOAD',
+    payload: {
+      name,
+      params
+    }
+  };
+}
 //# sourceMappingURL=CommonActions.js.map

package/lib/module/CommonActions.js.map

@@ -1 +1 @@
-{"version":3,"names":["goBack","type","navigate","args","payload","name","params","hasOwnProperty","Error","reset","state","setParams"],"sourceRoot":"../../src","sources":["CommonActions.tsx"],"mappings":"AAgDA,OAAO,SAASA,MAAMA,CAAA,EAAW;EAC/B,OAAO;IAAEC,IAAI,EAAE;EAAU,CAAC;AAC5B;;AAaA;;AAEA;AACA,OAAO,SAASC,QAAQA,CAAC,GAAGC,IAAS,EAAU;EAC7C,IAAI,OAAOA,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;IAC/B,OAAO;MAAEF,IAAI,EAAE,UAAU;MAAEG,OAAO,EAAE;QAAEC,IAAI,EAAEF,IAAI,CAAC,CAAC,CAAC;QAAEG,MAAM,EAAEH,IAAI,CAAC,CAAC;MAAE;IAAE,CAAC;EAC1E,CAAC,MAAM;IACL,MAAMC,OAAO,GAAGD,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAE7B,IAAI,CAACC,OAAO,CAACG,cAAc,CAAC,KAAK,CAAC,IAAI,CAACH,OAAO,CAACG,cAAc,CAAC,MAAM,CAAC,EAAE;MACrE,MAAM,IAAIC,KAAK,CACb,mKACF,CAAC;IACH;IAEA,OAAO;MAAEP,IAAI,EAAE,UAAU;MAAEG;IAAQ,CAAC;EACtC;AACF;AAEA,OAAO,SAASK,KAAKA,CAACC,KAA6B,EAAU;EAC3D,OAAO;IAAET,IAAI,EAAE,OAAO;IAAEG,OAAO,EAAEM;EAAM,CAAC;AAC1C;AAEA,OAAO,SAASC,SAASA,CAACL,MAAc,EAAU;EAChD,OAAO;IAAEL,IAAI,EAAE,YAAY;IAAEG,OAAO,EAAE;MAAEE;IAAO;EAAE,CAAC;AACpD","ignoreList":[]}
+{"version":3,"names":["goBack","type","navigate","args","name","params","options","console","warn","payload","merge","pop","Error","navigateDeprecated","reset","state","setParams","replaceParams","preload"],"sourceRoot":"../../src","sources":["CommonActions.tsx"],"mappings":";;AA+EA,OAAO,SAASA,MAAMA,CAAA,EAAW;EAC/B,OAAO;IAAEC,IAAI,EAAE;EAAU,CAAC;AAC5B;AAmBA,OAAO,SAASC,QAAQA,CAAC,GAAGC,IAAS,EAAU;EAC7C,IAAI,OAAOA,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;IAC/B,MAAM,CAACC,IAAI,EAAEC,MAAM,EAAEC,OAAO,CAAC,GAAGH,IAAI;IAEpC,IAAI,OAAOG,OAAO,KAAK,SAAS,EAAE;MAChCC,OAAO,CAACC,IAAI,CACV,sGACF,CAAC;IACH;IAEA,OAAO;MACLP,IAAI,EAAE,UAAU;MAChBQ,OAAO,EAAE;QACPL,IAAI;QACJC,MAAM;QACNK,KAAK,EAAE,OAAOJ,OAAO,KAAK,SAAS,GAAGA,OAAO,GAAGA,OAAO,EAAEI,KAAK;QAC9DC,GAAG,EAAEL,OAAO,EAAEK;MAChB;IACF,CAAC;EACH,CAAC,MAAM;IACL,MAAMF,OAAO,GAAGN,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAE7B,IAAI,EAAE,MAAM,IAAIM,OAAO,CAAC,EAAE;MACxB,MAAM,IAAIG,KAAK,CACb,8JACF,CAAC;IACH;IAEA,OAAO;MAAEX,IAAI,EAAE,UAAU;MAAEQ;IAAQ,CAAC;EACtC;AACF;AAEA,OAAO,SAASI,kBAAkBA,CAChC,GAAGV,IAG6C,EACxC;EACR,IAAI,OAAOA,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;IAC/B,OAAO;MACLF,IAAI,EAAE,qBAAqB;MAC3BQ,OAAO,EAAE;QAAEL,IAAI,EAAED,IAAI,CAAC,CAAC,CAAC;QAAEE,MAAM,EAAEF,IAAI,CAAC,CAAC;MAAE;IAC5C,CAAC;EACH,CAAC,MAAM;IACL,MAAMM,OAAO,GAAGN,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAE7B,IAAI,EAAE,MAAM,IAAIM,OAAO,CAAC,EAAE;MACxB,MAAM,IAAIG,KAAK,CACb,8KACF,CAAC;IACH;IAEA,OAAO;MAAEX,IAAI,EAAE,qBAAqB;MAAEQ;IAAQ,CAAC;EACjD;AACF;AAEA,OAAO,SAASK,KAAKA,CAACC,KAA6B,EAAE;EACnD,OAAO;IAAEd,IAAI,EAAE,OAAO;IAAEQ,OAAO,EAAEM;EAAM,CAAC;AAC1C;AAEA,OAAO,SAASC,SAASA,CAACX,MAAc,EAAE;EACxC,OAAO;IACLJ,IAAI,EAAE,YAAY;IAClBQ,OAAO,EAAE;MAAEJ;IAAO;EACpB,CAAC;AACH;AAEA,OAAO,SAASY,aAAaA,CAACZ,MAAc,EAAE;EAC5C,OAAO;IACLJ,IAAI,EAAE,gBAAgB;IACtBQ,OAAO,EAAE;MAAEJ;IAAO;EACpB,CAAC;AACH;AAEA,OAAO,SAASa,OAAOA,CAACd,IAAY,EAAEC,MAAe,EAAE;EACrD,OAAO;IACLJ,IAAI,EAAE,SAAS;IACfQ,OAAO,EAAE;MAAEL,IAAI;MAAEC;IAAO;EAC1B,CAAC;AACH","ignoreList":[]}

package/lib/module/DrawerRouter.js

@@ -1,5 +1,7 @@
+"use strict";
+
 import { nanoid } from 'nanoid/non-secure';
-import TabRouter, { TabActions } from './TabRouter';
+import { TabActions, TabRouter } from "./TabRouter.js";
 export const DrawerActions = {
   ...TabActions,
   openDrawer() {
@@ -18,15 +20,12 @@ export const DrawerActions = {
     };
   }
 };
-export default function DrawerRouter({
+export function DrawerRouter({
   defaultStatus = 'closed',
   ...rest
 }) {
   const router = TabRouter(rest);
-  const isDrawerInHistory = state => {
-    var _state$history;
-    return Boolean((_state$history = state.history) === null || _state$history === void 0 ? void 0 : _state$history.some(it => it.type === 'drawer'));
-  };
+  const isDrawerInHistory = state => Boolean(state.history?.some(it => it.type === 'drawer'));
   const addDrawerToHistory = state => {
     if (isDrawerInHistory(state)) {
       return state;
@@ -123,6 +122,7 @@ export default function DrawerRouter({
           return addDrawerToHistory(state);
         case 'JUMP_TO':
         case 'NAVIGATE':
+        case 'NAVIGATE_DEPRECATED':
           {
             const result = router.getStateForAction(state, action, options);
             if (result != null && result.index !== state.index) {

package/lib/module/DrawerRouter.js.map

@@ -1 +1 @@
-{"version":3,"names":["nanoid","TabRouter","TabActions","DrawerActions","openDrawer","type","closeDrawer","toggleDrawer","DrawerRouter","defaultStatus","rest","router","isDrawerInHistory","state","_state$history","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","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":[]}

package/lib/module/StackRouter.js

@@ -1,5 +1,9 @@
+"use strict";
+
 import { nanoid } from 'nanoid/non-secure';
-import BaseRouter from './BaseRouter';
+import { BaseRouter } from "./BaseRouter.js";
+import { createParamsFromAction } from "./createParamsFromAction.js";
+import { createRouteFromAction } from "./createRouteFromAction.js";
 export const StackActions = {
   replace(name, params) {
     return {
@@ -31,9 +35,22 @@ export const StackActions = {
     return {
       type: 'POP_TO_TOP'
     };
+  },
+  popTo(name, params, options) {
+    if (typeof options === 'boolean') {
+      console.warn(`Passing a boolean as the third argument to 'popTo' is deprecated. Pass '{ merge: true }' instead.`);
+    }
+    return {
+      type: 'POP_TO',
+      payload: {
+        name,
+        params,
+        merge: typeof options === 'boolean' ? options : options?.merge
+      }
+    };
   }
 };
-export default function StackRouter(options) {
+export function StackRouter(options) {
   const router = {
     ...BaseRouter,
     type: 'stack',
@@ -48,6 +65,7 @@ export default function StackRouter(options) {
         key: `stack-${nanoid()}`,
         index: 0,
         routeNames,
+        preloadedRoutes: [],
         routes: [{
           key: `${initialRouteName}-${nanoid()}`,
           name: initialRouteName,
@@ -59,7 +77,7 @@ export default function StackRouter(options) {
       routeNames,
       routeParamList
     }) {
-      let state = partialState;
+      const state = partialState;
       if (state.stale === false) {
         return state;
       }
@@ -71,6 +89,14 @@ export default function StackRouter(options) {
           ...route.params
         } : route.params
       }));
+      const preloadedRoutes = state.preloadedRoutes?.filter(route => routeNames.includes(route.name)).map(route => ({
+        ...route,
+        key: route.key || `${route.name}-${nanoid()}`,
+        params: routeParamList[route.name] !== undefined ? {
+          ...routeParamList[route.name],
+          ...route.params
+        } : route.params
+      })) ?? [];
       if (routes.length === 0) {
         const initialRouteName = options.initialRouteName !== undefined ? options.initialRouteName : routeNames[0];
         routes.push({
@@ -85,7 +111,8 @@ export default function StackRouter(options) {
         key: `stack-${nanoid()}`,
         index: routes.length - 1,
         routeNames,
-        routes
+        routes,
+        preloadedRoutes
       };
     },
     getStateForRouteNamesChange(state, {
@@ -127,72 +154,183 @@ export default function StackRouter(options) {
       switch (action.type) {
         case 'REPLACE':
           {
-            const index = action.target === state.key && action.source ? state.routes.findIndex(r => r.key === action.source) : state.index;
-            if (index === -1) {
+            const currentIndex = action.target === state.key && action.source ? state.routes.findIndex(r => r.key === action.source) : state.index;
+            if (currentIndex === -1) {
               return null;
             }
-            const {
-              name,
-              key,
-              params
-            } = action.payload;
-            if (!state.routeNames.includes(name)) {
+            if (!state.routeNames.includes(action.payload.name)) {
               return null;
             }
+            const getId = options.routeGetIdList[action.payload.name];
+            const id = getId?.({
+              params: action.payload.params
+            });
+
+            // Re-use preloaded route if available
+            let route = state.preloadedRoutes.find(route => route.name === action.payload.name && id === getId?.({
+              params: route.params
+            }));
+            if (!route) {
+              route = createRouteFromAction({
+                action,
+                routeParamList
+              });
+            }
             return {
               ...state,
-              routes: state.routes.map((route, i) => i === index ? {
-                key: key !== undefined ? key : `${name}-${nanoid()}`,
-                name,
-                params: routeParamList[name] !== undefined ? {
-                  ...routeParamList[name],
-                  ...params
-                } : params
-              } : route)
+              routes: state.routes.map((r, i) => i === currentIndex ? route : r),
+              preloadedRoutes: state.preloadedRoutes.filter(r => r.key !== route.key)
             };
           }
         case 'PUSH':
-          if (state.routeNames.includes(action.payload.name)) {
+        case 'NAVIGATE':
+          {
+            if (!state.routeNames.includes(action.payload.name)) {
+              return null;
+            }
             const getId = options.routeGetIdList[action.payload.name];
-            const id = getId === null || getId === void 0 ? void 0 : getId({
+            const id = getId?.({
               params: action.payload.params
             });
-            const route = id ? state.routes.find(route => route.name === action.payload.name && id === (getId === null || getId === void 0 ? void 0 : getId({
-              params: route.params
-            }))) : undefined;
+            let route;
+            if (id !== undefined) {
+              route = state.routes.findLast(route => route.name === action.payload.name && id === getId?.({
+                params: route.params
+              }));
+            } else if (action.type === 'NAVIGATE') {
+              const currentRoute = state.routes[state.index];
+
+              // If the route matches the current one, then navigate to it
+              if (action.payload.name === currentRoute.name) {
+                route = currentRoute;
+              } else if (action.payload.pop) {
+                route = state.routes.findLast(route => route.name === action.payload.name);
+              }
+            }
+            if (!route) {
+              route = state.preloadedRoutes.find(route => route.name === action.payload.name && id === getId?.({
+                params: route.params
+              }));
+            }
+            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 = createParamsFromAction({
+                action,
+                routeParamList
+              });
+            }
             let routes;
             if (route) {
-              routes = state.routes.filter(r => r.key !== route.key);
-              routes.push({
-                ...route,
-                params: routeParamList[action.payload.name] !== undefined ? {
-                  ...routeParamList[action.payload.name],
-                  ...action.payload.params
-                } : action.payload.params
-              });
+              if (action.type === 'NAVIGATE' && action.payload.pop) {
+                routes = [];
+
+                // Get all routes until the matching one
+                for (const r of state.routes) {
+                  if (r.key === route.key) {
+                    routes.push({
+                      ...route,
+                      path: action.payload.path !== undefined ? action.payload.path : route.path,
+                      params
+                    });
+                    break;
+                  }
+                  routes.push(r);
+                }
+              } else {
+                routes = state.routes.filter(r => r.key !== route.key);
+                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,
-                params: routeParamList[action.payload.name] !== undefined ? {
-                  ...routeParamList[action.payload.name],
-                  ...action.payload.params
-                } : action.payload.params
+                path: action.type === 'NAVIGATE' ? action.payload.path : undefined,
+                params
               }];
             }
             return {
               ...state,
               index: routes.length - 1,
+              preloadedRoutes: state.preloadedRoutes.filter(route => routes[routes.length - 1].key !== route.key),
               routes
             };
           }
-          return null;
+        case 'NAVIGATE_DEPRECATED':
+          {
+            if (!state.routeNames.includes(action.payload.name)) {
+              return null;
+            }
+            if (state.preloadedRoutes.find(route => route.name === action.payload.name && id === getId?.({
+              params: route.params
+            }))) {
+              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 !== undefined) {
+              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 {
+              index = state.routes.findLastIndex(route => route.name === action.payload.name);
+            }
+            if (index === -1) {
+              const routes = [...state.routes, createRouteFromAction({
+                action,
+                routeParamList
+              })];
+              return {
+                ...state,
+                routes,
+                index: routes.length - 1
+              };
+            }
+            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 = createParamsFromAction({
+                action,
+                routeParamList
+              });
+            }
+            return {
+              ...state,
+              index,
+              routes: [...state.routes.slice(0, index), params !== route.params ? {
+                ...route,
+                params
+              } : state.routes[index]]
+            };
+          }
         case 'POP':
           {
-            const index = action.target === state.key && action.source ? state.routes.findIndex(r => r.key === action.source) : state.index;
-            if (index > 0) {
-              const count = Math.max(index - action.payload.count + 1, 1);
-              const routes = state.routes.slice(0, count).concat(state.routes.slice(index + 1));
+            const currentIndex = action.target === state.key && action.source ? state.routes.findIndex(r => r.key === action.source) : state.index;
+            if (currentIndex > 0) {
+              const count = Math.max(currentIndex - action.payload.count + 1, 1);
+              const routes = state.routes.slice(0, count).concat(state.routes.slice(currentIndex + 1));
               return {
                 ...state,
                 index: routes.length - 1,
@@ -208,50 +346,55 @@ export default function StackRouter(options) {
               count: state.routes.length - 1
             }
           }, options);
-        case 'NAVIGATE':
-          if (action.payload.name !== undefined && !state.routeNames.includes(action.payload.name)) {
-            return null;
-          }
-          if (action.payload.key || action.payload.name) {
-            // If the route already exists, navigate to that
+        case 'POP_TO':
+          {
+            const currentIndex = action.target === state.key && action.source ? state.routes.findLastIndex(r => r.key === action.source) : state.index;
+            if (currentIndex === -1) {
+              return null;
+            }
+            if (!state.routeNames.includes(action.payload.name)) {
+              return null;
+            }
+
+            // If the route already exists, navigate to it
             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 === null || getId === void 0 ? void 0 : getId({
+            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 === null || getId === void 0 ? void 0 : getId({
+            if (id !== undefined) {
+              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 if (state.routes[currentIndex].name === action.payload.name) {
+              index = currentIndex;
             } 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) {
+              for (let i = currentIndex; i >= 0; i--) {
+                if (state.routes[i].name === action.payload.name) {
                   index = i;
                   break;
                 }
               }
             }
-            if (index === -1 && action.payload.key && action.payload.name === undefined) {
-              return null;
-            }
-            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
-              }];
+
+            // If the route doesn't exist, remove the current route and add the new one
+            if (index === -1) {
+              // Re-use preloaded route if available
+              let route = state.preloadedRoutes.find(route => route.name === action.payload.name && id === getId?.({
+                params: route.params
+              }));
+              if (!route) {
+                route = createRouteFromAction({
+                  action,
+                  routeParamList
+                });
+              }
+              const routes = state.routes.slice(0, currentIndex).concat(route);
               return {
                 ...state,
+                index: routes.length - 1,
                 routes,
-                index: routes.length - 1
+                preloadedRoutes: state.preloadedRoutes.filter(r => r.key !== route.key)
               };
             }
             const route = state.routes[index];
@@ -263,22 +406,20 @@ export default function StackRouter(options) {
                 ...action.payload.params
               } : route.params;
             } else {
-              params = routeParamList[route.name] !== undefined ? {
-                ...routeParamList[route.name],
-                ...action.payload.params
-              } : action.payload.params;
+              params = createParamsFromAction({
+                action,
+                routeParamList
+              });
             }
             return {
               ...state,
               index,
-              routes: [...state.routes.slice(0, index), params !== route.params || action.payload.path && action.payload.path !== route.path ? {
+              routes: [...state.routes.slice(0, index), params !== route.params ? {
                 ...route,
-                path: action.payload.path ?? route.path,
                 params
               } : state.routes[index]]
             };
           }
-          return null;
         case 'GO_BACK':
           if (state.index > 0) {
             return router.getStateForAction(state, {
@@ -291,6 +432,46 @@ export default function StackRouter(options) {
             }, options);
           }
           return null;
+        case 'PRELOAD':
+          {
+            const getId = options.routeGetIdList[action.payload.name];
+            const id = getId?.({
+              params: action.payload.params
+            });
+            let route;
+            if (id !== undefined) {
+              route = state.routes.find(route => route.name === action.payload.name && id === getId?.({
+                params: route.params
+              }));
+            }
+            if (route) {
+              return {
+                ...state,
+                routes: state.routes.map(r => {
+                  if (r.key !== route?.key) {
+                    return r;
+                  }
+                  return {
+                    ...r,
+                    params: createParamsFromAction({
+                      action,
+                      routeParamList
+                    })
+                  };
+                })
+              };
+            } else {
+              return {
+                ...state,
+                preloadedRoutes: state.preloadedRoutes.filter(r => r.name !== action.payload.name || id !== getId?.({
+                  params: r.params
+                })).concat(createRouteFromAction({
+                  action,
+                  routeParamList
+                }))
+              };
+            }
+          }
         default:
           return BaseRouter.getStateForAction(state, action);
       }