one 1.26.1 → 2.0.0-beta.33.1

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

@@ -34,9 +34,10 @@ function getNavigateAction(actionState, navigationState) {
   var type = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "NAVIGATE";
   var actionStateRoute;
   while (actionState && navigationState) {
+    var _actionState_index;
     var _actionStateRoute_params, _stateRoute_params;
     var stateRoute = navigationState.routes[navigationState.index];
-    actionStateRoute = actionState.routes[actionState.routes.length - 1];
+    actionStateRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];
     var childState = actionStateRoute.state;
     var nextNavigationState = stateRoute.state;
     var dynamicMatch = (0, import_matchers.matchDynamicName)(actionStateRoute.name);
@@ -55,8 +56,8 @@ function getNavigateAction(actionState, navigationState) {
   var payload = rootPayload;
   var params = payload.params;
   while (actionStateRoute) {
-    var _payload, _params;
-    var _actionStateRoute_state, _actionStateRoute_state1;
+    var _actionStateRoute_state_index, _payload, _params;
+    var _actionStateRoute_state;
     Object.assign(params, {
       ...actionStateRoute.params
     });
@@ -64,7 +65,7 @@ function getNavigateAction(actionState, navigationState) {
     payload.params = {
       ...actionStateRoute.params
     };
-    actionStateRoute = (_actionStateRoute_state1 = actionStateRoute.state) === null || _actionStateRoute_state1 === void 0 ? void 0 : _actionStateRoute_state1.routes[((_actionStateRoute_state = actionStateRoute.state) === null || _actionStateRoute_state === void 0 ? void 0 : _actionStateRoute_state.routes.length) - 1];
+    actionStateRoute = (_actionStateRoute_state = actionStateRoute.state) === null || _actionStateRoute_state === void 0 ? void 0 : _actionStateRoute_state.routes[(_actionStateRoute_state_index = actionStateRoute.state.index) !== null && _actionStateRoute_state_index !== void 0 ? _actionStateRoute_state_index : actionStateRoute.state.routes.length - 1];
     (_params = (_payload = payload).params) !== null && _params !== void 0 ? _params : _payload.params = {};
     payload = payload.params;
     params = payload;

package/dist/cjs/router/utils/getNavigateAction.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","getNavigateAction_exports","__export","getNavigateAction","module","exports","import_non_secure","require","import_lastAction","import_matchers","actionState","navigationState","type","arguments","length","actionStateRoute","_actionStateRoute_params","_stateRoute_params","stateRoute","routes","index","childState","state","nextNavigationState","dynamicMatch","matchDynamicName","name","didActionAndCurrentStateDiverge","params","rootPayload","payload","_payload","_params","_actionStateRoute_state","_actionStateRoute_state1","Object","assign","screen","setLastAction","key","nanoid"],"sources":["../../../../src/router/utils/getNavigateAction.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toCommonJS","mod","value","getNavigateAction_exports","getNavigateAction","module","exports","import_non_secure","require","import_lastAction","import_matchers","actionState","navigationState","type","arguments","length","actionStateRoute","_actionState_index","_actionStateRoute_params","_stateRoute_params","stateRoute","routes","index","childState","state","nextNavigationState","dynamicMatch","matchDynamicName","didActionAndCurrentStateDiverge","params","rootPayload","payload","_actionStateRoute_state_index","_payload","_params","_actionStateRoute_state","assign","screen","setLastAction","nanoid"],"sources":["getNavigateAction.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar getNavigateAction_exports = {};\n__export(getNavigateAction_exports, {\n  getNavigateAction: () => getNavigateAction\n});\nmodule.exports = __toCommonJS(getNavigateAction_exports);\nvar import_non_secure = require(\"nanoid/non-secure\");\nvar import_lastAction = require(\"../lastAction\");\nvar import_matchers = require(\"../matchers\");\nfunction getNavigateAction(actionState, navigationState) {\n  var type = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : \"NAVIGATE\";\n  var actionStateRoute;\n  while (actionState && navigationState) {\n    var _actionState_index;\n    var _actionStateRoute_params, _stateRoute_params;\n    var stateRoute = navigationState.routes[navigationState.index];\n    actionStateRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];\n    var childState = actionStateRoute.state;\n    var nextNavigationState = stateRoute.state;\n    var dynamicMatch = (0, import_matchers.matchDynamicName)(actionStateRoute.name);\n    var didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || // !deepEqual(actionStateRoute.params, stateRoute.params) ||\n    !childState || !nextNavigationState || dynamicMatch && ((_actionStateRoute_params = actionStateRoute.params) === null || _actionStateRoute_params === void 0 ? void 0 : _actionStateRoute_params[dynamicMatch.name]) !== ((_stateRoute_params = stateRoute.params) === null || _stateRoute_params === void 0 ? void 0 : _stateRoute_params[dynamicMatch.name]);\n    if (didActionAndCurrentStateDiverge) {\n      break;\n    }\n    actionState = childState;\n    navigationState = nextNavigationState;\n  }\n  var rootPayload = {\n    params: {}\n  };\n  var payload = rootPayload;\n  var params = payload.params;\n  while (actionStateRoute) {\n    var _actionStateRoute_state_index, _payload, _params;\n    var _actionStateRoute_state;\n    Object.assign(params, {\n      ...actionStateRoute.params\n    });\n    payload.screen = actionStateRoute.name;\n    payload.params = {\n      ...actionStateRoute.params\n    };\n    actionStateRoute = (_actionStateRoute_state = actionStateRoute.state) === null || _actionStateRoute_state === void 0 ? void 0 : _actionStateRoute_state.routes[(_actionStateRoute_state_index = actionStateRoute.state.index) !== null && _actionStateRoute_state_index !== void 0 ? _actionStateRoute_state_index : actionStateRoute.state.routes.length - 1];\n    (_params = (_payload = payload).params) !== null && _params !== void 0 ? _params : _payload.params = {};\n    payload = payload.params;\n    params = payload;\n  }\n  if (type === \"PUSH\") {\n    (0, import_lastAction.setLastAction)();\n    type = \"NAVIGATE\";\n    if (navigationState.type === \"stack\") {\n      rootPayload.key = `${rootPayload.name}-${(0, import_non_secure.nanoid)()}`;\n    }\n  }\n  if (type === \"REPLACE\" && navigationState.type === \"tab\") {\n    type = \"JUMP_TO\";\n  }\n  return {\n    type,\n    target: navigationState.key,\n    payload: {\n      key: rootPayload.key,\n      name: rootPayload.screen,\n      params: rootPayload.params\n    }\n  };\n}\n//# sourceMappingURL=getNavigateAction.js.map\n"],"mappings":"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","ignoreList":[]}

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

@@ -18,7 +18,7 @@ var import_getNavigateAction = require("./getNavigateAction.cjs");
           name: "page-1",
           key: "page-1-Gc-TeIdZmx_jAcRD-SGcs"
         }],
-        preloadedRoutes: []
+        retainedRouteKeys: []
       };
       const action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);
       (0, import_vitest.expect)(action).toStrictEqual({
@@ -31,6 +31,37 @@ var import_getNavigateAction = require("./getNavigateAction.cjs");
         }
       });
     });
+    (0, import_vitest.it)("uses the focused route when the desired state includes a preloaded route", () => {
+      const actionState = {
+        index: 0,
+        routes: [{
+          name: "page-2"
+        }, {
+          name: "preloaded-page"
+        }]
+      };
+      const navigationState = {
+        stale: false,
+        type: "stack",
+        key: "stack-pWRo04",
+        index: 0,
+        routeNames: ["page-1", "page-2", "preloaded-page"],
+        routes: [{
+          name: "page-1",
+          key: "page-1-key"
+        }],
+        retainedRouteKeys: []
+      };
+      (0, import_vitest.expect)((0, import_getNavigateAction.getNavigateAction)(actionState, navigationState)).toStrictEqual({
+        type: "NAVIGATE",
+        target: "stack-pWRo04",
+        payload: {
+          key: void 0,
+          name: "page-2",
+          params: {}
+        }
+      });
+    });
     (0, import_vitest.it)("handles params", () => {
       const actionState = {
         routes: [{
@@ -51,7 +82,7 @@ var import_getNavigateAction = require("./getNavigateAction.cjs");
           name: "page-1",
           key: "page-1-Gc-TeIdZmx_jAcRD-SGcs"
         }],
-        preloadedRoutes: []
+        retainedRouteKeys: []
       };
       const action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);
       (0, import_vitest.expect)(action).toStrictEqual({
@@ -93,7 +124,7 @@ var import_getNavigateAction = require("./getNavigateAction.cjs");
           name: "index",
           key: "index-Kyz4PdQ7ZAvE0XFhBWydM"
         }],
-        preloadedRoutes: []
+        retainedRouteKeys: []
       };
       const action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);
       (0, import_vitest.expect)(action).toStrictEqual({
@@ -150,7 +181,7 @@ var import_getNavigateAction = require("./getNavigateAction.cjs");
           name: "index",
           key: "index-Kyz4PdQ7ZAvE0XFhBWydM"
         }],
