one 1.14.4 → 1.15.0

package/dist/cjs/router/useViteRoutes.native.js

@@ -5,20 +5,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var useViteRoutes_exports = {};
 __export(useViteRoutes_exports, {
@@ -31,31 +33,40 @@ __export(useViteRoutes_exports, {
   useViteRoutes: () => useViteRoutes
 });
 module.exports = __toCommonJS(useViteRoutes_exports);
-var import_hmrImport = require("./hmrImport.native.js"),
-  lastVersion = 0,
-  context;
+var import_hmrImport = require("./hmrImport.native.js");
+var lastVersion = 0;
+var context;
 function useViteRoutes(routes, routerRoot, options, version) {
   if (version && version > lastVersion) {
-    context = null, lastVersion = version;
-    var _iteratorNormalCompletion = !0,
-      _didIteratorError = !1,
+    context = null;
+    lastVersion = version;
+    var _iteratorNormalCompletion = true,
+      _didIteratorError = false,
       _iteratorError = void 0;
     try {
-      for (var _iterator = Object.keys(preloadedModules)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+      for (var _iterator = Object.keys(preloadedModules)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
         var key = _step.value;
         delete preloadedModules[key];
       }
     } catch (err) {
-      _didIteratorError = !0, _iteratorError = err;
+      _didIteratorError = true;
+      _iteratorError = err;
     } finally {
       try {
-        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
+          _iterator.return();
+        }
       } finally {
-        if (_didIteratorError) throw _iteratorError;
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
       }
     }
   }
-  return context || loadRoutes(routes, routerRoot, options), context;
+  if (!context) {
+    loadRoutes(routes, routerRoot, options);
+  }
+  return context;
 }
 var preloadedModules = {};
 function registerPreloadedRoute(key, module2) {
@@ -68,141 +79,207 @@ function getPreloadedModuleKeys() {
   return Object.keys(preloadedModules);
 }
 function matchDynamicRoute(routePattern, actualPath) {
-  var routeSegments = routePattern.split("/"),
-    pathSegments = actualPath.split("/"),
-    hasCatchAll = routeSegments.some(function (s) {
+  var routeSegments = routePattern.split("/");
+  var pathSegments = actualPath.split("/");
+  var hasCatchAll = routeSegments.some(function (s) {
+    return s.startsWith("[...");
+  });
+  if (hasCatchAll) {
+    var catchAllIdx = routeSegments.findIndex(function (s) {
       return s.startsWith("[...");
     });
-  if (hasCatchAll) {
-    for (var catchAllIdx = routeSegments.findIndex(function (s) {
-        return s.startsWith("[...");
-      }), i = 0; i < catchAllIdx; i++) if (routeSegments[i] && !routeSegments[i].startsWith("[") && routeSegments[i] !== pathSegments[i]) return !1;
+    for (var i = 0; i < catchAllIdx; i++) {
+      if (!routeSegments[i]) continue;
+      if (routeSegments[i].startsWith("[")) continue;
+      if (routeSegments[i] !== pathSegments[i]) return false;
+    }
     return pathSegments.length >= catchAllIdx;
   }
-  if (routeSegments.length !== pathSegments.length) return !1;
+  if (routeSegments.length !== pathSegments.length) return false;
   for (var i1 = 0; i1 < routeSegments.length; i1++) {
-    var routeSeg = routeSegments[i1],
-      pathSeg = pathSegments[i1];
-    if (!(routeSeg.startsWith("[") && routeSeg.endsWith("]")) && routeSeg !== pathSeg) return !1;
+    var routeSeg = routeSegments[i1];
+    var pathSeg = pathSegments[i1];
+    if (routeSeg.startsWith("[") && routeSeg.endsWith("]")) {
+      continue;
+    }
+    if (routeSeg !== pathSeg) return false;
   }
-  return !0;
+  return true;
 }
 async function preloadRouteModules(href) {
-  var globbed = globalThis.__importMetaGlobbed;
-  if (globbed) {
-    var normalizedHref = href === "/" ? "" : href.replace(/^\//, "").replace(/\/$/, ""),
-      promises = [],
-      _iteratorNormalCompletion = !0,
-      _didIteratorError = !1,
-      _iteratorError = void 0;
+  var globbed = globalThis["__importMetaGlobbed"];
+  if (!globbed) return;
+  var normalizedHref = href === "/" ? "" : href.replace(/^\//, "").replace(/\/$/, "");
+  var promises = [];
+  var _iteratorNormalCompletion = true,
+    _didIteratorError = false,
+    _iteratorError = void 0;
+  try {
+    var _loop = function () {
+      var key = _step.value;
+      var routePath = key.replace(/^\/[^/]+\//, "");
+      routePath = routePath.replace(/\([^)]+\)\//g, "");
+      routePath = routePath.replace(/\/_layout\.tsx$/, "").replace(/\/index(\+[a-z]+)?\.tsx$/, "").replace(/(\+[a-z]+)?\.tsx$/, "");
+      routePath = routePath.replace(/^\//, "");
+      var isStaticMatch = routePath === normalizedHref ||
+      // exact match
+      routePath.startsWith(normalizedHref + "/") ||
+      // child route
+      normalizedHref.startsWith(routePath + "/") ||
+      // parent layout
+      routePath === "" ||
+      // root layout
+      normalizedHref !== "" && routePath === normalizedHref.split("/")[0];
+      var isDynamicMatch = routePath.includes("[") && matchDynamicRoute(routePath, normalizedHref);
+      if ((isStaticMatch || isDynamicMatch) && typeof globbed[key] === "function") {
+        promises.push(globbed[key]().then(function (mod) {
+          preloadedModules[key] = mod;
+        }).catch(function () {}));
+      }
+    };
+    for (var _iterator = Object.keys(globbed)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) _loop();
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
     try {
-      for (var _loop = function () {
-          var key = _step.value,
-            routePath = key.replace(/^\/[^/]+\//, "");
-          routePath = routePath.replace(/\([^)]+\)\//g, ""), routePath = routePath.replace(/\/_layout\.tsx$/, "").replace(/\/index(\+[a-z]+)?\.tsx$/, "").replace(/(\+[a-z]+)?\.tsx$/, ""), routePath = routePath.replace(/^\//, "");
-          var isStaticMatch = routePath === normalizedHref ||
-            // exact match
-            routePath.startsWith(normalizedHref + "/") ||
-            // child route
-            normalizedHref.startsWith(routePath + "/") ||
-            // parent layout
-            routePath === "" ||
-            // root layout
-            normalizedHref !== "" && routePath === normalizedHref.split("/")[0],
-            isDynamicMatch = routePath.includes("[") && matchDynamicRoute(routePath, normalizedHref);
-          (isStaticMatch || isDynamicMatch) && typeof globbed[key] == "function" && promises.push(globbed[key]().then(function (mod) {
-            preloadedModules[key] = mod;
-          }).catch(function () {}));
-        }, _iterator = Object.keys(globbed)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
-    } catch (err) {
-      _didIteratorError = !0, _iteratorError = err;
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
     } finally {
-      try {
-        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-      } finally {
-        if (_didIteratorError) throw _iteratorError;
+      if (_didIteratorError) {
+        throw _iteratorError;
       }
     }
-    await Promise.all(promises);
   }
+  await Promise.all(promises);
 }
 function loadRoutes(paths, routerRoot, options) {
-  return context || (globalThis.__importMetaGlobbed = paths, context = globbedRoutesToRouteContext(paths, routerRoot, options), context);
+  if (context) return context;
+  globalThis["__importMetaGlobbed"] = paths;
+  context = globbedRoutesToRouteContext(paths, routerRoot, options);
+  return context;
 }
 function globbedRoutesToRouteContext(paths, routerRoot, options) {
-  var routesSync = {},
-    routePaths = {},
-    promises = {},
-    loadedRoutes = {},
-    clears = {};
+  var routesSync = {};
+  var routePaths = {};
+  var promises = {};
+  var loadedRoutes = {};
+  var clears = {};
   Object.keys(paths).forEach(function (path) {
     var _options_routeModes;
     if (!paths[path]) {
       console.error(`Error: Missing route at path ${path}`);
       return;
     }
-    var loadRouteFunction = paths[path],
-      pathWithoutRelative = path.replace(`/${routerRoot}/`, "./"),
-      originalPath = pathWithoutRelative.slice(1).replace(/\.[jt]sx?$/, "");
-    (options == null || (_options_routeModes = options.routeModes) === null || _options_routeModes === void 0 ? void 0 : _options_routeModes[originalPath]) === "spa" ? (console.info(`Spa mode: ${originalPath}`), loadedRoutes[pathWithoutRelative] = function () {
-      return null;
-    }) : (routesSync[pathWithoutRelative] = loadRouteFunction, routePaths[pathWithoutRelative] = path);
-  });
-  var moduleKeys = Object.keys(routesSync),
-    hmrVersion = 0;
-  typeof window < "u" && (window.__oneRouteCache = {
-    clear: function () {
-      hmrVersion++, Object.keys(loadedRoutes).forEach(function (key) {
-        delete loadedRoutes[key];
-      }), Object.keys(promises).forEach(function (key) {
-        delete promises[key];
-      }), Object.keys(preloadedModules).forEach(function (key) {
-        delete preloadedModules[key];
-      });
-    },
-    clearFile: function (file) {
-      hmrVersion++;
-      var normalizedFile = file.replace(/^app\//, "./");
-      Object.keys(loadedRoutes).forEach(function (key) {
-        (key === normalizedFile || key.endsWith(normalizedFile.replace("./", "/"))) && delete loadedRoutes[key];
-      }), Object.keys(promises).forEach(function (key) {
-        (key === normalizedFile || key.endsWith(normalizedFile.replace("./", "/"))) && delete promises[key];
-      }), Object.keys(preloadedModules).forEach(function (key) {
-        key.includes(file) && delete preloadedModules[key];
-      });
-    },
-    getVersion: function () {
-      return hmrVersion;
+    var loadRouteFunction = paths[path];
+    var pathWithoutRelative = path.replace(`/${routerRoot}/`, "./");
+    var originalPath = pathWithoutRelative.slice(1).replace(/\.[jt]sx?$/, "");
+    if ((options === null || options === void 0 ? void 0 : (_options_routeModes = options.routeModes) === null || _options_routeModes === void 0 ? void 0 : _options_routeModes[originalPath]) === "spa") {
+      console.info(`Spa mode: ${originalPath}`);
+      loadedRoutes[pathWithoutRelative] = function () {
+        return null;
+      };
+    } else {
+      routesSync[pathWithoutRelative] = loadRouteFunction;
+      routePaths[pathWithoutRelative] = path;
     }
   });
+  var moduleKeys = Object.keys(routesSync);
+  var hmrVersion = 0;
+  if (typeof window !== "undefined") {
+    ;
+    window.__oneRouteCache = {
+      clear: function () {
+        hmrVersion++;
+        Object.keys(loadedRoutes).forEach(function (key) {
+          delete loadedRoutes[key];
+        });
+        Object.keys(promises).forEach(function (key) {
+          delete promises[key];
+        });
+        Object.keys(preloadedModules).forEach(function (key) {
+          delete preloadedModules[key];
+        });
+      },
+      clearFile: function (file) {
+        hmrVersion++;
+        var normalizedFile = file.replace(/^app\//, "./");
+        Object.keys(loadedRoutes).forEach(function (key) {
+          if (key === normalizedFile || key.endsWith(normalizedFile.replace("./", "/"))) {
+            delete loadedRoutes[key];
+          }
+        });
+        Object.keys(promises).forEach(function (key) {
+          if (key === normalizedFile || key.endsWith(normalizedFile.replace("./", "/"))) {
+            delete promises[key];
+          }
+        });
+        Object.keys(preloadedModules).forEach(function (key) {
+          if (key.includes(file)) {
+            delete preloadedModules[key];
+          }
+        });
+      },
+      getVersion: function () {
+        return hmrVersion;
+      }
+    };
+  }
   function resolve(id) {
-    if (clearTimeout(clears[id]), loadedRoutes[id]) return loadedRoutes[id];
-    var preloadKey = id.replace("./", `/${routerRoot}/`),
-      preloaded = getPreloadedModule(preloadKey);
-    if (preloaded) return loadedRoutes[id] = preloaded, preloaded;
-    if (typeof routesSync[id] != "function") return routesSync[id];
+    clearTimeout(clears[id]);
+    if (loadedRoutes[id]) {
+      return loadedRoutes[id];
+    }
+    var preloadKey = id.replace("./", `/${routerRoot}/`);
+    var preloaded = getPreloadedModule(preloadKey);
+    if (preloaded) {
+      loadedRoutes[id] = preloaded;
+      return preloaded;
+    }
+    if (typeof routesSync[id] !== "function") {
+      return routesSync[id];
+    }
     if (!promises[id]) {
       var importPromise;
-      process.env.NODE_ENV === "development" && hmrVersion > 0 && routePaths[id] ? importPromise = (0, import_hmrImport.hmrImport)(routePaths[id]).catch(function () {
-        return routesSync[id]();
-      }) : importPromise = routesSync[id](), promises[id] = importPromise.then(function (val) {
-        return loadedRoutes[id] = val, delete promises[id], clears[id] = setTimeout(function () {
-          delete loadedRoutes[id];
-        }, 500), val;
+      if (process.env.NODE_ENV === "development" && hmrVersion > 0 && routePaths[id]) {
+        importPromise = (0, import_hmrImport.hmrImport)(routePaths[id]).catch(function () {
+          return routesSync[id]();
+        });
+      } else {
+        importPromise = routesSync[id]();
+      }
+      promises[id] = importPromise.then(function (val) {
+        loadedRoutes[id] = val;
+        delete promises[id];
+        if (process.env.NODE_ENV === "development") {
+          clears[id] = setTimeout(function () {
+            delete loadedRoutes[id];
+          }, 500);
+        }
+        return val;
       }).catch(function (err) {
-        console.error("Error loading route", id, err, new Error().stack), loadedRoutes[id] = {
+        console.error(`Error loading route`, id, err, new Error().stack);
+        loadedRoutes[id] = {
           default: function () {
             return null;
           }
-        }, delete promises[id];
-      }), process.env.NODE_ENV === "development" && (promises[id].stack = new Error().stack);
+        };
+        delete promises[id];
+      });
+      if (process.env.NODE_ENV === "development") {
+        promises[id].stack = new Error().stack;
+      }
     }
     throw promises[id];
   }
-  return resolve.keys = function () {
+  resolve.keys = function () {
     return moduleKeys;
-  }, resolve.id = "", resolve.resolve = function (id) {
+  };
+  resolve.id = "";
+  resolve.resolve = function (id) {
     return id;
-  }, resolve;
+  };
+  return resolve;
 }
 //# sourceMappingURL=useViteRoutes.native.js.map

package/dist/cjs/router/useViteRoutes.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","useViteRoutes_exports","__export","getPreloadedModule","getPreloadedModuleKeys","globbedRoutesToRouteContext","loadRoutes","preloadRouteModules","registerPreloadedRoute","useViteRoutes","module","exports","import_hmrImport","require","lastVersion","context","routes","routerRoot","options","version","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","keys","preloadedModules","Symbol","iterator","_step","next","done","key","err","return","module2","matchDynamicRoute","routePattern","actualPath","routeSegments","split","pathSegments","hasCatchAll","some","s","startsWith","catchAllIdx","findIndex","i","length","i1","routeSeg","pathSeg","endsWith","href","globbed","globalThis","__importMetaGlobbed","normalizedHref","replace","promises","_loop","routePath","isStaticMatch","isDynamicMatch","includes","push","then","catch","Promise","all","paths","routesSync","routePaths","loadedRoutes","clears","forEach","path","_options_routeModes","console","error","loadRouteFunction","pathWithoutRelative","originalPath","slice","routeModes","info","moduleKeys","hmrVersion","window","__oneRouteCache","clear","clearFile","file","normalizedFile"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","useViteRoutes_exports","__export","getPreloadedModule","getPreloadedModuleKeys","globbedRoutesToRouteContext","loadRoutes","preloadRouteModules","registerPreloadedRoute","useViteRoutes","module","exports","import_hmrImport","require","lastVersion","context","routes","routerRoot","options","version","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","keys","preloadedModules","Symbol","iterator","_step","next","done","key","err","return","module2","matchDynamicRoute","routePattern","actualPath","routeSegments","split","pathSegments","hasCatchAll","some","s","startsWith","catchAllIdx","findIndex","i","length","i1","routeSeg","pathSeg","endsWith","href","globbed","globalThis","normalizedHref","replace","promises","_loop","routePath","isStaticMatch","isDynamicMatch","includes","push","then","catch","Promise","all","paths","routesSync","routePaths","loadedRoutes","clears","forEach","path","_options_routeModes","console","error","loadRouteFunction","pathWithoutRelative","originalPath","slice","routeModes","info","moduleKeys","hmrVersion","window","__oneRouteCache","clear","clearFile","file","normalizedFile","getVersion","resolve","id","clearTimeout","preloadKey","preloaded"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/router/utils/getNavigateAction.cjs

@@ -3,53 +3,77 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var getNavigateAction_exports = {};
 __export(getNavigateAction_exports, {
   getNavigateAction: () => getNavigateAction
 });
 module.exports = __toCommonJS(getNavigateAction_exports);
-var import_non_secure = require("nanoid/non-secure"),
-  import_lastAction = require("../lastAction.cjs"),
-  import_matchers = require("../matchers.cjs");
+var import_non_secure = require("nanoid/non-secure");
+var import_lastAction = require("../lastAction.cjs");
+var import_matchers = require("../matchers.cjs");
 function getNavigateAction(actionState, navigationState, type = "NAVIGATE") {
   let actionStateRoute;
-  for (; actionState && navigationState;) {
+  while (actionState && navigationState) {
     const stateRoute = navigationState.routes[navigationState.index];
     actionStateRoute = actionState.routes[actionState.routes.length - 1];
-    const childState = actionStateRoute.state,
-      nextNavigationState = stateRoute.state,
-      dynamicMatch = (0, import_matchers.matchDynamicName)(actionStateRoute.name);
-    if (actionStateRoute.name !== stateRoute.name ||
+    const childState = actionStateRoute.state;
+    const nextNavigationState = stateRoute.state;
+    const dynamicMatch = (0, import_matchers.matchDynamicName)(actionStateRoute.name);
+    const didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name ||
     // !deepEqual(actionStateRoute.params, stateRoute.params) ||
-    !childState || !nextNavigationState || dynamicMatch && actionStateRoute.params?.[dynamicMatch.name] !== stateRoute.params?.[dynamicMatch.name]) break;
-    actionState = childState, navigationState = nextNavigationState;
+    !childState || !nextNavigationState || dynamicMatch && actionStateRoute.params?.[dynamicMatch.name] !== stateRoute.params?.[dynamicMatch.name];
+    if (didActionAndCurrentStateDiverge) {
+      break;
+    }
+    actionState = childState;
+    navigationState = nextNavigationState;
   }
   const rootPayload = {
     params: {}
   };
-  let payload = rootPayload,
-    params = payload.params;
-  for (; actionStateRoute;) Object.assign(params, {
-    ...actionStateRoute.params
-  }), payload.screen = actionStateRoute.name, payload.params = {
-    ...actionStateRoute.params
-  }, actionStateRoute = actionStateRoute.state?.routes[actionStateRoute.state?.routes.length - 1], payload.params ??= {}, payload = payload.params, params = payload;
-  return type === "PUSH" && ((0, import_lastAction.setLastAction)(), type = "NAVIGATE", navigationState.type === "stack" && (rootPayload.key = `${rootPayload.name}-${(0, import_non_secure.nanoid)()}`)), type === "REPLACE" && navigationState.type === "tab" && (type = "JUMP_TO"), {
+  let payload = rootPayload;
+  let params = payload.params;
+  while (actionStateRoute) {
+    Object.assign(params, {
+      ...actionStateRoute.params
+    });
+    payload.screen = actionStateRoute.name;
+    payload.params = {
+      ...actionStateRoute.params
+    };
+    actionStateRoute = actionStateRoute.state?.routes[actionStateRoute.state?.routes.length - 1];
+    payload.params ??= {};
+    payload = payload.params;
+    params = payload;
+  }
+  if (type === "PUSH") {
+    (0, import_lastAction.setLastAction)();
+    type = "NAVIGATE";
+    if (navigationState.type === "stack") {
+      rootPayload.key = `${rootPayload.name}-${(0, import_non_secure.nanoid)()}`;
+    }
+  }
+  if (type === "REPLACE" && navigationState.type === "tab") {
+    type = "JUMP_TO";
+  }
+  return {
     type,
     target: navigationState.key,
     payload: {