@react-navigation/routers 6.1.5 → 7.0.0-alpha.0

package/lib/module/DrawerRouter.js

@@ -1,25 +1,22 @@
 import { nanoid } from 'nanoid/non-secure';
 import TabRouter, { TabActions } from './TabRouter';
-export const DrawerActions = { ...TabActions,
-
+export const DrawerActions = {
+  ...TabActions,
   openDrawer() {
     return {
       type: 'OPEN_DRAWER'
     };
   },
-
   closeDrawer() {
     return {
       type: 'CLOSE_DRAWER'
     };
   },
-
   toggleDrawer() {
     return {
       type: 'TOGGLE_DRAWER'
     };
   }
-
 };
 export default function DrawerRouter(_ref) {
   let {
@@ -27,55 +24,46 @@ export default function DrawerRouter(_ref) {
     ...rest
   } = _ref;
   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 addDrawerToHistory = state => {
     if (isDrawerInHistory(state)) {
       return state;
     }
-
-    return { ...state,
+    return {
+      ...state,
       history: [...state.history, {
         type: 'drawer',
         status: defaultStatus === 'open' ? 'closed' : 'open'
       }]
     };
   };
-
   const removeDrawerFromHistory = state => {
     if (!isDrawerInHistory(state)) {
       return state;
     }
-
-    return { ...state,
+    return {
+      ...state,
       history: state.history.filter(it => it.type !== 'drawer')
     };
   };
-
   const openDrawer = state => {
     if (defaultStatus === 'open') {
       return removeDrawerFromHistory(state);
     }
-
     return addDrawerToHistory(state);
   };
-
   const closeDrawer = state => {
     if (defaultStatus === 'open') {
       return addDrawerToHistory(state);
     }
-
     return removeDrawerFromHistory(state);
   };
-
-  return { ...router,
+  return {
+    ...router,
     type: 'drawer',
-
     getInitialState(_ref2) {
       let {
         routeNames,
@@ -87,88 +75,74 @@ export default function DrawerRouter(_ref) {
         routeParamList,
         routeGetIdList
       });
-      return { ...state,
+      return {
+        ...state,
         default: defaultStatus,
         stale: false,
         type: 'drawer',
         key: `drawer-${nanoid()}`
       };
     },
-
     getRehydratedState(partialState, _ref3) {
       let {
         routeNames,
         routeParamList,
         routeGetIdList
       } = _ref3;
-
       if (partialState.stale === false) {
         return partialState;
       }
-
       let state = router.getRehydratedState(partialState, {
         routeNames,
         routeParamList,
         routeGetIdList
       });
-
       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,
+      return {
+        ...state,
         default: defaultStatus,
         type: 'drawer',
         key: `drawer-${nanoid()}`
       };
     },
-
     getStateForRouteFocus(state, key) {
       const result = router.getStateForRouteFocus(state, key);
       return closeDrawer(result);
     },
-
     getStateForAction(state, action, options) {
       switch (action.type) {
         case 'OPEN_DRAWER':
           return openDrawer(state);
-
         case 'CLOSE_DRAWER':
           return closeDrawer(state);
-
         case 'TOGGLE_DRAWER':
           if (isDrawerInHistory(state)) {
             return removeDrawerFromHistory(state);
           }
-
           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) {
               return closeDrawer(result);
             }
-
             return result;
           }
-
         case 'GO_BACK':
           if (isDrawerInHistory(state)) {
             return removeDrawerFromHistory(state);
           }
-
           return router.getStateForAction(state, action, options);
-
         default:
           return router.getStateForAction(state, action, options);
       }
     },
-
     actionCreators: DrawerActions
   };
 }

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","Boolean","history","some","it","addDrawerToHistory","status","removeDrawerFromHistory","filter","getInitialState","routeNames","routeParamList","routeGetIdList","default","stale","key","getRehydratedState","partialState","getStateForRouteFocus","result","getStateForAction","action","options","index","actionCreators"],"sources":["DrawerRouter.tsx"],"sourcesContent":["import { nanoid } from 'nanoid/non-secure';\n\nimport TabRouter, {\n  TabActionHelpers,\n  TabActions,\n  TabActionType,\n  TabNavigationState,\n  TabRouterOptions,\n} from './TabRouter';\nimport type {\n  CommonNavigationAction,\n  ParamListBase,\n  PartialState,\n  Router,\n} from './types';\nexport type DrawerStatus = 'open' | 'closed';\n\nexport type DrawerActionType =\n  | TabActionType\n  | {\n      type: 'OPEN_DRAWER' | 'CLOSE_DRAWER' | 'TOGGLE_DRAWER';\n      source?: string;\n      target?: string;\n    };\n\nexport type DrawerRouterOptions = TabRouterOptions & {\n  defaultStatus?: DrawerStatus;\n};\n\nexport type DrawerNavigationState<ParamList extends ParamListBase> = Omit<\n  TabNavigationState<ParamList>,\n  'type' | 'history'\n> & {\n  /**\n   * Type of the router, in this case, it's drawer.\n   */\n  type: 'drawer';\n  /**\n   * Default status of the drawer.\n   */\n  default: DrawerStatus;\n  /**\n   * List of previously visited route keys and drawer open status.\n   */\n  history: (\n    | { type: 'route'; key: string }\n    | { type: 'drawer'; status: DrawerStatus }\n  )[];\n};\n\nexport type DrawerActionHelpers<ParamList extends ParamListBase> =\n  TabActionHelpers<ParamList> & {\n    /**\n     * Open the drawer sidebar.\n     */\n    openDrawer(): void;\n\n    /**\n     * Close the drawer sidebar.\n     */\n    closeDrawer(): void;\n\n    /**\n     * Open the drawer sidebar if closed, or close if opened.\n     */\n    toggleDrawer(): void;\n  };\n\nexport const DrawerActions = {\n  ...TabActions,\n  openDrawer(): DrawerActionType {\n    return { type: 'OPEN_DRAWER' };\n  },\n  closeDrawer(): DrawerActionType {\n    return { type: 'CLOSE_DRAWER' };\n  },\n  toggleDrawer(): DrawerActionType {\n    return { type: 'TOGGLE_DRAWER' };\n  },\n};\n\nexport default function DrawerRouter({\n  defaultStatus = 'closed',\n  ...rest\n}: DrawerRouterOptions): Router<\n  DrawerNavigationState<ParamListBase>,\n  DrawerActionType | CommonNavigationAction\n> {\n  const router = TabRouter(rest) as unknown as Router<\n    DrawerNavigationState<ParamListBase>,\n    TabActionType | CommonNavigationAction\n  >;\n\n  const isDrawerInHistory = (\n    state:\n      | DrawerNavigationState<ParamListBase>\n      | PartialState<DrawerNavigationState<ParamListBase>>\n  ) => Boolean(state.history?.some((it) => it.type === 'drawer'));\n\n  const addDrawerToHistory = (\n    state: DrawerNavigationState<ParamListBase>\n  ): DrawerNavigationState<ParamListBase> => {\n    if (isDrawerInHistory(state)) {\n      return state;\n    }\n\n    return {\n      ...state,\n      history: [\n        ...state.history,\n        {\n          type: 'drawer',\n          status: defaultStatus === 'open' ? 'closed' : 'open',\n        },\n      ],\n    };\n  };\n\n  const removeDrawerFromHistory = (\n    state: DrawerNavigationState<ParamListBase>\n  ): DrawerNavigationState<ParamListBase> => {\n    if (!isDrawerInHistory(state)) {\n      return state;\n    }\n\n    return {\n      ...state,\n      history: state.history.filter((it) => it.type !== 'drawer'),\n    };\n  };\n\n  const openDrawer = (\n    state: DrawerNavigationState<ParamListBase>\n  ): DrawerNavigationState<ParamListBase> => {\n    if (defaultStatus === 'open') {\n      return removeDrawerFromHistory(state);\n    }\n\n    return addDrawerToHistory(state);\n  };\n\n  const closeDrawer = (\n    state: DrawerNavigationState<ParamListBase>\n  ): DrawerNavigationState<ParamListBase> => {\n    if (defaultStatus === 'open') {\n      return addDrawerToHistory(state);\n    }\n\n    return removeDrawerFromHistory(state);\n  };\n\n  return {\n    ...router,\n\n    type: 'drawer',\n\n    getInitialState({ routeNames, routeParamList, routeGetIdList }) {\n      const state = router.getInitialState({\n        routeNames,\n        routeParamList,\n        routeGetIdList,\n      });\n\n      return {\n        ...state,\n        default: defaultStatus,\n        stale: false,\n        type: 'drawer',\n        key: `drawer-${nanoid()}`,\n      };\n    },\n\n    getRehydratedState(\n      partialState,\n      { routeNames, routeParamList, routeGetIdList }\n    ) {\n      if (partialState.stale === false) {\n        return partialState;\n      }\n\n      let state = router.getRehydratedState(partialState, {\n        routeNames,\n        routeParamList,\n        routeGetIdList,\n      });\n\n      if (isDrawerInHistory(partialState)) {\n        // Re-sync the drawer entry in history to correct it if it was wrong\n        state = removeDrawerFromHistory(state);\n        state = addDrawerToHistory(state);\n      }\n\n      return {\n        ...state,\n        default: defaultStatus,\n        type: 'drawer',\n        key: `drawer-${nanoid()}`,\n      };\n    },\n\n    getStateForRouteFocus(state, key) {\n      const result = router.getStateForRouteFocus(state, key);\n\n      return closeDrawer(result);\n    },\n\n    getStateForAction(state, action, options) {\n      switch (action.type) {\n        case 'OPEN_DRAWER':\n          return openDrawer(state);\n\n        case 'CLOSE_DRAWER':\n          return closeDrawer(state);\n\n        case 'TOGGLE_DRAWER':\n          if (isDrawerInHistory(state)) {\n            return removeDrawerFromHistory(state);\n          }\n\n          return addDrawerToHistory(state);\n\n        case 'JUMP_TO':\n        case 'NAVIGATE': {\n          const result = router.getStateForAction(state, action, options);\n\n          if (result != null && result.index !== state.index) {\n            return closeDrawer(result as DrawerNavigationState<ParamListBase>);\n          }\n\n          return result;\n        }\n\n        case 'GO_BACK':\n          if (isDrawerInHistory(state)) {\n            return removeDrawerFromHistory(state);\n          }\n\n          return router.getStateForAction(state, action, options);\n\n        default:\n          return router.getStateForAction(state, action, options);\n      }\n    },\n\n    actionCreators: DrawerActions,\n  };\n}\n"],"mappings":"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"}
+{"version":3,"names":["nanoid","TabRouter","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":"AAAA,SAASA,MAAM,QAAQ,mBAAmB;AAE1C,OAAOC,SAAS,IAEdC,UAAU,QAIL,aAAa;AA4DpB,OAAO,MAAMC,aAAa,GAAG;EAC3B,GAAGD,UAAU;EACbE,UAAU,GAAqB;IAC7B,OAAO;MAAEC,IAAI,EAAE;IAAc,CAAC;EAChC,CAAC;EACDC,WAAW,GAAqB;IAC9B,OAAO;MAAED,IAAI,EAAE;IAAe,CAAC;EACjC,CAAC;EACDE,YAAY,GAAqB;IAC/B,OAAO;MAAEF,IAAI,EAAE;IAAgB,CAAC;EAClC;AACF,CAAC;AAED,eAAe,SAASG,YAAY,OAMlC;EAAA,IANmC;IACnCC,aAAa,GAAG,QAAQ;IACxB,GAAGC;EACgB,CAAC;EAIpB,MAAMC,MAAM,GAAGV,SAAS,CAACS,IAAI,CAG5B;EAED,MAAME,iBAAiB,GACrBC,KAEsD;IAAA;IAAA,OACnDC,OAAO,mBAACD,KAAK,CAACE,OAAO,mDAAb,eAAeC,IAAI,CAAEC,EAAE,IAAKA,EAAE,CAACZ,IAAI,KAAK,QAAQ,CAAC,CAAC;EAAA;EAE/D,MAAMa,kBAAkB,GACtBL,KAA2C,IACF;IACzC,IAAID,iBAAiB,CAACC,KAAK,CAAC,EAAE;MAC5B,OAAOA,KAAK;IACd;IAEA,OAAO;MACL,GAAGA,KAAK;MACRE,OAAO,EAAE,CACP,GAAGF,KAAK,CAACE,OAAO,EAChB;QACEV,IAAI,EAAE,QAAQ;QACdc,MAAM,EAAEV,aAAa,KAAK,MAAM,GAAG,QAAQ,GAAG;MAChD,CAAC;IAEL,CAAC;EACH,CAAC;EAED,MAAMW,uBAAuB,GAC3BP,KAA2C,IACF;IACzC,IAAI,CAACD,iBAAiB,CAACC,KAAK,CAAC,EAAE;MAC7B,OAAOA,KAAK;IACd;IAEA,OAAO;MACL,GAAGA,KAAK;MACRE,OAAO,EAAEF,KAAK,CAACE,OAAO,CAACM,MAAM,CAAEJ,EAAE,IAAKA,EAAE,CAACZ,IAAI,KAAK,QAAQ;IAC5D,CAAC;EACH,CAAC;EAED,MAAMD,UAAU,GACdS,KAA2C,IACF;IACzC,IAAIJ,aAAa,KAAK,MAAM,EAAE;MAC5B,OAAOW,uBAAuB,CAACP,KAAK,CAAC;IACvC;IAEA,OAAOK,kBAAkB,CAACL,KAAK,CAAC;EAClC,CAAC;EAED,MAAMP,WAAW,GACfO,KAA2C,IACF;IACzC,IAAIJ,aAAa,KAAK,MAAM,EAAE;MAC5B,OAAOS,kBAAkB,CAACL,KAAK,CAAC;IAClC;IAEA,OAAOO,uBAAuB,CAACP,KAAK,CAAC;EACvC,CAAC;EAED,OAAO;IACL,GAAGF,MAAM;IAETN,IAAI,EAAE,QAAQ;IAEdiB,eAAe,QAAiD;MAAA,IAAhD;QAAEC,UAAU;QAAEC,cAAc;QAAEC;MAAe,CAAC;MAC5D,MAAMZ,KAAK,GAAGF,MAAM,CAACW,eAAe,CAAC;QACnCC,UAAU;QACVC,cAAc;QACdC;MACF,CAAC,CAAC;MAEF,OAAO;QACL,GAAGZ,KAAK;QACRa,OAAO,EAAEjB,aAAa;QACtBkB,KAAK,EAAE,KAAK;QACZtB,IAAI,EAAE,QAAQ;QACduB,GAAG,EAAG,UAAS5B,MAAM,EAAG;MAC1B,CAAC;IACH,CAAC;IAED6B,kBAAkB,CAChBC,YAAY,SAEZ;MAAA,IADA;QAAEP,UAAU;QAAEC,cAAc;QAAEC;MAAe,CAAC;MAE9C,IAAIK,YAAY,CAACH,KAAK,KAAK,KAAK,EAAE;QAChC,OAAOG,YAAY;MACrB;MAEA,IAAIjB,KAAK,GAAGF,MAAM,CAACkB,kBAAkB,CAACC,YAAY,EAAE;QAClDP,UAAU;QACVC,cAAc;QACdC;MACF,CAAC,CAAC;MAEF,IAAIb,iBAAiB,CAACkB,YAAY,CAAC,EAAE;QACnC;QACAjB,KAAK,GAAGO,uBAAuB,CAACP,KAAK,CAAC;QACtCA,KAAK,GAAGK,kBAAkB,CAACL,KAAK,CAAC;MACnC;MAEA,OAAO;QACL,GAAGA,KAAK;QACRa,OAAO,EAAEjB,aAAa;QACtBJ,IAAI,EAAE,QAAQ;QACduB,GAAG,EAAG,UAAS5B,MAAM,EAAG;MAC1B,CAAC;IACH,CAAC;IAED+B,qBAAqB,CAAClB,KAAK,EAAEe,GAAG,EAAE;MAChC,MAAMI,MAAM,GAAGrB,MAAM,CAACoB,qBAAqB,CAAClB,KAAK,EAAEe,GAAG,CAAC;MAEvD,OAAOtB,WAAW,CAAC0B,MAAM,CAAC;IAC5B,CAAC;IAEDC,iBAAiB,CAACpB,KAAK,EAAEqB,MAAM,EAAEC,OAAO,EAAE;MACxC,QAAQD,MAAM,CAAC7B,IAAI;QACjB,KAAK,aAAa;UAChB,OAAOD,UAAU,CAACS,KAAK,CAAC;QAE1B,KAAK,cAAc;UACjB,OAAOP,WAAW,CAACO,KAAK,CAAC;QAE3B,KAAK,eAAe;UAClB,IAAID,iBAAiB,CAACC,KAAK,CAAC,EAAE;YAC5B,OAAOO,uBAAuB,CAACP,KAAK,CAAC;UACvC;UAEA,OAAOK,kBAAkB,CAACL,KAAK,CAAC;QAElC,KAAK,SAAS;QACd,KAAK,UAAU;QACf,KAAK,qBAAqB;UAAE;YAC1B,MAAMmB,MAAM,GAAGrB,MAAM,CAACsB,iBAAiB,CAACpB,KAAK,EAAEqB,MAAM,EAAEC,OAAO,CAAC;YAE/D,IAAIH,MAAM,IAAI,IAAI,IAAIA,MAAM,CAACI,KAAK,KAAKvB,KAAK,CAACuB,KAAK,EAAE;cAClD,OAAO9B,WAAW,CAAC0B,MAAM,CAAyC;YACpE;YAEA,OAAOA,MAAM;UACf;QAEA,KAAK,SAAS;UACZ,IAAIpB,iBAAiB,CAACC,KAAK,CAAC,EAAE;YAC5B,OAAOO,uBAAuB,CAACP,KAAK,CAAC;UACvC;UAEA,OAAOF,MAAM,CAACsB,iBAAiB,CAACpB,KAAK,EAAEqB,MAAM,EAAEC,OAAO,CAAC;QAEzD;UACE,OAAOxB,MAAM,CAACsB,iBAAiB,CAACpB,KAAK,EAAEqB,MAAM,EAAEC,OAAO,CAAC;MAAC;IAE9D,CAAC;IAEDE,cAAc,EAAElC;EAClB,CAAC;AACH"}

package/lib/module/StackRouter.js

@@ -10,7 +10,6 @@ export const StackActions = {
       }
     };
   },
-
   push(name, params) {
     return {
       type: 'PUSH',
@@ -20,7 +19,6 @@ export const StackActions = {
       }
     };
   },
-
   pop() {
     let count = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
     return {
@@ -30,18 +28,26 @@ export const StackActions = {
       }
     };
   },
-
   popToTop() {
     return {
       type: 'POP_TO_TOP'
     };
+  },
+  popTo(name, params, merge) {
+    return {
+      type: 'POP_TO',
+      payload: {
+        name,
+        params,
+        merge
+      }
+    };
   }
-
 };
 export default function StackRouter(options) {
-  const router = { ...BaseRouter,
+  const router = {
+    ...BaseRouter,
     type: 'stack',
-
     getInitialState(_ref) {
       let {
         routeNames,
@@ -61,25 +67,23 @@ export default function StackRouter(options) {
         }]
       };
     },
-
     getRehydratedState(partialState, _ref2) {
       let {
         routeNames,
         routeParamList
       } = _ref2;
       let state = partialState;
-
       if (state.stale === false) {
         return state;
       }
-
-      const routes = state.routes.filter(route => routeNames.includes(route.name)).map(route => ({ ...route,
+      const routes = state.routes.filter(route => routeNames.includes(route.name)).map(route => ({
+        ...route,
         key: route.key || `${route.name}-${nanoid()}`,
-        params: routeParamList[route.name] !== undefined ? { ...routeParamList[route.name],
+        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({
@@ -88,7 +92,6 @@ export default function StackRouter(options) {
           params: routeParamList[initialRouteName]
         });
       }
-
       return {
         stale: false,
         type: 'stack',
@@ -98,7 +101,6 @@ export default function StackRouter(options) {
         routes
       };
     },
-
     getStateForRouteNamesChange(state, _ref3) {
       let {
         routeNames,
@@ -106,7 +108,6 @@ export default function StackRouter(options) {
         routeKeyChanges
       } = _ref3;
       const routes = state.routes.filter(route => routeNames.includes(route.name) && !routeKeyChanges.includes(route.name));
-
       if (routes.length === 0) {
         const initialRouteName = options.initialRouteName !== undefined && routeNames.includes(options.initialRouteName) ? options.initialRouteName : routeNames[0];
         routes.push({
@@ -115,114 +116,191 @@ export default function StackRouter(options) {
           params: routeParamList[initialRouteName]
         });
       }
-
-      return { ...state,
+      return {
+        ...state,
         routeNames,
         routes,
         index: Math.min(state.index, routes.length - 1)
       };
     },
-
     getStateForRouteFocus(state, key) {
       const index = state.routes.findIndex(r => r.key === key);
-
       if (index === -1 || index === state.index) {
         return state;
       }
-
-      return { ...state,
+      return {
+        ...state,
         index,
         routes: state.routes.slice(0, index + 1)
       };
     },
-
     getStateForAction(state, action, options) {
       const {
         routeParamList
       } = 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) {
               return null;
             }
-
             const {
               name,
-              key,
               params
             } = action.payload;
-
             if (!state.routeNames.includes(name)) {
               return null;
             }
-
-            return { ...state,
+            return {
+              ...state,
               routes: state.routes.map((route, i) => i === index ? {
-                key: key !== undefined ? key : `${name}-${nanoid()}`,
+                key: `${name}-${nanoid()}`,
                 name,
-                params: routeParamList[name] !== undefined ? { ...routeParamList[name],
+                params: routeParamList[name] !== undefined ? {
+                  ...routeParamList[name],
                   ...params
                 } : params
               } : route)
             };
           }
-
         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({
               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 routes;
+            let route;
+            if (id !== undefined) {
+              route = state.routes.find(route => route.name === action.payload.name && id === (getId === null || getId === void 0 ? void 0 : 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;
             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
+              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,
-                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,
+            return {
+              ...state,
               index: routes.length - 1,
               routes
             };
           }
+        case 'NAVIGATE_DEPRECATED':
+          {
+            if (!state.routeNames.includes(action.payload.name)) {
+              return null;
+            }
 
-          return null;
-
+            // If the route already exists, navigate to that
+            let index = -1;
+            const getId = options.routeGetIdList[action.payload.name];
+            const id = getId === null || getId === void 0 ? void 0 : 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({
+                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 ? {
+                  ...routeParamList[action.payload.name],
+                  ...action.payload.params
+                } : action.payload.params
+              }];
+              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 = 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 = 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));
-              return { ...state,
+              return {
+                ...state,
                 index: routes.length - 1,
                 routes
               };
             }
-
             return null;
           }
-
         case 'POP_TO_TOP':
           return router.getStateForAction(state, {
             type: 'POP',
@@ -230,84 +308,72 @@ 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) {
-            var _action$payload$path;
+        case 'POP_TO':
+          {
+            if (!state.routeNames.includes(action.payload.name)) {
+              return null;
+            }
 
             // 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 getId = options.routeGetIdList[action.payload.name];
             const id = getId === null || getId === void 0 ? void 0 : 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({
                 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) {
+            } 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 && action.payload.key === undefined || state.routes[i].key === action.payload.key) {
+                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) {
-              var _action$payload$key;
-
-              const routes = [...state.routes, {
-                key: (_action$payload$key = action.payload.key) !== null && _action$payload$key !== void 0 ? _action$payload$key : `${action.payload.name}-${nanoid()}`,
+            // 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,
-                path: action.payload.path,
-                params: routeParamList[action.payload.name] !== undefined ? { ...routeParamList[action.payload.name],
+                params: routeParamList[action.payload.name] !== undefined ? {
+                  ...routeParamList[action.payload.name],
                   ...action.payload.params
                 } : action.payload.params
               }];
-              return { ...state,
+              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],
+              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],
+              params = routeParamList[route.name] !== undefined ? {
+                ...routeParamList[route.name],
                 ...action.payload.params
               } : action.payload.params;
             }
-
-            return { ...state,
+            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 = action.payload.path) !== null && _action$payload$path !== void 0 ? _action$payload$path : route.path,
+              routes: [...state.routes.slice(0, index), params !== route.params ? {
+                ...route,
                 params
               } : state.routes[index]]
             };
           }
-
-          return null;
-
         case 'GO_BACK':
           if (state.index > 0) {
             return router.getStateForAction(state, {
@@ -319,14 +385,11 @@ export default function StackRouter(options) {
               source: action.source
             }, options);
           }
-
           return null;
-
         default:
           return BaseRouter.getStateForAction(state, action);
       }
     },
-
     actionCreators: StackActions
   };
   return router;