-        preloadedRoutes: []
+        retainedRouteKeys: []
       };
       const action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);
       (0, import_vitest.expect)(action).toStrictEqual({
@@ -228,7 +259,7 @@ var import_getNavigateAction = require("./getNavigateAction.cjs");
             }]
           }
         }],
-        preloadedRoutes: []
+        retainedRouteKeys: []
       };
       const action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);
       (0, import_vitest.expect)(action).toStrictEqual({
@@ -259,7 +290,7 @@ var import_getNavigateAction = require("./getNavigateAction.cjs");
           name: "page-1",
           key: "page-1-Gc-TeIdZmx_jAcRD-SGcs"
         }],
-        preloadedRoutes: []
+        retainedRouteKeys: []
       };
       const action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState, "PUSH");
       (0, import_vitest.expect)(action).toStrictEqual({

package/dist/cjs/router/utils/getNavigateAction.test.native.js

@@ -20,7 +20,7 @@ var import_getNavigateAction = require("./getNavigateAction.native.js");
           name: "page-1",
           key: "page-1-Gc-TeIdZmx_jAcRD-SGcs"
         }],
-        preloadedRoutes: []
+        retainedRouteKeys: []
       };
       var action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);
       (0, import_vitest.expect)(action).toStrictEqual({
@@ -33,6 +33,37 @@ var import_getNavigateAction = require("./getNavigateAction.native.js");
         }
       });
     });
+    (0, import_vitest.it)("uses the focused route when the desired state includes a preloaded route", function () {
+      var actionState = {
+        index: 0,
+        routes: [{
+          name: "page-2"
+        }, {
+          name: "preloaded-page"
+        }]
+      };
+      var navigationState = {
+        stale: false,
+        type: "stack",
+        key: "stack-pWRo04",
+        index: 0,
+        routeNames: ["page-1", "page-2", "preloaded-page"],
+        routes: [{
+          name: "page-1",
+          key: "page-1-key"
+        }],
+        retainedRouteKeys: []
+      };
+      (0, import_vitest.expect)((0, import_getNavigateAction.getNavigateAction)(actionState, navigationState)).toStrictEqual({
+        type: "NAVIGATE",
+        target: "stack-pWRo04",
+        payload: {
+          key: void 0,
+          name: "page-2",
+          params: {}
+        }
+      });
+    });
     (0, import_vitest.it)("handles params", function () {
       var actionState = {
         routes: [{
@@ -53,7 +84,7 @@ var import_getNavigateAction = require("./getNavigateAction.native.js");
           name: "page-1",
           key: "page-1-Gc-TeIdZmx_jAcRD-SGcs"
         }],
-        preloadedRoutes: []
+        retainedRouteKeys: []
       };
       var action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);
       (0, import_vitest.expect)(action).toStrictEqual({
@@ -95,7 +126,7 @@ var import_getNavigateAction = require("./getNavigateAction.native.js");
           name: "index",
           key: "index-Kyz4PdQ7ZAvE0XFhBWydM"
         }],
-        preloadedRoutes: []
+        retainedRouteKeys: []
       };
       var action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);
       (0, import_vitest.expect)(action).toStrictEqual({
@@ -152,7 +183,7 @@ var import_getNavigateAction = require("./getNavigateAction.native.js");
           name: "index",
           key: "index-Kyz4PdQ7ZAvE0XFhBWydM"
         }],
-        preloadedRoutes: []
+        retainedRouteKeys: []
       };
       var action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);
       (0, import_vitest.expect)(action).toStrictEqual({
@@ -230,7 +261,7 @@ var import_getNavigateAction = require("./getNavigateAction.native.js");
             }]
           }
         }],
-        preloadedRoutes: []
+        retainedRouteKeys: []
       };
       var action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);
       (0, import_vitest.expect)(action).toStrictEqual({
@@ -261,7 +292,7 @@ var import_getNavigateAction = require("./getNavigateAction.native.js");
           name: "page-1",
           key: "page-1-Gc-TeIdZmx_jAcRD-SGcs"
         }],
