one 1.14.4 → 1.14.5

package/dist/cjs/ui/common.cjs

@@ -3,20 +3,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 common_exports = {};
 __export(common_exports, {
@@ -25,17 +27,26 @@ __export(common_exports, {
   triggersToScreens: () => triggersToScreens
 });
 module.exports = __toCommonJS(common_exports);
-var import_href = require("../link/href.cjs"),
-  import_sortRoutes = require("../router/sortRoutes.cjs"),
-  import_useScreens = require("../router/useScreens.cjs"),
-  import_Slot = require("./Slot.cjs"),
-  import_jsx_runtime = require("react/jsx-runtime");
+var import_href = require("../link/href.cjs");
+var import_sortRoutes = require("../router/sortRoutes.cjs");
+var import_useScreens = require("../router/useScreens.cjs");
+var import_Slot = require("./Slot.cjs");
+var import_jsx_runtime = require("react/jsx-runtime");
 const ViewSlot = import_Slot.Slot;
 function resolveHrefWithSegments(href, routeInfo, segmentsWithoutGroups) {
   if (href.startsWith("./") || href.startsWith("../")) {
-    const parts = ((("/" + segmentsWithoutGroups.join("/")).replace(/\/[^/]*$/, "") || "/") + "/" + href).split("/"),
-      resolved = [];
-    for (const part of parts) part === "." || part === "" || (part === ".." ? resolved.pop() : resolved.push(part));
+    const basePath = "/" + segmentsWithoutGroups.join("/");
+    const baseDir = basePath.replace(/\/[^/]*$/, "") || "/";
+    const parts = (baseDir + "/" + href).split("/");
+    const resolved = [];
+    for (const part of parts) {
+      if (part === "." || part === "") continue;
+      if (part === "..") {
+        resolved.pop();
+      } else {
+        resolved.push(part);
+      }
+    }
     return "/" + resolved.join("/");
   }
   return href;
@@ -58,8 +69,12 @@ function triggersToScreens(triggers, layoutRouteNode, linking, initialRouteName,
       continue;
     }
     let resolvedHref = (0, import_href.resolveHref)(trigger.href);
-    if (resolvedHref.startsWith("../")) throw new Error("Trigger href cannot link to a parent directory");
-    const segmentsWithoutGroups = contextKey.split("/").filter(segment => !(segment.startsWith("(") && segment.endsWith(")")));
+    if (resolvedHref.startsWith("../")) {
+      throw new Error("Trigger href cannot link to a parent directory");
+    }
+    const segmentsWithoutGroups = contextKey.split("/").filter(segment => {
+      return !(segment.startsWith("(") && segment.endsWith(")"));
+    });
     resolvedHref = resolveHrefWithSegments(resolvedHref, routeInfo, segmentsWithoutGroups);
     let state = linking.getStateFromPath?.(resolvedHref, linking.config)?.routes[0];
     if (!state) {
@@ -68,18 +83,28 @@ function triggersToScreens(triggers, layoutRouteNode, linking, initialRouteName,
     }
     let routeState = state;
     if (routeState.name === "+not-found") {
-      process.env.NODE_ENV !== "production" && console.warn(`Tab trigger '${trigger.name}' has the href '${trigger.href}' which points to a +not-found route.`);
+      if (process.env.NODE_ENV !== "production") {
+        console.warn(`Tab trigger '${trigger.name}' has the href '${trigger.href}' which points to a +not-found route.`);
+      }
       continue;
     }
     const targetStateName = layoutRouteNode.route || "__root";
-    for (; state?.state && state.name !== targetStateName;) state = state.state.routes[state.state.index ?? state.state.routes.length - 1];
+    while (state?.state) {
+      if (state.name === targetStateName) break;
+      state = state.state.routes[state.state.index ?? state.state.routes.length - 1];
+    }
     routeState = state.state?.routes[state.state.index ?? state.state.routes.length - 1] || state;
     const routeNode = layoutRouteNode.children.find(child => child.route === routeState?.name);
     if (!routeNode) {
       console.warn(`Unable to find routeNode for trigger ${JSON.stringify(trigger)}. This might be a bug in One router`);
       continue;
     }
-    const duplicateTrigger = trigger.type === "internal" && configs.find(config => config.type === "external" ? !1 : config.routeNode.route === routeNode.route);
+    const duplicateTrigger = trigger.type === "internal" && configs.find(config => {
+      if (config.type === "external") {
+        return false;
+      }
+      return config.routeNode.route === routeNode.route;
+    });
     if (duplicateTrigger) {
       const duplicateTriggerText = `${JSON.stringify({
         name: duplicateTrigger.name,
@@ -99,32 +124,49 @@ Both triggers map to route ${routeNode.route}.`);
       action: stateToAction(state, layoutRouteNode.route)
     });
   }
-  const sortFn = (0, import_sortRoutes.sortRoutesWithInitial)(initialRouteName),
-    sortedConfigs = configs.sort((a, b) => a.type === "external" && b.type === "external" ? 0 : a.type === "external" ? 1 : b.type === "external" ? -1 : sortFn(a.routeNode, b.routeNode)),
-    children = [],
-    triggerMap = {
-      ...parentTriggerMap
+  const sortFn = (0, import_sortRoutes.sortRoutesWithInitial)(initialRouteName);
+  const sortedConfigs = configs.sort((a, b) => {
+    if (a.type === "external" && b.type === "external") {
+      return 0;
+    } else if (a.type === "external") {
+      return 1;
+    } else if (b.type === "external") {
+      return -1;
+    }
+    return sortFn(a.routeNode, b.routeNode);
+  });
+  const children = [];
+  const triggerMap = {
+    ...parentTriggerMap
+  };
+  for (const [index, config] of sortedConfigs.entries()) {
+    triggerMap[config.name] = {
+      ...config,
+      index
     };
-  for (const [index, config] of sortedConfigs.entries()) if (triggerMap[config.name] = {
-    ...config,
-    index
-  }, config.type === "internal") {
-    const route = config.routeNode;
-    children.push(/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_useScreens.Screen, {
-      getId: (0, import_useScreens.createGetIdForRoute)(route),
-      name: route.route,
-      options: args => {
-        const staticOptions = route.generated ? route.loadRoute()?.getNavOptions : null,
-          output = {
-            ...(typeof staticOptions == "function" ? staticOptions(args) : staticOptions)
+    if (config.type === "internal") {
+      const route = config.routeNode;
+      children.push(/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_useScreens.Screen, {
+        getId: (0, import_useScreens.createGetIdForRoute)(route),
+        name: route.route,
+        options: args => {
+          const staticOptions = route.generated ? route.loadRoute()?.getNavOptions : null;
+          const staticResult = typeof staticOptions === "function" ? staticOptions(args) : staticOptions;
+          const output = {
+            ...staticResult
           };
-        return route.generated && (output.tabBarButton = () => null, output.drawerItemStyle = {
-          height: 0,
-          display: "none"
-        }), output;
-      },
-      getComponent: () => (0, import_useScreens.getQualifiedRouteComponent)(route)
-    }, route.route));
+          if (route.generated) {
+            output.tabBarButton = () => null;
+            output.drawerItemStyle = {
+              height: 0,
+              display: "none"
+            };
+          }
+          return output;
+        },
+        getComponent: () => (0, import_useScreens.getQualifiedRouteComponent)(route)
+      }, route.route));
+    }
   }
   return {
     children,
@@ -136,12 +178,30 @@ function stateToAction(state, startAtRoute) {
   let payload = rootPayload;
   startAtRoute = startAtRoute === "" ? "__root" : startAtRoute;
   let foundStartingPoint = startAtRoute === void 0 || !state?.state;
-  for (; state;) if (foundStartingPoint) payload === rootPayload ? payload.name = state.name : payload.screen = state.name, payload.params = state.params ? {
-    ...state.params
-  } : {}, state = state.state?.routes[state.state?.routes.length - 1], state && (payload.params ??= {}, payload = payload.params);else {
-    state.name === startAtRoute && (foundStartingPoint = !0);
-    const nextState = state.state?.routes[state.state?.routes.length - 1];
-    nextState && (state = nextState);
+  while (state) {
+    if (foundStartingPoint) {
+      if (payload === rootPayload) {
+        payload.name = state.name;
+      } else {
+        payload.screen = state.name;
+      }
+      payload.params = state.params ? {
+        ...state.params
+      } : {};
+      state = state.state?.routes[state.state?.routes.length - 1];
+      if (state) {
+        payload.params ??= {};
+        payload = payload.params;
+      }
+    } else {
+      if (state.name === startAtRoute) {
+        foundStartingPoint = true;
+      }
+      const nextState = state.state?.routes[state.state?.routes.length - 1];
+      if (nextState) {
+        state = nextState;
+      }
+    }
   }
   return {
     type: "JUMP_TO",

package/dist/cjs/ui/common.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 common_exports = {};
 __export(common_exports, {
@@ -27,33 +29,43 @@ __export(common_exports, {
   triggersToScreens: () => triggersToScreens
 });
 module.exports = __toCommonJS(common_exports);
-var import_jsx_runtime = require("react/jsx-runtime"),
-  import_href = require("../link/href.native.js"),
-  import_sortRoutes = require("../router/sortRoutes.native.js"),
-  import_useScreens = require("../router/useScreens.native.js"),
-  import_Slot = require("./Slot.native.js"),
-  ViewSlot = import_Slot.Slot;
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_href = require("../link/href.native.js");
+var import_sortRoutes = require("../router/sortRoutes.native.js");
+var import_useScreens = require("../router/useScreens.native.js");
+var import_Slot = require("./Slot.native.js");
+var ViewSlot = import_Slot.Slot;
 function resolveHrefWithSegments(href, routeInfo, segmentsWithoutGroups) {
   if (href.startsWith("./") || href.startsWith("../")) {
-    var basePath = "/" + segmentsWithoutGroups.join("/"),
-      baseDir = basePath.replace(/\/[^/]*$/, "") || "/",
-      parts = (baseDir + "/" + href).split("/"),
-      resolved = [],
-      _iteratorNormalCompletion = !0,
-      _didIteratorError = !1,
+    var basePath = "/" + segmentsWithoutGroups.join("/");
+    var baseDir = basePath.replace(/\/[^/]*$/, "") || "/";
+    var parts = (baseDir + "/" + href).split("/");
+    var resolved = [];
+    var _iteratorNormalCompletion = true,
+      _didIteratorError = false,
       _iteratorError = void 0;
     try {
-      for (var _iterator = parts[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+      for (var _iterator = parts[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
         var part = _step.value;
-        part === "." || part === "" || (part === ".." ? resolved.pop() : resolved.push(part));
+        if (part === "." || part === "") continue;
+        if (part === "..") {
+          resolved.pop();
+        } else {
+          resolved.push(part);
+        }
       }
     } 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 "/" + resolved.join("/");
@@ -61,128 +73,170 @@ function resolveHrefWithSegments(href, routeInfo, segmentsWithoutGroups) {
   return href;
 }
 function triggersToScreens(triggers, layoutRouteNode, linking, initialRouteName, parentTriggerMap, routeInfo, contextKey) {
-  var configs = [],
-    _iteratorNormalCompletion = !0,
-    _didIteratorError = !1,
+  var configs = [];
+  var _iteratorNormalCompletion = true,
+    _didIteratorError = false,
     _iteratorError = void 0;
   try {
-    for (var _loop = function () {
-        var trigger = _step.value,
-          _state_state_index,
-          _linking_getStateFromPath,
-          _linking_getStateFromPath1,
-          _state_state;
-        if (trigger.name in parentTriggerMap) {
-          var parentTrigger = parentTriggerMap[trigger.name];
-          throw new Error(`Trigger ${JSON.stringify({
-            name: trigger.name,
-            href: trigger.href
-          })} has the same name as parent trigger ${JSON.stringify({
-            name: parentTrigger.name,
-            href: parentTrigger.href
-          })}. Triggers must have unique names.`);
+    var _loop = function () {
+      var trigger = _step.value;
+      var _state_state_index;
+      var _linking_getStateFromPath, _linking_getStateFromPath1, _state_state;
+      if (trigger.name in parentTriggerMap) {
+        var parentTrigger = parentTriggerMap[trigger.name];
+        throw new Error(`Trigger ${JSON.stringify({
+          name: trigger.name,
+          href: trigger.href
+        })} has the same name as parent trigger ${JSON.stringify({
+          name: parentTrigger.name,
+          href: parentTrigger.href
+        })}. Triggers must have unique names.`);
+      }
+      if (trigger.type === "external") {
+        configs.push(trigger);
+        return "continue";
+      }
+      var resolvedHref = (0, import_href.resolveHref)(trigger.href);
+      if (resolvedHref.startsWith("../")) {
+        throw new Error("Trigger href cannot link to a parent directory");
+      }
+      var segmentsWithoutGroups = contextKey.split("/").filter(function (segment) {
+        return !(segment.startsWith("(") && segment.endsWith(")"));
+      });
+      resolvedHref = resolveHrefWithSegments(resolvedHref, routeInfo, segmentsWithoutGroups);
+      var state = (_linking_getStateFromPath1 = linking.getStateFromPath) === null || _linking_getStateFromPath1 === void 0 ? void 0 : (_linking_getStateFromPath = _linking_getStateFromPath1.call(linking, resolvedHref, linking.config)) === null || _linking_getStateFromPath === void 0 ? void 0 : _linking_getStateFromPath.routes[0];
+      if (!state) {
+        console.warn(`Unable to find screen for trigger ${JSON.stringify(trigger)}. Does this point to a valid screen?`);
+        return "continue";
+      }
+      var routeState = state;
+      if (routeState.name === "+not-found") {
+        if (process.env.NODE_ENV !== "production") {
+          console.warn(`Tab trigger '${trigger.name}' has the href '${trigger.href}' which points to a +not-found route.`);
         }
-        if (trigger.type === "external") return configs.push(trigger), "continue";
-        var resolvedHref = (0, import_href.resolveHref)(trigger.href);
-        if (resolvedHref.startsWith("../")) throw new Error("Trigger href cannot link to a parent directory");
-        var segmentsWithoutGroups = contextKey.split("/").filter(function (segment) {
-          return !(segment.startsWith("(") && segment.endsWith(")"));
-        });
-        resolvedHref = resolveHrefWithSegments(resolvedHref, routeInfo, segmentsWithoutGroups);
-        var state = (_linking_getStateFromPath1 = linking.getStateFromPath) === null || _linking_getStateFromPath1 === void 0 || (_linking_getStateFromPath = _linking_getStateFromPath1.call(linking, resolvedHref, linking.config)) === null || _linking_getStateFromPath === void 0 ? void 0 : _linking_getStateFromPath.routes[0];
-        if (!state) return console.warn(`Unable to find screen for trigger ${JSON.stringify(trigger)}. Does this point to a valid screen?`), "continue";
-        var routeState = state;
-        if (routeState.name === "+not-found") return process.env.NODE_ENV !== "production" && console.warn(`Tab trigger '${trigger.name}' has the href '${trigger.href}' which points to a +not-found route.`), "continue";
-        for (var targetStateName = layoutRouteNode.route || "__root"; state?.state;) {
-          var _state_state_index1;
-          if (state.name === targetStateName) break;
-          state = state.state.routes[(_state_state_index1 = state.state.index) !== null && _state_state_index1 !== void 0 ? _state_state_index1 : state.state.routes.length - 1];
+        return "continue";
+      }
+      var targetStateName = layoutRouteNode.route || "__root";
+      while (state === null || state === void 0 ? void 0 : state.state) {
+        var _state_state_index1;
+        if (state.name === targetStateName) break;
+        state = state.state.routes[(_state_state_index1 = state.state.index) !== null && _state_state_index1 !== void 0 ? _state_state_index1 : state.state.routes.length - 1];
+      }
+      routeState = ((_state_state = state.state) === null || _state_state === void 0 ? void 0 : _state_state.routes[(_state_state_index = state.state.index) !== null && _state_state_index !== void 0 ? _state_state_index : state.state.routes.length - 1]) || state;
+      var routeNode = layoutRouteNode.children.find(function (child) {
+        return child.route === (routeState === null || routeState === void 0 ? void 0 : routeState.name);
+      });
+      if (!routeNode) {
+        console.warn(`Unable to find routeNode for trigger ${JSON.stringify(trigger)}. This might be a bug in One router`);
+        return "continue";
+      }
+      var duplicateTrigger = trigger.type === "internal" && configs.find(function (config) {
+        if (config.type === "external") {
+          return false;
         }
-        routeState = ((_state_state = state.state) === null || _state_state === void 0 ? void 0 : _state_state.routes[(_state_state_index = state.state.index) !== null && _state_state_index !== void 0 ? _state_state_index : state.state.routes.length - 1]) || state;
-        var routeNode = layoutRouteNode.children.find(function (child) {
-          return child.route === routeState?.name;
-        });
-        if (!routeNode) return console.warn(`Unable to find routeNode for trigger ${JSON.stringify(trigger)}. This might be a bug in One router`), "continue";
-        var duplicateTrigger = trigger.type === "internal" && configs.find(function (config) {
-          return config.type === "external" ? !1 : config.routeNode.route === routeNode.route;
-        });
-        if (duplicateTrigger) {
-          var duplicateTriggerText = `${JSON.stringify({
-            name: duplicateTrigger.name,
-            href: duplicateTrigger.href
-          })} and ${JSON.stringify({
-            name: trigger.name,
-            href: trigger.href
-          })}`;
-          throw new Error(`A navigator cannot contain multiple trigger components that map to the same sub-segment. Consider adding a shared group and assigning a group to each trigger. Conflicting triggers:
+        return config.routeNode.route === routeNode.route;
+      });
+      if (duplicateTrigger) {
+        var duplicateTriggerText = `${JSON.stringify({
+          name: duplicateTrigger.name,
+          href: duplicateTrigger.href
+        })} and ${JSON.stringify({
+          name: trigger.name,
+          href: trigger.href
+        })}`;
+        throw new Error(`A navigator cannot contain multiple trigger components that map to the same sub-segment. Consider adding a shared group and assigning a group to each trigger. Conflicting triggers:
 	${duplicateTriggerText}.
 Both triggers map to route ${routeNode.route}.`);
-        }
-        configs.push({
-          ...trigger,
-          href: resolvedHref,
-          routeNode,
-          action: stateToAction(state, layoutRouteNode.route)
-        });
-      }, _iterator = triggers[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
+      }
+      configs.push({
+        ...trigger,
+        href: resolvedHref,
+        routeNode,
+        action: stateToAction(state, layoutRouteNode.route)
+      });
+    };
+    for (var _iterator = triggers[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) _loop();
   } 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;
+      }
     }
   }
-  var sortFn = (0, import_sortRoutes.sortRoutesWithInitial)(initialRouteName),
-    sortedConfigs = configs.sort(function (a, b) {
-      return a.type === "external" && b.type === "external" ? 0 : a.type === "external" ? 1 : b.type === "external" ? -1 : sortFn(a.routeNode, b.routeNode);
-    }),
-    children = [],
-    triggerMap = {
-      ...parentTriggerMap
-    },
-    _iteratorNormalCompletion1 = !0,
-    _didIteratorError1 = !1,
+  var sortFn = (0, import_sortRoutes.sortRoutesWithInitial)(initialRouteName);
+  var sortedConfigs = configs.sort(function (a, b) {
+    if (a.type === "external" && b.type === "external") {
+      return 0;
+    } else if (a.type === "external") {
+      return 1;
+    } else if (b.type === "external") {
+      return -1;
+    }
+    return sortFn(a.routeNode, b.routeNode);
+  });
+  var children = [];
+  var triggerMap = {
+    ...parentTriggerMap
+  };
+  var _iteratorNormalCompletion1 = true,
+    _didIteratorError1 = false,
     _iteratorError1 = void 0;
   try {
-    for (var _loop1 = function () {
-        var [index, config] = _step1.value;
-        if (triggerMap[config.name] = {
-          ...config,
-          index
-        }, config.type === "internal") {
-          var route = config.routeNode;
-          children.push(/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_useScreens.Screen, {
-            getId: (0, import_useScreens.createGetIdForRoute)(route),
-            name: route.route,
-            options: function (args) {
-              var _route_loadRoute,
-                staticOptions = route.generated ? (_route_loadRoute = route.loadRoute()) === null || _route_loadRoute === void 0 ? void 0 : _route_loadRoute.getNavOptions : null,
-                staticResult = typeof staticOptions == "function" ? staticOptions(args) : staticOptions,
-                output = {
-                  ...staticResult
-                };
-              return route.generated && (output.tabBarButton = function () {
+    var _loop1 = function () {
+      var [index, config] = _step1.value;
+      triggerMap[config.name] = {
+        ...config,
+        index
+      };
+      if (config.type === "internal") {
+        var route = config.routeNode;
+        children.push(/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_useScreens.Screen, {
+          getId: (0, import_useScreens.createGetIdForRoute)(route),
+          name: route.route,
+          options: function (args) {
+            var _route_loadRoute;
+            var staticOptions = route.generated ? (_route_loadRoute = route.loadRoute()) === null || _route_loadRoute === void 0 ? void 0 : _route_loadRoute.getNavOptions : null;
+            var staticResult = typeof staticOptions === "function" ? staticOptions(args) : staticOptions;
+            var output = {
+              ...staticResult
+            };
+            if (route.generated) {
+              output.tabBarButton = function () {
                 return null;
-              }, output.drawerItemStyle = {
+              };
+              output.drawerItemStyle = {
                 height: 0,
                 display: "none"
-              }), output;
-            },
-            getComponent: function () {
-              return (0, import_useScreens.getQualifiedRouteComponent)(route);
+              };
             }
-          }, route.route));
-        }
-      }, _iterator1 = sortedConfigs.entries()[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) _loop1();
+            return output;
+          },
+          getComponent: function () {
+            return (0, import_useScreens.getQualifiedRouteComponent)(route);
+          }
+        }, route.route));
+      }
+    };
+    for (var _iterator1 = sortedConfigs.entries()[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) _loop1();
   } catch (err) {
-    _didIteratorError1 = !0, _iteratorError1 = err;
+    _didIteratorError1 = true;
+    _iteratorError1 = err;
   } finally {
     try {
-      !_iteratorNormalCompletion1 && _iterator1.return != null && _iterator1.return();
+      if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+        _iterator1.return();
+      }
     } finally {
-      if (_didIteratorError1) throw _iteratorError1;
+      if (_didIteratorError1) {
+        throw _iteratorError1;
+      }
     }
   }
   return {
@@ -191,22 +245,37 @@ Both triggers map to route ${routeNode.route}.`);
   };
 }
 function stateToAction(state, startAtRoute) {
-  var rootPayload = {},
-    payload = rootPayload;
+  var rootPayload = {};
+  var payload = rootPayload;
   startAtRoute = startAtRoute === "" ? "__root" : startAtRoute;
-  for (var foundStartingPoint = startAtRoute === void 0 || !state?.state; state;) if (foundStartingPoint) {
-    var _state_state, _state_state1;
-    if (payload === rootPayload ? payload.name = state.name : payload.screen = state.name, payload.params = state.params ? {
-      ...state.params
-    } : {}, state = (_state_state1 = state.state) === null || _state_state1 === void 0 ? void 0 : _state_state1.routes[((_state_state = state.state) === null || _state_state === void 0 ? void 0 : _state_state.routes.length) - 1], state) {
-      var _payload, _params;
-      (_params = (_payload = payload).params) !== null && _params !== void 0 || (_payload.params = {}), payload = payload.params;
+  var foundStartingPoint = startAtRoute === void 0 || !(state === null || state === void 0 ? void 0 : state.state);
+  while (state) {
+    if (foundStartingPoint) {
+      var _state_state, _state_state1;
+      if (payload === rootPayload) {
+        payload.name = state.name;
+      } else {
+        payload.screen = state.name;
+      }
+      payload.params = state.params ? {
+        ...state.params
+      } : {};
+      state = (_state_state1 = state.state) === null || _state_state1 === void 0 ? void 0 : _state_state1.routes[((_state_state = state.state) === null || _state_state === void 0 ? void 0 : _state_state.routes.length) - 1];
+      if (state) {
+        var _payload, _params;
+        (_params = (_payload = payload).params) !== null && _params !== void 0 ? _params : _payload.params = {};
+        payload = payload.params;
+      }
+    } else {
+      var _state_state2, _state_state3;
+      if (state.name === startAtRoute) {
+        foundStartingPoint = true;
+      }
+      var nextState = (_state_state3 = state.state) === null || _state_state3 === void 0 ? void 0 : _state_state3.routes[((_state_state2 = state.state) === null || _state_state2 === void 0 ? void 0 : _state_state2.routes.length) - 1];
+      if (nextState) {
+        state = nextState;
+      }
     }
-  } else {
-    var _state_state2, _state_state3;
-    state.name === startAtRoute && (foundStartingPoint = !0);
-    var nextState = (_state_state3 = state.state) === null || _state_state3 === void 0 ? void 0 : _state_state3.routes[((_state_state2 = state.state) === null || _state_state2 === void 0 ? void 0 : _state_state2.routes.length) - 1];
-    nextState && (state = nextState);
   }
   return {
     type: "JUMP_TO",