-        preloadedRoutes: []
+        retainedRouteKeys: []
       };
       var action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState, "PUSH");
       (0, import_vitest.expect)(action).toStrictEqual({

package/dist/cjs/router/utils/getNavigateAction.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["import_vitest","require","import_getNavigateAction","describe","it","actionState","routes","name","navigationState","stale","type","key","index","routeNames","preloadedRoutes","action","getNavigateAction","expect","toStrictEqual","target","payload","params","foo","bar","state","screen","level1","level2","level3"],"sources":["../../../../src/router/utils/getNavigateAction.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["import_vitest","require","import_getNavigateAction","describe","it","actionState","routes","name","navigationState","stale","type","key","index","routeNames","retainedRouteKeys","action","getNavigateAction","expect","toStrictEqual","target","payload","params","foo","bar","state","screen","level1","level2","level3"],"sources":["getNavigateAction.test.native.js"],"sourcesContent":["\"use strict\";\nvar import_vitest = require(\"vitest\");\nvar import_getNavigateAction = require(\"./getNavigateAction\");\n(0, import_vitest.describe)(\"getNavigateAction\", function() {\n  (0, import_vitest.describe)(\"NAVIGATE\", function() {\n    (0, import_vitest.it)(\"works\", function() {\n      var actionState = {\n        routes: [\n          {\n            name: \"page-2\"\n          }\n        ]\n      };\n      var navigationState = {\n        stale: false,\n        type: \"stack\",\n        key: \"stack-pWRo04\",\n        index: 0,\n        routeNames: [\n          \"_sitemap\",\n          \"index\",\n          \"page-1\",\n          \"page-2\"\n        ],\n        routes: [\n          {\n            name: \"page-1\",\n            key: \"page-1-Gc-TeIdZmx_jAcRD-SGcs\"\n          }\n        ],\n        retainedRouteKeys: []\n      };\n      var action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);\n      (0, import_vitest.expect)(action).toStrictEqual({\n        type: \"NAVIGATE\",\n        target: \"stack-pWRo04\",\n        payload: {\n          key: void 0,\n          name: \"page-2\",\n          params: {}\n        }\n      });\n    });\n    (0, import_vitest.it)(\"uses the focused route when the desired state includes a preloaded route\", function() {\n      var actionState = {\n        index: 0,\n        routes: [\n          {\n            name: \"page-2\"\n          },\n          {\n            name: \"preloaded-page\"\n          }\n        ]\n      };\n      var navigationState = {\n        stale: false,\n        type: \"stack\",\n        key: \"stack-pWRo04\",\n        index: 0,\n        routeNames: [\n          \"page-1\",\n          \"page-2\",\n          \"preloaded-page\"\n        ],\n        routes: [\n          {\n            name: \"page-1\",\n            key: \"page-1-key\"\n          }\n        ],\n        retainedRouteKeys: []\n      };\n      (0, import_vitest.expect)((0, import_getNavigateAction.getNavigateAction)(actionState, navigationState)).toStrictEqual({\n        type: \"NAVIGATE\",\n        target: \"stack-pWRo04\",\n        payload: {\n          key: void 0,\n          name: \"page-2\",\n          params: {}\n        }\n      });\n    });\n    (0, import_vitest.it)(\"handles params\", function() {\n      var actionState = {\n        routes: [\n          {\n            name: \"page-1\",\n            params: {\n              foo: \"foo\",\n              bar: \"bar\"\n            }\n          }\n        ]\n      };\n      var navigationState = {\n        stale: false,\n        type: \"stack\",\n        key: \"stack-pWRo04\",\n        index: 0,\n        routeNames: [\n          \"_sitemap\",\n          \"index\",\n          \"page-1\",\n          \"page-2\"\n        ],\n        routes: [\n          {\n            name: \"page-1\",\n            key: \"page-1-Gc-TeIdZmx_jAcRD-SGcs\"\n          }\n        ],\n        retainedRouteKeys: []\n      };\n      var action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);\n      (0, import_vitest.expect)(action).toStrictEqual({\n        type: \"NAVIGATE\",\n        target: \"stack-pWRo04\",\n        payload: {\n          key: void 0,\n          name: \"page-1\",\n          params: {\n            foo: \"foo\",\n            bar: \"bar\"\n          }\n        }\n      });\n    });\n    (0, import_vitest.it)(\"handles navigating into nested navigator\", function() {\n      var actionState = {\n        routes: [\n          {\n            name: \"foo\",\n            state: {\n              routes: [\n                {\n                  name: \"bar\",\n                  state: {\n                    routes: [\n                      {\n                        name: \"baz\"\n                      }\n                    ]\n                  }\n                }\n              ]\n            }\n          }\n        ]\n      };\n      var navigationState = {\n        stale: false,\n        type: \"stack\",\n        key: \"stack-5qQ9ln4FB9\",\n        index: 0,\n        routeNames: [\n          \"index\",\n          \"foo\"\n        ],\n        routes: [\n          {\n            name: \"index\",\n            key: \"index-Kyz4PdQ7ZAvE0XFhBWydM\"\n          }\n        ],\n        retainedRouteKeys: []\n      };\n      var action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);\n      (0, import_vitest.expect)(action).toStrictEqual({\n        type: \"NAVIGATE\",\n        target: \"stack-5qQ9ln4FB9\",\n        payload: {\n          key: void 0,\n          name: \"foo\",\n          params: {\n            screen: \"bar\",\n            params: {\n              screen: \"baz\",\n              params: {}\n            }\n          }\n        }\n      });\n    });\n    (0, import_vitest.it)(\"handles navigating into nested navigator with route params\", function() {\n      var actionState = {\n        routes: [\n          {\n            name: \"[level1]\",\n            params: {\n              level1: \"foo\"\n            },\n            state: {\n              routes: [\n                {\n                  name: \"[level2]\",\n                  params: {\n                    level1: \"foo\",\n                    level2: \"bar\"\n                  },\n                  state: {\n                    routes: [\n                      {\n                        name: \"[level3]\",\n                        params: {\n                          level1: \"foo\",\n                          level2: \"bar\",\n                          level3: \"baz\"\n                        }\n                      }\n                    ]\n                  }\n                }\n              ]\n            }\n          }\n        ]\n      };\n      var navigationState = {\n        stale: false,\n        type: \"stack\",\n        key: \"stack-5qQ9ln4FB9\",\n        index: 0,\n        routeNames: [\n          \"index\",\n          \"[level1]\"\n        ],\n        routes: [\n          {\n            name: \"index\",\n            key: \"index-Kyz4PdQ7ZAvE0XFhBWydM\"\n          }\n        ],\n        retainedRouteKeys: []\n      };\n      var action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);\n      (0, import_vitest.expect)(action).toStrictEqual({\n        type: \"NAVIGATE\",\n        target: \"stack-5qQ9ln4FB9\",\n        payload: {\n          key: void 0,\n          name: \"[level1]\",\n          params: {\n            level1: \"foo\",\n            level2: \"bar\",\n            // not actually necessary, but it's how the current implementation works\n            screen: \"[level2]\",\n            params: {\n              level1: \"foo\",\n              level2: \"bar\",\n              level3: \"baz\",\n              // not actually necessary, but it's how the current implementation works\n              screen: \"[level3]\",\n              params: {\n                level1: \"foo\",\n                level2: \"bar\",\n                level3: \"baz\"\n              }\n            }\n          }\n        }\n      });\n    });\n    (0, import_vitest.it)(\"correctly finds out where the states diverge and return an action valid payload\", function() {\n      var actionState = {\n        routes: [\n          {\n            name: \"foo\",\n            state: {\n              routes: [\n                {\n                  name: \"bar\",\n                  state: {\n                    routes: [\n                      {\n                        name: \"baz-2\"\n                      }\n                    ]\n                  }\n                }\n              ]\n            }\n          }\n        ]\n      };\n      var navigationState = {\n        stale: false,\n        type: \"stack\",\n        key: \"stack-aCzOliK0\",\n        routeNames: [\n          \"index\",\n          \"foo\"\n        ],\n        index: 0,\n        routes: [\n          {\n            name: \"foo\",\n            key: \"foo-teuUBQHk\",\n            state: {\n              stale: false,\n              type: \"stack\",\n              key: \"stack-XZ3RJRBg\",\n              routeNames: [\n                \"bar\"\n              ],\n              index: 0,\n              routes: [\n                {\n                  name: \"bar\",\n                  key: \"bar-FDtH59Dj\",\n                  state: {\n                    stale: false,\n                    type: \"stack\",\n                    key: \"stack-s3o7RyPD\",\n                    routeNames: [\n                      \"baz-1\",\n                      \"baz-2\"\n                    ],\n                    index: 0,\n                    routes: [\n                      {\n                        name: \"baz-1\",\n                        key: \"baz-1-K2zLhRSZ\"\n                      }\n                    ]\n                  }\n                }\n              ]\n            }\n          }\n        ],\n        retainedRouteKeys: []\n      };\n      var action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState);\n      (0, import_vitest.expect)(action).toStrictEqual({\n        type: \"NAVIGATE\",\n        target: \"stack-s3o7RyPD\",\n        payload: {\n          key: void 0,\n          name: \"baz-2\",\n          params: {}\n        }\n      });\n    });\n  });\n  (0, import_vitest.describe)(\"PUSH\", function() {\n    (0, import_vitest.it)(\"returns a NAVIGATE action with a unique key\", function() {\n      var actionState = {\n        routes: [\n          {\n            name: \"page-2\"\n          }\n        ]\n      };\n      var navigationState = {\n        stale: false,\n        type: \"stack\",\n        key: \"stack-pWRo04\",\n        index: 0,\n        routeNames: [\n          \"_sitemap\",\n          \"index\",\n          \"page-1\",\n          \"page-2\"\n        ],\n        routes: [\n          {\n            name: \"page-1\",\n            key: \"page-1-Gc-TeIdZmx_jAcRD-SGcs\"\n          }\n        ],\n        retainedRouteKeys: []\n      };\n      var action = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState, \"PUSH\");\n      (0, import_vitest.expect)(action).toStrictEqual({\n        type: \"NAVIGATE\",\n        target: \"stack-pWRo04\",\n        payload: {\n          key: action.payload.key,\n          /* since this contains a randomly generated nanoid */\n          name: \"page-2\",\n          params: {}\n        }\n      });\n    });\n  });\n});\n//# sourceMappingURL=getNavigateAction.test.js.map\n"],"mappings":"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","ignoreList":[]}

package/dist/cjs/router/web/WebStackNavigator.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","WebStackNavigator_exports","__export","createWebStackNavigator","module","exports","import_jsx_runtime","require","import_core","import_routers","import_react","import_WebStackView","WebStackNavigator","param","initialRouteName","children","screenOptions","headlessChildren","rest","state","navigation","descriptors","NavigationContent","useNavigationBuilder","StackRouter","useEffect","_navigation_addListener","addListener","call","e","isFocused","requestAnimationFrame","index","defaultPrevented","dispatch","StackActions","popToTop","target","key","jsx","WebStackView","customChildren","createNavigatorFactory"],"sources":["../../../../src/router/web/WebStackNavigator.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,yBAAA;AAAAC,QAAA,CAAAD,yBAAA;EAAAE,uBAAA,EAAAA,CAAA,KAAAA;AAAA;AAEAC,MAAA,CAAAC,OAAA,GAAAT,YAKO,CAAAK,yBAAA;AACP,IAAAK,kBAMO,GAAAC,OAAA;AAKP,IAAAC,WAAA,GAAAD,OAA0C;AAE1C,IAAAE,cAAA,GAAAF,OAA6B;AAyDvB,IAAAG,YAAA,GAAAH,OAAA;AAtCN,IAAAI,mBAAS,GAAAJ,OAAkB;AAAA,SACzBK,kBAAAC,KAAA;EACA;IAAAC,gBAAA;IAAAC,QAAA;IAAAC,aAAA;IAAAC,gBAAA;IAAA,GAAAC;EAAA,IAAAL,KAAA;EACA;IAAAM,KAAA;IAAAC,UAAA;IAAAC,WAAA;IAAAC;EAAA,QAAAd,WAAA,CAAAe,oBAAA,EAAAd,cAAA,CAAAe,WAAA;IACA,GAAAN,IAAA;IACAH,QAAG;IACsBC,aAAA;IACzBF;EAMe,EACb;EAAI,EACJ,EAAAJ,YAAA,CAAAe,SAAA;IACA,IAAAC,uBAAA;IACA,OAAAN,UAAA,aAAAA,UAAA,wBAAAM,uBAAA,GAAAN,UAAA,CAAAO,WAAA,cAAAD,uBAAA,uBAAAA,uBAAA,CAAAE,IAAA,CAAAR,UAAA,wBAAAS,CAAA;MACD,IAAAC,SAAA,GAAAV,UAAA,CAAAU,SAAA;MAGDC,qBAAA,aAAgB;QAEd,IAAOZ,KAAA,CAAAa,KAAY,QAAAF,SAAc,KAAAD,CAAA,CAAAI,gBAA+C;UAC9Eb,UAAM,CAAAc,QAAY;YAClB,GAAAzB,cAAsB,CAAA0B,YAAM,CAAAC,QAAA;YACtBC,MAAM,EAAAlB,KAAA,CAAQmB;UAChB;QAAoB;MACO;IACX;EACf,IACHlB,UACD,EACHD,KAAC,CAAAa,KAAA,EACHb,KAAI,CAAAmB,GAAA,CAEJ;EAEI,OAAC,mBAAAhC,kBAAA,CAAAiC,GAAA,EAAAjB,iBAAA;IAAAP,QAAA,qBAAAT,kBAAA,CAAAiC,GAAA,EAAA5B,mBAAA,CAAA6B,YAAA;MACCrB,KAAA;MACAC,UAAA;MACAC,WAAA;MACAoB,cAAA,EAAgBxB;IAAA;EAClB;AAGN;AAEO,IAAAd,uBAAM,OAAAK,WAA0B,CAAAkC,sBAAA,EAAA9B,iBAAuB","ignoreList":[]}
+{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toCommonJS","mod","value","WebStackNavigator_exports","createWebStackNavigator","module","exports","import_jsx_runtime","require","import_core","import_routers","import_react","import_WebStackView","WebStackNavigator","param","initialRouteName","children","screenOptions","headlessChildren","rest","state","navigation","descriptors","NavigationContent","useNavigationBuilder","StackRouter","useEffect","_navigation_addListener","addListener","e","isFocused","requestAnimationFrame","index","defaultPrevented","dispatch","StackActions","popToTop","jsx","WebStackView","customChildren","createNavigatorFactory"],"sources":["WebStackNavigator.native.js"],"sourcesContent":["\"use strict\";\n\"use client\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar WebStackNavigator_exports = {};\n__export(WebStackNavigator_exports, {\n  createWebStackNavigator: () => createWebStackNavigator\n});\nmodule.exports = __toCommonJS(WebStackNavigator_exports);\nvar import_jsx_runtime = require(\"react/jsx-runtime\");\nvar import_core = require(\"@react-navigation/core\");\nvar import_routers = require(\"@react-navigation/routers\");\nvar import_react = require(\"react\");\nvar import_WebStackView = require(\"./WebStackView\");\nfunction WebStackNavigator(param) {\n  var { initialRouteName, children, screenOptions, headlessChildren, ...rest } = param;\n  var { state, navigation, descriptors, NavigationContent } = (0, import_core.useNavigationBuilder)(import_routers.StackRouter, {\n    ...rest,\n    children,\n    screenOptions,\n    initialRouteName\n  });\n  (0, import_react.useEffect)(function() {\n    var _navigation_addListener;\n    return navigation === null || navigation === void 0 ? void 0 : (_navigation_addListener = navigation.addListener) === null || _navigation_addListener === void 0 ? void 0 : _navigation_addListener.call(navigation, \"tabPress\", function(e) {\n      var isFocused = navigation.isFocused();\n      requestAnimationFrame(function() {\n        if (state.index > 0 && isFocused && !e.defaultPrevented) {\n          navigation.dispatch({\n            ...import_routers.StackActions.popToTop(),\n            target: state.key\n          });\n        }\n      });\n    });\n  }, [\n    navigation,\n    state.index,\n    state.key\n  ]);\n  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(NavigationContent, {\n    children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_WebStackView.WebStackView, {\n      state,\n      navigation,\n      descriptors,\n      customChildren: headlessChildren\n    })\n  });\n}\nvar createWebStackNavigator = (0, import_core.createNavigatorFactory)(WebStackNavigator);\n//# sourceMappingURL=WebStackNavigator.js.map\n"],"mappings":"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","ignoreList":[]}

package/dist/cjs/router/web/WebStackView.cjs

@@ -78,7 +78,7 @@ function HeadlessStackView({
   const lastBaseIndex = (0, import_stackStateUtils.findLastNonOverlayIndex)(state, descriptors, options => getPresentationType(options) !== void 0);
   const baseRouteKeys = new Set(state.routes.slice(0, lastBaseIndex + 1).map(route => route.key));
   const baseFocusedKey = state.routes[lastBaseIndex]?.key;
-  const overlayRoutes = state.routes.slice(lastBaseIndex + 1);
+  const overlayRoutes = state.routes.slice(lastBaseIndex + 1, state.index + 1);
   return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_react.Fragment, {
     children: [stack.screens.map(screen => {
       if (!baseRouteKeys.has(screen.key)) return null;

package/dist/cjs/router/web/WebStackView.native.js

@@ -86,7 +86,7 @@ function HeadlessStackView(param) {
     return route.key;
   }));
   var baseFocusedKey = (_state_routes_lastBaseIndex = state.routes[lastBaseIndex]) === null || _state_routes_lastBaseIndex === void 0 ? void 0 : _state_routes_lastBaseIndex.key;
-  var overlayRoutes = state.routes.slice(lastBaseIndex + 1);
+  var overlayRoutes = state.routes.slice(lastBaseIndex + 1, state.index + 1);
   return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_react.Fragment, {
     children: [stack.screens.map(function (screen) {
       if (!baseRouteKeys.has(screen.key)) return null;

package/dist/cjs/router/web/WebStackView.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","WebStackView_exports","__export","WebStackView","module","exports","import_jsx_runtime","require","import_routers","import_react","import_use_latest_callback","__toESM","import_Presentations","import_useStack","import_stackStateUtils","param","state","navigation","descriptors","customChildren","jsx","StackStateProvider","children","HeadlessStackView","_state_routes_lastBaseIndex","stack","useStack","presentations","useWebPresentations","length","Fragment","lastBaseIndex","findLastNonOverlayIndex","options","getPresentationType","baseRouteKeys","Set","routes","slice","map","route","key","baseFocusedKey","overlayRoutes","jsxs","screens","screen","has","keepMounted","Activity","mode","element","_descriptors_route_key","find","entry","type","PresentationScreen","onDismiss","dispatch","StackActions","pop","source","target","dismiss","default","onOpenChange","useCallback","nextOpen","open","setOpen","useState","useEffect","Sheet","sheet","Modal","modal","presentation"],"sources":["../../../../src/router/web/WebStackView.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__create","Object","create","__defProp","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__getProtoOf","getPrototypeOf","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toESM","mod","isNodeMode","__esModule","value","__toCommonJS","WebStackView_exports","WebStackView","module","exports","import_jsx_runtime","require","import_routers","import_react","import_use_latest_callback","import_Presentations","import_useStack","import_stackStateUtils","param","state","navigation","descriptors","customChildren","jsx","StackStateProvider","children","HeadlessStackView","_state_routes_lastBaseIndex","stack","useStack","presentations","useWebPresentations","length","Fragment","lastBaseIndex","findLastNonOverlayIndex","options","getPresentationType","baseRouteKeys","Set","routes","slice","map","route","baseFocusedKey","overlayRoutes","index","jsxs","screens","screen","has","keepMounted","Activity","mode","element","_descriptors_route_key","find","entry","type","PresentationScreen","onDismiss","dispatch","StackActions","pop","source","dismiss","default","onOpenChange","useCallback","nextOpen","open","setOpen","useState","useEffect","Sheet","sheet","Modal","modal","presentation"],"sources":["WebStackView.native.js"],"sourcesContent":["\"use strict\";\n\"use client\";\nvar __create = Object.create;\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __getProtoOf = Object.getPrototypeOf;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(\n  // If the importer is in node compatibility mode or this is not an ESM\n  // file that has been converted to a CommonJS file using a Babel-\n  // compatible transform (i.e. \"__esModule\" has not been set), then set\n  // \"default\" to the CommonJS \"module.exports\" for node compatibility.\n  isNodeMode || !mod || !mod.__esModule ? __defProp(target, \"default\", { value: mod, enumerable: true }) : target,\n  mod\n));\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar WebStackView_exports = {};\n__export(WebStackView_exports, {\n  WebStackView: () => WebStackView\n});\nmodule.exports = __toCommonJS(WebStackView_exports);\nvar import_jsx_runtime = require(\"react/jsx-runtime\");\nvar import_routers = require(\"@react-navigation/routers\");\nvar import_react = require(\"react\");\nvar import_use_latest_callback = __toESM(require(\"use-latest-callback\"), 1);\nvar import_Presentations = require(\"../../headless/Presentations\");\nvar import_useStack = require(\"../../headless/useStack\");\nvar import_stackStateUtils = require(\"./stackStateUtils\");\nfunction WebStackView(param) {\n  var { state, navigation, descriptors, customChildren } = param;\n  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_useStack.StackStateProvider, {\n    state,\n    descriptors,\n    children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(HeadlessStackView, {\n      state,\n      navigation,\n      descriptors,\n      customChildren\n    })\n  });\n}\nfunction HeadlessStackView(param) {\n  var { state, navigation, descriptors, customChildren } = param;\n  var _state_routes_lastBaseIndex;\n  var stack = (0, import_useStack.useStack)();\n  var presentations = (0, import_Presentations.useWebPresentations)();\n  if (customChildren === null || customChildren === void 0 ? void 0 : customChildren.length) {\n    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Fragment, {\n      children: customChildren\n    });\n  }\n  var lastBaseIndex = (0, import_stackStateUtils.findLastNonOverlayIndex)(state, descriptors, function(options) {\n    return getPresentationType(options) !== void 0;\n  });\n  var baseRouteKeys = new Set(state.routes.slice(0, lastBaseIndex + 1).map(function(route) {\n    return route.key;\n  }));\n  var baseFocusedKey = (_state_routes_lastBaseIndex = state.routes[lastBaseIndex]) === null || _state_routes_lastBaseIndex === void 0 ? void 0 : _state_routes_lastBaseIndex.key;\n  var overlayRoutes = state.routes.slice(lastBaseIndex + 1, state.index + 1);\n  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react.Fragment, {\n    children: [\n      stack.screens.map(function(screen) {\n        if (!baseRouteKeys.has(screen.key)) return null;\n        if (screen.key === baseFocusedKey) {\n          return screen.keepMounted ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Activity, {\n            mode: \"visible\",\n            children: screen.element\n          }, screen.key) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Fragment, {\n            children: screen.element\n          }, screen.key);\n        }\n        if (!screen.keepMounted) return null;\n        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Activity, {\n          mode: \"hidden\",\n          children: screen.element\n        }, screen.key);\n      }),\n      overlayRoutes.map(function(route) {\n        var _descriptors_route_key;\n        var screen = stack.screens.find(function(entry) {\n          return entry.key === route.key;\n        });\n        var type = getPresentationType((_descriptors_route_key = descriptors[route.key]) === null || _descriptors_route_key === void 0 ? void 0 : _descriptors_route_key.options);\n        if (!screen || !type) return null;\n        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PresentationScreen, {\n          screen,\n          type,\n          presentations,\n          onDismiss: function() {\n            return navigation.dispatch({\n              ...import_routers.StackActions.pop(),\n              source: route.key,\n              target: state.key\n            });\n          }\n        }, route.key);\n      })\n    ]\n  });\n}\nfunction PresentationScreen(param) {\n  var { screen, type, presentations, onDismiss } = param;\n  var dismiss = (0, import_use_latest_callback.default)(onDismiss);\n  var onOpenChange = (0, import_react.useCallback)(function(nextOpen) {\n    if (!nextOpen) dismiss();\n  }, [\n    dismiss\n  ]);\n  var [open, setOpen] = (0, import_react.useState)(false);\n  (0, import_react.useEffect)(function() {\n    return setOpen(true);\n  }, []);\n  if (type === \"sheet\") {\n    var Sheet = presentations === null || presentations === void 0 ? void 0 : presentations.sheet;\n    if (!Sheet) return screen.element;\n    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Sheet, {\n      open,\n      onOpenChange,\n      options: screen.options,\n      screen,\n      children: screen.element\n    });\n  }\n  var Modal = presentations === null || presentations === void 0 ? void 0 : presentations.modal;\n  if (!Modal) return screen.element;\n  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Modal, {\n    open,\n    onOpenChange,\n    options: screen.options,\n    screen,\n    children: screen.element\n  });\n}\nfunction getPresentationType(options) {\n  var presentation = options === null || options === void 0 ? void 0 : options.presentation;\n  if (!presentation || presentation === \"card\" || presentation === \"push\") {\n    return void 0;\n  }\n  if (presentation === \"sheet\" || presentation === \"formSheet\" || presentation === \"pageSheet\") {\n    return \"sheet\";\n  }\n  return \"modal\";\n}\n//# sourceMappingURL=WebStackView.js.map\n"],"mappings":"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","ignoreList":[]}

package/dist/cjs/router/web/__tests__/stackStateUtils.test.cjs

@@ -13,7 +13,7 @@ function makeState(routeNames, index) {
     routes,
     type: "stack",
     stale: false,
-    preloadedRoutes: []
+    retainedRouteKeys: []
   };
 }
 function makeDescriptors(routeNames, presentations) {
@@ -112,6 +112,17 @@ function makeDescriptors(routeNames, presentations) {
     (0, import_vitest.expect)(out.routes).toHaveLength(0);
     (0, import_vitest.expect)(out.index).toBe(0);
   });
+  (0, import_vitest.it)("ignores preloaded routes after the focused index", () => {
+    const state = makeState(["home", "sheet", "preloaded"], 1);
+    const descriptors = makeDescriptors(["home", "sheet", "preloaded"], {
+      home: "card",
+      sheet: "formSheet",
+      preloaded: "card"
+    });
+    const out = (0, import_stackStateUtils.convertStackStateToNonOverlayState)(state, descriptors);
+    (0, import_vitest.expect)(out.routes.map(route => route.name)).toEqual(["home"]);
+    (0, import_vitest.expect)(out.index).toBe(0);
+  });
 });
 (0, import_vitest.describe)("findLastNonOverlayIndex", () => {
   (0, import_vitest.it)("returns the highest index that is not an overlay", () => {
@@ -131,4 +142,13 @@ function makeDescriptors(routeNames, presentations) {
     });
     (0, import_vitest.expect)((0, import_stackStateUtils.findLastNonOverlayIndex)(state, descriptors)).toBe(-1);
   });
+  (0, import_vitest.it)("does not treat a preloaded card as focused", () => {
+    const state = makeState(["home", "sheet", "preloaded"], 1);
+    const descriptors = makeDescriptors(["home", "sheet", "preloaded"], {
+      home: "card",
+      sheet: "formSheet",
+      preloaded: "card"
+    });
+    (0, import_vitest.expect)((0, import_stackStateUtils.findLastNonOverlayIndex)(state, descriptors)).toBe(0);
+  });
 });

package/dist/cjs/router/web/__tests__/stackStateUtils.test.native.js

@@ -17,7 +17,7 @@ function makeState(routeNames, index) {
     routes,
     type: "stack",
     stale: false,
-    preloadedRoutes: []
+    retainedRouteKeys: []
   };
 }
 function makeDescriptors(routeNames, presentations) {
@@ -140,6 +140,19 @@ function makeDescriptors(routeNames, presentations) {
     (0, import_vitest.expect)(out.routes).toHaveLength(0);
     (0, import_vitest.expect)(out.index).toBe(0);
   });
+  (0, import_vitest.it)("ignores preloaded routes after the focused index", function () {
+    var state = makeState(["home", "sheet", "preloaded"], 1);
+    var descriptors = makeDescriptors(["home", "sheet", "preloaded"], {
+      home: "card",
+      sheet: "formSheet",
+      preloaded: "card"
+    });
+    var out = (0, import_stackStateUtils.convertStackStateToNonOverlayState)(state, descriptors);
+    (0, import_vitest.expect)(out.routes.map(function (route) {
+      return route.name;
+    })).toEqual(["home"]);
+    (0, import_vitest.expect)(out.index).toBe(0);
+  });
 });
 (0, import_vitest.describe)("findLastNonOverlayIndex", function () {
   (0, import_vitest.it)("returns the highest index that is not an overlay", function () {
@@ -159,5 +172,14 @@ function makeDescriptors(routeNames, presentations) {
     });
     (0, import_vitest.expect)((0, import_stackStateUtils.findLastNonOverlayIndex)(state, descriptors)).toBe(-1);
   });
+  (0, import_vitest.it)("does not treat a preloaded card as focused", function () {
+    var state = makeState(["home", "sheet", "preloaded"], 1);
+    var descriptors = makeDescriptors(["home", "sheet", "preloaded"], {
+      home: "card",
+      sheet: "formSheet",
+      preloaded: "card"
+    });
+    (0, import_vitest.expect)((0, import_stackStateUtils.findLastNonOverlayIndex)(state, descriptors)).toBe(0);
+  });
 });
 //# sourceMappingURL=stackStateUtils.test.native.js.map

package/dist/cjs/router/web/__tests__/stackStateUtils.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["import_vitest","require","import_stackStateUtils","makeState","routeNames","index","routes","map","name","key","params","type","stale","preloadedRoutes","makeDescriptors","presentations","out","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","value","options","presentation","err","return","describe","it","_i","_iter","length","p","expect","isOverlayPresentation","toBe","isTransparentOverlay","state","descriptors","home","detail","filter","convertStackStateToNonOverlayState","r","toEqual"],"sources":["../../../../../src/router/web/__tests__/stackStateUtils.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["import_vitest","require","import_stackStateUtils","makeState","routeNames","index","routes","map","name","key","params","type","stale","retainedRouteKeys","makeDescriptors","presentations","out","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","value","options","presentation","err","return","describe","it","_i","_iter","length","p","expect","isOverlayPresentation","toBe","isTransparentOverlay","state","descriptors","home","detail","filter","convertStackStateToNonOverlayState","r","toEqual","sheet","toHaveLength","preloaded","route","pop","findLastNonOverlayIndex"],"sources":["stackStateUtils.test.native.js"],"sourcesContent":["\"use strict\";\nvar import_vitest = require(\"vitest\");\nvar import_stackStateUtils = require(\"../stackStateUtils\");\nfunction makeState(routeNames, index) {\n  var routes = routeNames.map(function(name) {\n    return {\n      key: `${name}-key`,\n      name,\n      params: void 0\n    };\n  });\n  return {\n    key: \"stack\",\n    index,\n    routeNames,\n    routes,\n    type: \"stack\",\n    stale: false,\n    retainedRouteKeys: []\n  };\n}\nfunction makeDescriptors(routeNames, presentations) {\n  var out = {};\n  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n  try {\n    for (var _iterator = routeNames[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n      var name = _step.value;\n      out[`${name}-key`] = {\n        options: {\n          presentation: presentations[name]\n        }\n      };\n    }\n  } catch (err) {\n    _didIteratorError = true;\n    _iteratorError = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion && _iterator.return != null) {\n        _iterator.return();\n      }\n    } finally {\n      if (_didIteratorError) {\n        throw _iteratorError;\n      }\n    }\n  }\n  return out;\n}\n(0, import_vitest.describe)(\"isOverlayPresentation\", function() {\n  (0, import_vitest.it)(\"returns true for known overlay presentations\", function() {\n    for (var _i = 0, _iter = [\n      \"modal\",\n      \"transparentModal\",\n      \"fullScreenModal\",\n      \"formSheet\",\n      \"pageSheet\",\n      \"containedModal\",\n      \"containedTransparentModal\"\n    ]; _i < _iter.length; _i++) {\n      var p = _iter[_i];\n      (0, import_vitest.expect)((0, import_stackStateUtils.isOverlayPresentation)({\n        presentation: p\n      })).toBe(true);\n    }\n  });\n  (0, import_vitest.it)(\"returns false for card and undefined\", function() {\n    (0, import_vitest.expect)((0, import_stackStateUtils.isOverlayPresentation)({\n      presentation: \"card\"\n    })).toBe(false);\n    (0, import_vitest.expect)((0, import_stackStateUtils.isOverlayPresentation)({})).toBe(false);\n    (0, import_vitest.expect)((0, import_stackStateUtils.isOverlayPresentation)(void 0)).toBe(false);\n    (0, import_vitest.expect)((0, import_stackStateUtils.isOverlayPresentation)(null)).toBe(false);\n  });\n});\n(0, import_vitest.describe)(\"isTransparentOverlay\", function() {\n  (0, import_vitest.it)(\"flags transparent variants only\", function() {\n    (0, import_vitest.expect)((0, import_stackStateUtils.isTransparentOverlay)({\n      presentation: \"transparentModal\"\n    })).toBe(true);\n    (0, import_vitest.expect)((0, import_stackStateUtils.isTransparentOverlay)({\n      presentation: \"containedTransparentModal\"\n    })).toBe(true);\n    (0, import_vitest.expect)((0, import_stackStateUtils.isTransparentOverlay)({\n      presentation: \"modal\"\n    })).toBe(false);\n    (0, import_vitest.expect)((0, import_stackStateUtils.isTransparentOverlay)({\n      presentation: \"formSheet\"\n    })).toBe(false);\n  });\n});\n(0, import_vitest.describe)(\"convertStackStateToNonOverlayState\", function() {\n  (0, import_vitest.it)(\"removes overlay routes and keeps card routes\", function() {\n    var state = makeState([\n      \"home\",\n      \"detail\",\n      \"filter\"\n    ], 2);\n    var descriptors = makeDescriptors([\n      \"home\",\n      \"detail\",\n      \"filter\"\n    ], {\n      home: \"card\",\n      detail: \"card\",\n      filter: \"formSheet\"\n    });\n    var out = (0, import_stackStateUtils.convertStackStateToNonOverlayState)(state, descriptors);\n    (0, import_vitest.expect)(out.routes.map(function(r) {\n      return r.name;\n    })).toEqual([\n      \"home\",\n      \"detail\"\n    ]);\n  });\n  (0, import_vitest.it)(\"falls back to last remaining route when active route was an overlay\", function() {\n    var state = makeState([\n      \"home\",\n      \"detail\",\n      \"filter\"\n    ], 2);\n    var descriptors = makeDescriptors([\n      \"home\",\n      \"detail\",\n      \"filter\"\n    ], {\n      home: \"card\",\n      detail: \"card\",\n      filter: \"formSheet\"\n    });\n    var out = (0, import_stackStateUtils.convertStackStateToNonOverlayState)(state, descriptors);\n    (0, import_vitest.expect)(out.index).toBe(1);\n    (0, import_vitest.expect)(out.routes[out.index].name).toBe(\"detail\");\n  });\n  (0, import_vitest.it)(\"preserves active index when active route is not an overlay\", function() {\n    var state = makeState([\n      \"home\",\n      \"detail\",\n      \"filter\"\n    ], 1);\n    var descriptors = makeDescriptors([\n      \"home\",\n      \"detail\",\n      \"filter\"\n    ], {\n      home: \"card\",\n      detail: \"card\",\n      filter: \"formSheet\"\n    });\n    var out = (0, import_stackStateUtils.convertStackStateToNonOverlayState)(state, descriptors);\n    (0, import_vitest.expect)(out.routes[out.index].name).toBe(\"detail\");\n  });\n  (0, import_vitest.it)(\"does not strip mid-stack overlays (regression: only the trailing overlay suffix is removed)\", function() {\n    var state = makeState([\n      \"home\",\n      \"sheet\",\n      \"detail\"\n    ], 2);\n    var descriptors = makeDescriptors([\n      \"home\",\n      \"sheet\",\n      \"detail\"\n    ], {\n      home: \"card\",\n      sheet: \"formSheet\",\n      detail: \"card\"\n    });\n    var out = (0, import_stackStateUtils.convertStackStateToNonOverlayState)(state, descriptors);\n    (0, import_vitest.expect)(out.routes.map(function(r) {\n      return r.name;\n    })).toEqual([\n      \"home\",\n      \"sheet\",\n      \"detail\"\n    ]);\n    (0, import_vitest.expect)(out.index).toBe(2);\n  });\n  (0, import_vitest.it)(\"handles all-overlay state without crashing\", function() {\n    var state = makeState([\n      \"only-sheet\"\n    ], 0);\n    var descriptors = makeDescriptors([\n      \"only-sheet\"\n    ], {\n      \"only-sheet\": \"formSheet\"\n    });\n    var out = (0, import_stackStateUtils.convertStackStateToNonOverlayState)(state, descriptors);\n    (0, import_vitest.expect)(out.routes).toHaveLength(0);\n    (0, import_vitest.expect)(out.index).toBe(0);\n  });\n  (0, import_vitest.it)(\"ignores preloaded routes after the focused index\", function() {\n    var state = makeState([\n      \"home\",\n      \"sheet\",\n      \"preloaded\"\n    ], 1);\n    var descriptors = makeDescriptors([\n      \"home\",\n      \"sheet\",\n      \"preloaded\"\n    ], {\n      home: \"card\",\n      sheet: \"formSheet\",\n      preloaded: \"card\"\n    });\n    var out = (0, import_stackStateUtils.convertStackStateToNonOverlayState)(state, descriptors);\n    (0, import_vitest.expect)(out.routes.map(function(route) {\n      return route.name;\n    })).toEqual([\n      \"home\"\n    ]);\n    (0, import_vitest.expect)(out.index).toBe(0);\n  });\n});\n(0, import_vitest.describe)(\"findLastNonOverlayIndex\", function() {\n  (0, import_vitest.it)(\"returns the highest index that is not an overlay\", function() {\n    var state = makeState([\n      \"home\",\n      \"detail\",\n      \"filter\",\n      \"pop\"\n    ], 3);\n    var descriptors = makeDescriptors([\n      \"home\",\n      \"detail\",\n      \"filter\",\n      \"pop\"\n    ], {\n      home: \"card\",\n      detail: \"card\",\n      filter: \"formSheet\",\n      pop: \"transparentModal\"\n    });\n    (0, import_vitest.expect)((0, import_stackStateUtils.findLastNonOverlayIndex)(state, descriptors)).toBe(1);\n  });\n  (0, import_vitest.it)(\"returns -1 when every route is an overlay\", function() {\n    var state = makeState([\n      \"sheet\"\n    ], 0);\n    var descriptors = makeDescriptors([\n      \"sheet\"\n    ], {\n      sheet: \"formSheet\"\n    });\n    (0, import_vitest.expect)((0, import_stackStateUtils.findLastNonOverlayIndex)(state, descriptors)).toBe(-1);\n  });\n  (0, import_vitest.it)(\"does not treat a preloaded card as focused\", function() {\n    var state = makeState([\n      \"home\",\n      \"sheet\",\n      \"preloaded\"\n    ], 1);\n    var descriptors = makeDescriptors([\n      \"home\",\n      \"sheet\",\n      \"preloaded\"\n    ], {\n      home: \"card\",\n      sheet: \"formSheet\",\n      preloaded: \"card\"\n    });\n    (0, import_vitest.expect)((0, import_stackStateUtils.findLastNonOverlayIndex)(state, descriptors)).toBe(0);\n  });\n});\n//# sourceMappingURL=stackStateUtils.test.js.map\n"],"mappings":"AAAA,YAAY;;AACZ,IAAIA,aAAa,GAAGC,OAAO,CAAC,QAAQ,CAAC;AACrC,IAAIC,sBAAsB,GAAGD,OAAO,CAAC,8BAAoB,CAAC;AAC1D,SAASE,SAASA,CAACC,UAAU,EAAEC,KAAK,EAAE;EACpC,IAAIC,MAAM,GAAGF,UAAU,CAACG,GAAG,CAAC,UAASC,IAAI,EAAE;IACzC,OAAO;MACLC,GAAG,EAAE,GAAGD,IAAI,MAAM;MAClBA,IAAI;MACJE,MAAM,EAAE,KAAK;IACf,CAAC;EACH,CAAC,CAAC;EACF,OAAO;IACLD,GAAG,EAAE,OAAO;IACZJ,KAAK;IACLD,UAAU;IACVE,MAAM;IACNK,IAAI,EAAE,OAAO;IACbC,KAAK,EAAE,KAAK;IACZC,iBAAiB,EAAE;EACrB,CAAC;AACH;AACA,SAASC,eAAeA,CAACV,UAAU,EAAEW,aAAa,EAAE;EAClD,IAAIC,GAAG,GAAG,CAAC,CAAC;EACZ,IAAIC,yBAAyB,GAAG,IAAI;IAAEC,iBAAiB,GAAG,KAAK;IAAEC,cAAc,GAAG,KAAK,CAAC;EACxF,IAAI;IACF,KAAK,IAAIC,SAAS,GAAGhB,UAAU,CAACiB,MAAM,CAACC,QAAQ,CAAC,CAAC,CAAC,EAAEC,KAAK,EAAE,EAAEN,yBAAyB,GAAG,CAACM,KAAK,GAAGH,SAAS,CAACI,IAAI,CAAC,CAAC,EAAEC,IAAI,CAAC,EAAER,yBAAyB,GAAG,IAAI,EAAE;MAC3J,IAAIT,IAAI,GAAGe,KAAK,CAACG,KAAK;MACtBV,GAAG,CAAC,GAAGR,IAAI,MAAM,CAAC,GAAG;QACnBmB,OAAO,EAAE;UACPC,YAAY,EAAEb,aAAa,CAACP,IAAI;QAClC;MACF,CAAC;IACH;EACF,CAAC,CAAC,OAAOqB,GAAG,EAAE;IACZX,iBAAiB,GAAG,IAAI;IACxBC,cAAc,GAAGU,GAAG;EACtB,CAAC,SAAS;IACR,IAAI;MACF,IAAI,CAACZ,yBAAyB,IAAIG,SAAS,CAACU,MAAM,IAAI,IAAI,EAAE;QAC1DV,SAAS,CAACU,MAAM,CAAC,CAAC;MACpB;IACF,CAAC,SAAS;MACR,IAAIZ,iBAAiB,EAAE;QACrB,MAAMC,cAAc;MACtB;IACF;EACF;EACA,OAAOH,GAAG;AACZ;AACA,CAAC,CAAC,EAAEhB,aAAa,CAAC+B,QAAQ,EAAE,uBAAuB,EAAE,YAAW;EAC9D,CAAC,CAAC,EAAE/B,aAAa,CAACgC,EAAE,EAAE,8CAA8C,EAAE,YAAW;IAC/E,KAAK,IAAIC,EAAE,GAAG,CAAC,EAAEC,KAAK,GAAG,CACvB,OAAO,EACP,kBAAkB,EAClB,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,2BAA2B,CAC5B,EAAED,EAAE,GAAGC,KAAK,CAACC,MAAM,EAAEF,EAAE,EAAE,EAAE;MAC1B,IAAIG,CAAC,GAAGF,KAAK,CAACD,EAAE,CAAC;MACjB,CAAC,CAAC,EAAEjC,aAAa,CAACqC,MAAM,EAAE,CAAC,CAAC,EAAEnC,sBAAsB,CAACoC,qBAAqB,EAAE;QAC1EV,YAAY,EAAEQ;MAChB,CAAC,CAAC,CAAC,CAACG,IAAI,CAAC,IAAI,CAAC;IAChB;EACF,CAAC,CAAC;EACF,CAAC,CAAC,EAAEvC,aAAa,CAACgC,EAAE,EAAE,sCAAsC,EAAE,YAAW;IACvE,CAAC,CAAC,EAAEhC,aAAa,CAACqC,MAAM,EAAE,CAAC,CAAC,EAAEnC,sBAAsB,CAACoC,qBAAqB,EAAE;MAC1EV,YAAY,EAAE;IAChB,CAAC,CAAC,CAAC,CAACW,IAAI,CAAC,KAAK,CAAC;IACf,CAAC,CAAC,EAAEvC,aAAa,CAACqC,MAAM,EAAE,CAAC,CAAC,EAAEnC,sBAAsB,CAACoC,qBAAqB,EAAE,CAAC,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,KAAK,CAAC;IAC5F,CAAC,CAAC,EAAEvC,aAAa,CAACqC,MAAM,EAAE,CAAC,CAAC,EAAEnC,sBAAsB,CAACoC,qBAAqB,EAAE,KAAK,CAAC,CAAC,CAAC,CAACC,IAAI,CAAC,KAAK,CAAC;IAChG,CAAC,CAAC,EAAEvC,aAAa,CAACqC,MAAM,EAAE,CAAC,CAAC,EAAEnC,sBAAsB,CAACoC,qBAAqB,EAAE,IAAI,CAAC,CAAC,CAACC,IAAI,CAAC,KAAK,CAAC;EAChG,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,CAAC,CAAC,EAAEvC,aAAa,CAAC+B,QAAQ,EAAE,sBAAsB,EAAE,YAAW;EAC7D,CAAC,CAAC,EAAE/B,aAAa,CAACgC,EAAE,EAAE,iCAAiC,EAAE,YAAW;IAClE,CAAC,CAAC,EAAEhC,aAAa,CAACqC,MAAM,EAAE,CAAC,CAAC,EAAEnC,sBAAsB,CAACsC,oBAAoB,EAAE;MACzEZ,YAAY,EAAE;IAChB,CAAC,CAAC,CAAC,CAACW,IAAI,CAAC,IAAI,CAAC;IACd,CAAC,CAAC,EAAEvC,aAAa,CAACqC,MAAM,EAAE,CAAC,CAAC,EAAEnC,sBAAsB,CAACsC,oBAAoB,EAAE;MACzEZ,YAAY,EAAE;IAChB,CAAC,CAAC,CAAC,CAACW,IAAI,CAAC,IAAI,CAAC;IACd,CAAC,CAAC,EAAEvC,aAAa,CAACqC,MAAM,EAAE,CAAC,CAAC,EAAEnC,sBAAsB,CAACsC,oBAAoB,EAAE;MACzEZ,YAAY,EAAE;IAChB,CAAC,CAAC,CAAC,CAACW,IAAI,CAAC,KAAK,CAAC;IACf,CAAC,CAAC,EAAEvC,aAAa,CAACqC,MAAM,EAAE,CAAC,CAAC,EAAEnC,sBAAsB,CAACsC,oBAAoB,EAAE;MACzEZ,YAAY,EAAE;IAChB,CAAC,CAAC,CAAC,CAACW,IAAI,CAAC,KAAK,CAAC;EACjB,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,CAAC,CAAC,EAAEvC,aAAa,CAAC+B,QAAQ,EAAE,oCAAoC,EAAE,YAAW;EAC3E,CAAC,CAAC,EAAE/B,aAAa,CAACgC,EAAE,EAAE,8CAA8C,EAAE,YAAW;IAC/E,IAAIS,KAAK,GAAGtC,SAAS,CAAC,CACpB,MAAM,EACN,QAAQ,EACR,QAAQ,CACT,EAAE,CAAC,CAAC;IACL,IAAIuC,WAAW,GAAG5B,eAAe,CAAC,CAChC,MAAM,EACN,QAAQ,EACR,QAAQ,CACT,EAAE;MACD6B,IAAI,EAAE,MAAM;MACZC,MAAM,EAAE,MAAM;MACdC,MAAM,EAAE;IACV,CAAC,CAAC;IACF,IAAI7B,GAAG,GAAG,CAAC,CAAC,EAAEd,sBAAsB,CAAC4C,kCAAkC,EAAEL,KAAK,EAAEC,WAAW,CAAC;IAC5F,CAAC,CAAC,EAAE1C,aAAa,CAACqC,MAAM,EAAErB,GAAG,CAACV,MAAM,CAACC,GAAG,CAAC,UAASwC,CAAC,EAAE;MACnD,OAAOA,CAAC,CAACvC,IAAI;IACf,CAAC,CAAC,CAAC,CAACwC,OAAO,CAAC,CACV,MAAM,EACN,QAAQ,CACT,CAAC;EACJ,CAAC,CAAC;EACF,CAAC,CAAC,EAAEhD,aAAa,CAACgC,EAAE,EAAE,qEAAqE,EAAE,YAAW;IACtG,IAAIS,KAAK,GAAGtC,SAAS,CAAC,CACpB,MAAM,EACN,QAAQ,EACR,QAAQ,CACT,EAAE,CAAC,CAAC;IACL,IAAIuC,WAAW,GAAG5B,eAAe,CAAC,CAChC,MAAM,EACN,QAAQ,EACR,QAAQ,CACT,EAAE;MACD6B,IAAI,EAAE,MAAM;MACZC,MAAM,EAAE,MAAM;MACdC,MAAM,EAAE;IACV,CAAC,CAAC;IACF,IAAI7B,GAAG,GAAG,CAAC,CAAC,EAAEd,sBAAsB,CAAC4C,kCAAkC,EAAEL,KAAK,EAAEC,WAAW,CAAC;IAC5F,CAAC,CAAC,EAAE1C,aAAa,CAACqC,MAAM,EAAErB,GAAG,CAACX,KAAK,CAAC,CAACkC,IAAI,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,EAAEvC,aAAa,CAACqC,MAAM,EAAErB,GAAG,CAACV,MAAM,CAACU,GAAG,CAACX,KAAK,CAAC,CAACG,IAAI,CAAC,CAAC+B,IAAI,CAAC,QAAQ,CAAC;EACtE,CAAC,CAAC;EACF,CAAC,CAAC,EAAEvC,aAAa,CAACgC,EAAE,EAAE,4DAA4D,EAAE,YAAW;IAC7F,IAAIS,KAAK,GAAGtC,SAAS,CAAC,CACpB,MAAM,EACN,QAAQ,EACR,QAAQ,CACT,EAAE,CAAC,CAAC;IACL,IAAIuC,WAAW,GAAG5B,eAAe,CAAC,CAChC,MAAM,EACN,QAAQ,EACR,QAAQ,CACT,EAAE;MACD6B,IAAI,EAAE,MAAM;MACZC,MAAM,EAAE,MAAM;MACdC,MAAM,EAAE;IACV,CAAC,CAAC;IACF,IAAI7B,GAAG,GAAG,CAAC,CAAC,EAAEd,sBAAsB,CAAC4C,kCAAkC,EAAEL,KAAK,EAAEC,WAAW,CAAC;IAC5F,CAAC,CAAC,EAAE1C,aAAa,CAACqC,MAAM,EAAErB,GAAG,CAACV,MAAM,CAACU,GAAG,CAACX,KAAK,CAAC,CAACG,IAAI,CAAC,CAAC+B,IAAI,CAAC,QAAQ,CAAC;EACtE,CAAC,CAAC;EACF,CAAC,CAAC,EAAEvC,aAAa,CAACgC,EAAE,EAAE,6FAA6F,EAAE,YAAW;IAC9H,IAAIS,KAAK,GAAGtC,SAAS,CAAC,CACpB,MAAM,EACN,OAAO,EACP,QAAQ,CACT,EAAE,CAAC,CAAC;IACL,IAAIuC,WAAW,GAAG5B,eAAe,CAAC,CAChC,MAAM,EACN,OAAO,EACP,QAAQ,CACT,EAAE;MACD6B,IAAI,EAAE,MAAM;MACZM,KAAK,EAAE,WAAW;MAClBL,MAAM,EAAE;IACV,CAAC,CAAC;IACF,IAAI5B,GAAG,GAAG,CAAC,CAAC,EAAEd,sBAAsB,CAAC4C,kCAAkC,EAAEL,KAAK,EAAEC,WAAW,CAAC;IAC5F,CAAC,CAAC,EAAE1C,aAAa,CAACqC,MAAM,EAAErB,GAAG,CAACV,MAAM,CAACC,GAAG,CAAC,UAASwC,CAAC,EAAE;MACnD,OAAOA,CAAC,CAACvC,IAAI;IACf,CAAC,CAAC,CAAC,CAACwC,OAAO,CAAC,CACV,MAAM,EACN,OAAO,EACP,QAAQ,CACT,CAAC;IACF,CAAC,CAAC,EAAEhD,aAAa,CAACqC,MAAM,EAAErB,GAAG,CAACX,KAAK,CAAC,CAACkC,IAAI,CAAC,CAAC,CAAC;EAC9C,CAAC,CAAC;EACF,CAAC,CAAC,EAAEvC,aAAa,CAACgC,EAAE,EAAE,4CAA4C,EAAE,YAAW;IAC7E,IAAIS,KAAK,GAAGtC,SAAS,CAAC,CACpB,YAAY,CACb,EAAE,CAAC,CAAC;IACL,IAAIuC,WAAW,GAAG5B,eAAe,CAAC,CAChC,YAAY,CACb,EAAE;MACD,YAAY,EAAE;IAChB,CAAC,CAAC;IACF,IAAIE,GAAG,GAAG,CAAC,CAAC,EAAEd,sBAAsB,CAAC4C,kCAAkC,EAAEL,KAAK,EAAEC,WAAW,CAAC;IAC5F,CAAC,CAAC,EAAE1C,aAAa,CAACqC,MAAM,EAAErB,GAAG,CAACV,MAAM,CAAC,CAAC4C,YAAY,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,EAAElD,aAAa,CAACqC,MAAM,EAAErB,GAAG,CAACX,KAAK,CAAC,CAACkC,IAAI,CAAC,CAAC,CAAC;EAC9C,CAAC,CAAC;EACF,CAAC,CAAC,EAAEvC,aAAa,CAACgC,EAAE,EAAE,kDAAkD,EAAE,YAAW;IACnF,IAAIS,KAAK,GAAGtC,SAAS,CAAC,CACpB,MAAM,EACN,OAAO,EACP,WAAW,CACZ,EAAE,CAAC,CAAC;IACL,IAAIuC,WAAW,GAAG5B,eAAe,CAAC,CAChC,MAAM,EACN,OAAO,EACP,WAAW,CACZ,EAAE;MACD6B,IAAI,EAAE,MAAM;MACZM,KAAK,EAAE,WAAW;MAClBE,SAAS,EAAE;IACb,CAAC,CAAC;IACF,IAAInC,GAAG,GAAG,CAAC,CAAC,EAAEd,sBAAsB,CAAC4C,kCAAkC,EAAEL,KAAK,EAAEC,WAAW,CAAC;IAC5F,CAAC,CAAC,EAAE1C,aAAa,CAACqC,MAAM,EAAErB,GAAG,CAACV,MAAM,CAACC,GAAG,CAAC,UAAS6C,KAAK,EAAE;MACvD,OAAOA,KAAK,CAAC5C,IAAI;IACnB,CAAC,CAAC,CAAC,CAACwC,OAAO,CAAC,CACV,MAAM,CACP,CAAC;IACF,CAAC,CAAC,EAAEhD,aAAa,CAACqC,MAAM,EAAErB,GAAG,CAACX,KAAK,CAAC,CAACkC,IAAI,CAAC,CAAC,CAAC;EAC9C,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,CAAC,CAAC,EAAEvC,aAAa,CAAC+B,QAAQ,EAAE,yBAAyB,EAAE,YAAW;EAChE,CAAC,CAAC,EAAE/B,aAAa,CAACgC,EAAE,EAAE,kDAAkD,EAAE,YAAW;IACnF,IAAIS,KAAK,GAAGtC,SAAS,CAAC,CACpB,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,KAAK,CACN,EAAE,CAAC,CAAC;IACL,IAAIuC,WAAW,GAAG5B,eAAe,CAAC,CAChC,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,KAAK,CACN,EAAE;MACD6B,IAAI,EAAE,MAAM;MACZC,MAAM,EAAE,MAAM;MACdC,MAAM,EAAE,WAAW;MACnBQ,GAAG,EAAE;IACP,CAAC,CAAC;IACF,CAAC,CAAC,EAAErD,aAAa,CAACqC,MAAM,EAAE,CAAC,CAAC,EAAEnC,sBAAsB,CAACoD,uBAAuB,EAAEb,KAAK,EAAEC,WAAW,CAAC,CAAC,CAACH,IAAI,CAAC,CAAC,CAAC;EAC5G,CAAC,CAAC;EACF,CAAC,CAAC,EAAEvC,aAAa,CAACgC,EAAE,EAAE,2CAA2C,EAAE,YAAW;IAC5E,IAAIS,KAAK,GAAGtC,SAAS,CAAC,CACpB,OAAO,CACR,EAAE,CAAC,CAAC;IACL,IAAIuC,WAAW,GAAG5B,eAAe,CAAC,CAChC,OAAO,CACR,EAAE;MACDmC,KAAK,EAAE;IACT,CAAC,CAAC;IACF,CAAC,CAAC,EAAEjD,aAAa,CAACqC,MAAM,EAAE,CAAC,CAAC,EAAEnC,sBAAsB,CAACoD,uBAAuB,EAAEb,KAAK,EAAEC,WAAW,CAAC,CAAC,CAACH,IAAI,CAAC,CAAC,CAAC,CAAC;EAC7G,CAAC,CAAC;EACF,CAAC,CAAC,EAAEvC,aAAa,CAACgC,EAAE,EAAE,4CAA4C,EAAE,YAAW;IAC7E,IAAIS,KAAK,GAAGtC,SAAS,CAAC,CACpB,MAAM,EACN,OAAO,EACP,WAAW,CACZ,EAAE,CAAC,CAAC;IACL,IAAIuC,WAAW,GAAG5B,eAAe,CAAC,CAChC,MAAM,EACN,OAAO,EACP,WAAW,CACZ,EAAE;MACD6B,IAAI,EAAE,MAAM;MACZM,KAAK,EAAE,WAAW;MAClBE,SAAS,EAAE;IACb,CAAC,CAAC;IACF,CAAC,CAAC,EAAEnD,aAAa,CAACqC,MAAM,EAAE,CAAC,CAAC,EAAEnC,sBAAsB,CAACoD,uBAAuB,EAAEb,KAAK,EAAEC,WAAW,CAAC,CAAC,CAACH,IAAI,CAAC,CAAC,CAAC;EAC5G,CAAC,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}

package/dist/cjs/router/web/stackStateUtils.cjs

@@ -51,7 +51,7 @@ function convertStackStateToNonOverlayState(state, descriptors, isOverlay = isOv
   };
 }
 function findLastNonOverlayIndex(state, descriptors, isOverlay = isOverlayPresentation) {
-  for (let i = state.routes.length - 1; i >= 0; i--) {
+  for (let i = state.index; i >= 0; i--) {
     if (!isOverlay(descriptors[state.routes[i].key]?.options)) {
       return i;
     }

package/dist/cjs/router/web/stackStateUtils.native.js

@@ -55,7 +55,7 @@ function convertStackStateToNonOverlayState(state, descriptors) {
 }
 function findLastNonOverlayIndex(state, descriptors) {
   var isOverlay = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : isOverlayPresentation;
-  for (var i = state.routes.length - 1; i >= 0; i--) {
+  for (var i = state.index; i >= 0; i--) {
     var _descriptors_state_routes_i_key;
     if (!isOverlay((_descriptors_state_routes_i_key = descriptors[state.routes[i].key]) === null || _descriptors_state_routes_i_key === void 0 ? void 0 : _descriptors_state_routes_i_key.options)) {
       return i;