one 1.26.0 → 2.0.0-beta.33.1

package/dist/esm/router/Route.native.js

@@ -8,13 +8,18 @@ import { getPathWithRecoveredDynamicSegment } from "./path.native.js";
 import { routeInfo } from "./router.native.js";
 import { RouteInfoContextProvider } from "./RouteInfoContext.native.js";
 var RouteParamsContext = /* @__PURE__ */createContext({});
-var CurrentRouteContext = /* @__PURE__ */React.createContext(null);
+var CurrentRouteContext = /* @__PURE__ */React.createContext([]);
 var SuspenseFallbackContext = /* @__PURE__ */createContext(void 0);
 if (process.env.NODE_ENV !== "production") {
   CurrentRouteContext.displayName = "RouteNode";
   SuspenseFallbackContext.displayName = "SuspenseFallback";
 }
 function useRouteNode() {
+  var _nodes_;
+  var nodes = useContext(CurrentRouteContext);
+  return (_nodes_ = nodes[nodes.length - 1]) !== null && _nodes_ !== void 0 ? _nodes_ : null;
+}
+function useRouteNodes() {
   return useContext(CurrentRouteContext);
 }
 function useContextKey() {
@@ -41,6 +46,10 @@ function Route(param) {
     route
   } = param;
   var parentParams = useContext(RouteParamsContext);
+  var parentRouteNodes = useContext(CurrentRouteContext);
+  var routeNodes = React.useMemo(function () {
+    return [...parentRouteNodes, node];
+  }, [node, parentRouteNodes]);
   var resolvedParams = React.useMemo(function () {
     var _node_dynamic;
     var rp = route === null || route === void 0 ? void 0 : route.params;
@@ -55,12 +64,12 @@ function Route(param) {
   return /* @__PURE__ */_jsx(RouteParamsContext.Provider, {
     value: resolvedParams,
     children: /* @__PURE__ */_jsx(CurrentRouteContext.Provider, {
-      value: node,
+      value: routeNodes,
       children: /* @__PURE__ */_jsx(RouteInfoContextProvider, {
         children
       })
     })
   });
 }
-export { Route, RouteParamsContext, SuspenseFallbackContext, useContextKey, useRouteNode };
+export { Route, RouteParamsContext, SuspenseFallbackContext, useContextKey, useRouteNode, useRouteNodes };
 //# sourceMappingURL=Route.native.js.map

package/dist/esm/router/Route.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["jsx","_jsx","React","createContext","useContext","findFocusedRoute","getResolvedLinking","getContextKey","mergeDynamicParams","getPathWithRecoveredDynamicSegment","routeInfo","RouteInfoContextProvider","RouteParamsContext","CurrentRouteContext","SuspenseFallbackContext","process","env","NODE_ENV","displayName","useRouteNode","useContextKey","node","Error","contextKey","getParamsFromCurrentUrl","route","linking","getStateFromPath","path","unstable_globalHref","state","config","focused","params","Route","param","children","parentParams","resolvedParams","useMemo","_node_dynamic","rp","ownParams","dynamic","length"],"sources":["../../../src/router/Route.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAAOA,GAAA,IAASC,IAAA,2BAA+B;AAC/C,OAAAC,KAAS,IAAAC,aAAA,EAAAC,UAAwB;AAMjC,SAASC,gBAAA,4CAA0B;AACnC,SAASC,kBAAA,QAAqB;AAC9B,SAASC,aAAA,8BAA0B;AACnC,SAASC,kBAAA;AACT,SAASC,kCAAiB;AAC1B,SAASC,SAAA;AA0MD,SAAAC,wBAAA;AA5FD,IAAAC,kBAAM,kBAEXT,aAAE;AAEJ,IAAAU,mBAAM,kBAA4BX,KAAA,CAAgCC,aAAI;AAG/D,IAAAW,uBAAM,kBAEXX,aAAS;AAEX,IAAIY,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,cAAc;EACzCJ,mBAAA,CAAoBK,WAAA,GAAc;EAClCJ,uBAAA,CAAwBI,WAAA,GAAc;AACxC;AAGO,SAASC,aAAA,EAAiC;EAC/C,OAAOf,UAAA,CAAWS,mBAAmB;AACvC;AAEO,SAASO,cAAA,EAAwB;EACtC,IAAAC,IAAM,GAAAF,YAAO;EACb,IAAIE,IAAA,IAAQ,MAAM;IAChB,MAAM,IAAIC,KAAA,CAAM,oDAAoD;EACtE;EACA,OAAOf,aAAA,CAAcc,IAAA,CAAKE,UAAU;AACtC;AAWA,SAASC,wBAAwBC,KAAA,EAGG;EAClC,IAAAC,OAAM,GAAApB,kBAAU;EAChB,IAAI,EAACoB,OAAA,KAAS,QAAAA,OAAkB,UAAO,aAAAA,OAAA,CAAAC,gBAAA;EACvC,IAAAC,IAAM,GAAAnB,kCAAO,EACXC,SAAA,KAAW,QAAAA,SAAA,uBAAAA,SAAA,CAAAmB,mBAAA,EACXJ,KAAA,KAAO,QAAAA,KAAA,uBAAAA,KAAA,CAAAG,IAAA,CACR;EACD,IAAI,CAACA,IAAA,EAAM,OAAO;EAClB,IAAAE,KAAM,GAAAJ,OAAQ,CAAAC,gBAAQ,CAAAC,IAAiB,EAAAF,OAAM,CAAAK,MAAQ;EACrD,IAAI,CAACD,KAAA,EAAO,OAAO;EACnB,IAAAE,OAAM,GAAA3B,gBAAU,CAAAyB,KAAiB;EACjC,OAAOE,OAAA,KAAS,QAAAA,OAAA,uBAAAA,OAAA,CAAAC,MAAA;AAClB;AAGO,SAASC,MAAMC,KAAA;EACpB;IAAAC,QAAA;IAAAf,IAAA;IAAAI;EAAA,IAAAU,KAAA;EACA,IAAAE,YAAA,GAAAjC,UAAA,CAAAQ,kBAAA;EACA,IAAA0B,cAAA,GAAApC,KAAA,CAAAqC,OAAA;IAQC,IAAAC,aAAA;IACD,IAAMC,EAAA,GAAAhB,KAAA,KAAe,QAAAA,KAAW,mBAAkB,IAAAA,KAAA,CAAAQ,MAAA;IAUlD,IAAMS,SAAA,KAAAF,aAAuB,GAAAnB,IAAQ,CAAAsB,OAAM,cAAAH,aAAA,uBAAAA,aAAA,CAAAI,MAAA,IAAApC,kBAAA,CAAAiC,EAAA,EAAApB,IAAA,CAAAsB,OAAA,EAAAnB,uBAAA,CAAAC,KAAA,KAAAgB,EAAA;IACzC,KAAAJ,YAAW,EAAO,OAAAK,SAAA;IAClB,KAAAA,SAAM,SAAiBL,YAAS;IAIhC,OAAK;MACL,GAAKA,YAAW;MAChB,GAAAK;IACF,CAAG;EAEH,IAOFrB,IAAA,E","ignoreList":[]}
+{"version":3,"names":["jsx","_jsx","React","createContext","useContext","findFocusedRoute","getResolvedLinking","getContextKey","mergeDynamicParams","getPathWithRecoveredDynamicSegment","routeInfo","RouteInfoContextProvider","RouteParamsContext","CurrentRouteContext","SuspenseFallbackContext","process","env","NODE_ENV","displayName","useRouteNode","_nodes_","nodes","length","useRouteNodes","useContextKey","node","Error","contextKey","getParamsFromCurrentUrl","route","linking","getStateFromPath","path","unstable_globalHref","state","config","focused","params","Route","param","children","parentParams","parentRouteNodes","routeNodes","useMemo","resolvedParams","_node_dynamic","rp","ownParams","dynamic"],"sources":["../../../src/router/Route.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAAOA,GAAA,IAASC,IAAA,2BAA+B;AAC/C,OAAAC,KAAS,IAAAC,aAAA,EAAAC,UAAwB;AAMjC,SAASC,gBAAA,4CAA0B;AACnC,SAASC,kBAAA,QAAqB;AAC9B,SAASC,aAAA,8BAA0B;AACnC,SAASC,kBAAA;AACT,SAASC,kCAAiB;AAC1B,SAASC,SAAA;AAoND,SAAAC,wBAAA;AAtGD,IAAAC,kBAAM,kBAEXT,aAAE;AAEJ,IAAAU,mBAAM,kBAA4BX,KAAA,CAA2BC,aAAE;AAGxD,IAAAW,uBAAM,kBAEXX,aAAS;AAEX,IAAIY,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,cAAc;EACzCJ,mBAAA,CAAoBK,WAAA,GAAc;EAClCJ,uBAAA,CAAwBI,WAAA,GAAc;AACxC;AAGO,SAASC,aAAA,EAAiC;EAC/C,IAAAC,OAAM;EACN,IAAAC,KAAO,GAAAjB,UAAY,CAAAS,mBAAe;EACpC,QAAAO,OAAA,GAAAC,KAAA,CAAAA,KAAA,CAAAC,MAAA,mBAAAF,OAAA,cAAAA,OAAA;AAEO;AACL,SAAOG,aAAWA,CAAA;EACpB,OAAAnB,UAAA,CAAAS,mBAAA;AAEO;AACL,SAAMW,aAAOA,CAAA;EACb,IAAIC,IAAA,GAAAN,YAAc;EAChB,IAAAM,IAAM,IAAI,MAAM;IAClB,UAAAC,KAAA;EACA;EACF,OAAAnB,aAAA,CAAAkB,IAAA,CAAAE,UAAA;AAWA;AAIE,SAAMC,uBAAUA,CAAAC,KAAmB;EACnC,IAAIC,OAAC,GAASxB,kBAAkB;EAChC,MAAMwB,OAAO,aAAAA,OAAA,mBAAmC,IAAAA,OAAA,CAAAC,gBAAA;EAAA,IAC9CC,IAAA,GAAAvB,kCAAW,EACXC,SAAO,aAAAA,SAAA,uBAAAA,SAAA,CAAAuB,mBAAA,EACRJ,KAAA,aAAAA,KAAA,uBAAAA,KAAA,CAAAG,IAAA,CACD;EACA,KAAAA,IAAM,SAAQ,KAAQ;EACtB,IAAIE,KAAC,GAAOJ,OAAO,CAAAC,gBAAA,CAAAC,IAAA,EAAAF,OAAA,CAAAK,MAAA;EACnB,KAAAD,KAAM,SAAU;EAChB,IAAAE,OAAO,GAAA/B,gBAAS,CAAA6B,KAAA;EAClB,OAAAE,OAAA,aAAAA,OAAA,uBAAAA,OAAA,CAAAC,MAAA;AAGO;AAAe,SACpBC,MAAAC,KAAA;EACA;IAAAC,QAAA;IAAAf,IAAA;IAAAI;EAAA,IAAAU,KAAA;EACA,IAAAE,YAAA,GAAArC,UAAA,CAAAQ,kBAAA;EACF,IAOG8B,gBAAA,GAAAtC,UAAA,CAAAS,mBAAA;EACD,IAAA8B,UAAM,GAAAzC,KAAe,CAAA0C,OAAA,aAAW;IAChC,OAAM,CACN,GAAMF,gBAAa,EACjBjB,IAAM,CACL;EACH,IAUAA,IAAM,EACJiB,gBAAW,CACX;EAIA,IAAAG,cAAK,GAAc3C,KAAA,CAAA0C,OAAO;IAC1B,IAAIE,aAAY;IAChB,IAAAC,EAAA,GAASlB,KAAG,aAAcA,KAAG,UAAU,aAAAA,KAAA,CAAAQ,MAAA;IACzC,IAAIW,SAAM,KAAAF,aAAqB,GAAArB,IAAA,CAAAwB,OAAW,cAAoBH,aAAA,uBAAAA,aAAA,CAAAxB,MAAA,IAAAd,kBAAA,CAAAuC,EAAA,EAAAtB,IAAA,CAAAwB,OAAA,EAAArB,uBAAA,CAAAC,KAAA,KAAAkB,EAAA;IAE9D,KACEN,YAAA,SAACO,SAAA;IAML,KAAAA,SAAA,SAAAP,YAAA","ignoreList":[]}

package/dist/esm/router/findRouteNode.mjs

@@ -1,8 +1,9 @@
+import { getReactNavigationRouteName } from "../getReactNavigationConfig.mjs";
 function findRouteNodeFromState(state, rootNode) {
   if (!state || !state.routes || !rootNode) {
     return null;
   }
-  const currentRoute = state.routes[state.routes.length - 1];
+  const currentRoute = state.routes[state.index ?? state.routes.length - 1];
   if (!currentRoute) {
     return null;
   }
@@ -19,7 +20,7 @@ function findRouteNodeFromState(state, rootNode) {
   return matchingNode;
 }
 function findNodeByRouteName(node, routeName) {
-  if (node.route === routeName) {
+  if (getReactNavigationRouteName(node) === routeName) {
     return node;
   }
   for (const child of node.children) {
@@ -35,13 +36,12 @@ function extractParamsFromState(state) {
     return {};
   }
   const params = {};
-  for (const route of state.routes) {
-    if (route.params) {
-      Object.assign(params, route.params);
-    }
-    if (route.state) {
-      Object.assign(params, extractParamsFromState(route.state));
-    }
+  const route = state.routes[state.index ?? state.routes.length - 1];
+  if (route?.params) {
+    Object.assign(params, route.params);
+  }
+  if (route?.state) {
+    Object.assign(params, extractParamsFromState(route.state));
   }
   return params;
 }
@@ -82,7 +82,7 @@ function findAllRouteNodesFromState(state, rootNode) {
     if (!currentState || !currentState.routes || !parentNode) {
       return;
     }
-    const currentRoute = currentState.routes[currentState.routes.length - 1];
+    const currentRoute = currentState.routes[currentState.index ?? currentState.routes.length - 1];
     if (!currentRoute) {
       return;
     }

package/dist/esm/router/findRouteNode.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["findRouteNodeFromState","state","rootNode","routes","currentRoute","length","matchingNode","findNodeByRouteName","name","nestedResult","node","routeName","route","child","children","found","extractParamsFromState","params","Object","assign","extractSearchFromHref","href","searchIndex","indexOf","searchString","slice","searchParams","URLSearchParams","forEach","value","key","existing","Array","isArray","push","extractPathnameFromHref","hashIndex","endIndex","Math","min","findAllRouteNodesFromState","nodes","collectNodes","currentState","parentNode","process","env","NODE_ENV","console","log","screen","childRouteName","childNode","find","c"],"sources":["../../../src/router/findRouteNode.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getReactNavigationRouteName","findRouteNodeFromState","state","rootNode","routes","currentRoute","index","length","matchingNode","findNodeByRouteName","name","nestedResult","node","routeName","child","children","found","extractParamsFromState","params","route","Object","assign","extractSearchFromHref","href","searchIndex","indexOf","searchString","slice","searchParams","URLSearchParams","forEach","value","key","existing","Array","isArray","push","extractPathnameFromHref","hashIndex","endIndex","Math","min","findAllRouteNodesFromState","nodes","collectNodes","currentState","parentNode","process","env","NODE_ENV","console","log","screen","childRouteName","childNode","find","c"],"sources":["../../../src/router/findRouteNode.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/router/findRouteNode.native.js

@@ -1,8 +1,10 @@
+import { getReactNavigationRouteName } from "../getReactNavigationConfig.native.js";
 function findRouteNodeFromState(state, rootNode) {
+  var _state_index;
   if (!state || !state.routes || !rootNode) {
     return null;
   }
-  var currentRoute = state.routes[state.routes.length - 1];
+  var currentRoute = state.routes[(_state_index = state.index) !== null && _state_index !== void 0 ? _state_index : state.routes.length - 1];
   if (!currentRoute) {
     return null;
   }
@@ -19,7 +21,7 @@ function findRouteNodeFromState(state, rootNode) {
   return matchingNode;
 }
 function findNodeByRouteName(node, routeName) {
-  if (node.route === routeName) {
+  if (getReactNavigationRouteName(node) === routeName) {
     return node;
   }
   var _iteratorNormalCompletion = true,
@@ -50,36 +52,17 @@ function findNodeByRouteName(node, routeName) {
   return null;
 }
 function extractParamsFromState(state) {
+  var _state_index;
   if (!state || !state.routes) {
     return {};
   }
   var params = {};
-  var _iteratorNormalCompletion = true,
-    _didIteratorError = false,
-    _iteratorError = void 0;
-  try {
-    for (var _iterator = state.routes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-      var route = _step.value;
-      if (route.params) {
-        Object.assign(params, route.params);
-      }
-      if (route.state) {
-        Object.assign(params, extractParamsFromState(route.state));
-      }
-    }
-  } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
+  var route = state.routes[(_state_index = state.index) !== null && _state_index !== void 0 ? _state_index : state.routes.length - 1];
+  if (route === null || route === void 0 ? void 0 : route.params) {
+    Object.assign(params, route.params);
+  }
+  if (route === null || route === void 0 ? void 0 : route.state) {
+    Object.assign(params, extractParamsFromState(route.state));
   }
   return params;
 }
@@ -117,11 +100,12 @@ function findAllRouteNodesFromState(state, rootNode) {
   }
   var nodes = [];
   function collectNodes(currentState, parentNode) {
+    var _currentState_index;
     var _currentRoute_params;
     if (!currentState || !currentState.routes || !parentNode) {
       return;
     }
-    var currentRoute = currentState.routes[currentState.routes.length - 1];
+    var currentRoute = currentState.routes[(_currentState_index = currentState.index) !== null && _currentState_index !== void 0 ? _currentState_index : currentState.routes.length - 1];
     if (!currentRoute) {
       return;
     }

package/dist/esm/router/findRouteNode.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["findRouteNodeFromState","state","rootNode","routes","currentRoute","length","matchingNode","findNodeByRouteName","name","nestedResult","node","routeName","route","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","children","Symbol","iterator","_step","next","done","child","value","found","err","return","extractParamsFromState","params","Object","assign","extractSearchFromHref","href","searchIndex","indexOf","searchString","slice","searchParams","URLSearchParams","forEach","key","existing","Array","isArray","push","extractPathnameFromHref","hashIndex","endIndex","Math","min","findAllRouteNodesFromState","nodes","collectNodes","currentState","parentNode","_currentRoute_params"],"sources":["../../../src/router/findRouteNode.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getReactNavigationRouteName","findRouteNodeFromState","state","rootNode","_state_index","routes","currentRoute","index","length","matchingNode","findNodeByRouteName","name","nestedResult","node","routeName","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","children","Symbol","iterator","_step","next","done","child","value","found","err","return","extractParamsFromState","params","route","Object","assign","extractSearchFromHref","href","searchIndex","indexOf","searchString","slice","searchParams","URLSearchParams","forEach","key","existing","Array","isArray","push","extractPathnameFromHref","hashIndex","endIndex","Math","min","findAllRouteNodesFromState","nodes","collectNodes","currentState","parentNode","_currentState_index","_currentRoute_params","process","env","NODE_ENV","console","log"],"sources":["../../../src/router/findRouteNode.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/router/findRouteNode.test.mjs

@@ -0,0 +1,89 @@
+import { describe, expect, it } from "vitest";
+import { getReactNavigationRouteName, resolveInitialRouteNameFromState } from "../getReactNavigationConfig.mjs";
+import { extractParamsFromState, findAllRouteNodesFromState, findRouteNodeFromState } from "./findRouteNode.mjs";
+import { resolveParentRouteName } from "./useNavigation.mjs";
+function node(route, contextKey, children = []) {
+  return {
+    type: children.length ? "layout" : "spa",
+    loadRoute: () => ({}),
+    children,
+    dynamic: null,
+    route,
+    contextKey
+  };
+}
+describe("focused route state", () => {
+  const current = node("index", "./index/index.tsx");
+  const preloaded = node("detail", "./index/detail.tsx");
+  const layout = node("index", "./index/_layout.tsx", [current, preloaded]);
+  const root = node("", "./_layout.tsx", [layout]);
+  const state = {
+    index: 0,
+    routes: [{
+      name: getReactNavigationRouteName(layout),
+      params: {
+        layout: "active"
+      },
+      state: {
+        index: 0,
+        routes: [{
+          name: "index",
+          params: {
+            page: "current"
+          }
+        }, {
+          name: "detail",
+          params: {
+            page: "preloaded"
+          }
+        }]
+      }
+    }, {
+      name: "other",
+      params: {
+        root: "preloaded"
+      }
+    }]
+  };
+  it("finds the focused node through an internal layout name", () => {
+    expect(findRouteNodeFromState(state, root)).toBe(current);
+    expect(findAllRouteNodesFromState(state, root)).toEqual([layout, current]);
+  });
+  it("collects params only from the focused route chain", () => {
+    expect(extractParamsFromState(state)).toEqual({
+      layout: "active",
+      page: "current"
+    });
+  });
+});
+describe("filesystem paths at React Navigation boundaries", () => {
+  const detail = node("detail", "./index/detail.tsx");
+  const index = node("index", "./index/index.tsx");
+  const collidingLayout = node("index", "./index/_layout.tsx", [index, detail]);
+  const root = node("", "./_layout.tsx", [collidingLayout]);
+  it("resolves absolute and relative parent paths to aliased screen names", () => {
+    const routeNodes = [root, collidingLayout, detail];
+    const routeName = getReactNavigationRouteName(collidingLayout);
+    expect(resolveParentRouteName(routeNodes, "/index/detail", "/index")).toBe(routeName);
+    expect(resolveParentRouteName(routeNodes, "/index/detail", "../")).toBe(routeName);
+    expect(resolveParentRouteName(routeNodes, "/index/detail", "/")).toBe("");
+  });
+  it("uses aliased layout names while resolving a late-mounted child", () => {
+    const state = {
+      index: 0,
+      routes: [{
+        name: getReactNavigationRouteName(collidingLayout),
+        state: {
+          index: 1,
+          routes: [{
+            name: "index"
+          }, {
+            name: "detail"
+          }]
+        }
+      }]
+    };
+    expect(resolveInitialRouteNameFromState("/index", state)).toBe("detail");
+  });
+});
+//# sourceMappingURL=findRouteNode.test.mjs.map

package/dist/esm/router/findRouteNode.test.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["describe","expect","it","getReactNavigationRouteName","resolveInitialRouteNameFromState","extractParamsFromState","findAllRouteNodesFromState","findRouteNodeFromState","resolveParentRouteName","node","route","contextKey","children","type","length","loadRoute","dynamic","current","preloaded","layout","root","state","index","routes","name","params","page","toBe","toEqual","detail","collidingLayout","routeNodes","routeName"],"sources":["../../../src/router/findRouteNode.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/router/findRouteNode.test.native.js

@@ -0,0 +1,92 @@
+import { describe, expect, it } from "vitest";
+import { getReactNavigationRouteName, resolveInitialRouteNameFromState } from "../getReactNavigationConfig.native.js";
+import { extractParamsFromState, findAllRouteNodesFromState, findRouteNodeFromState } from "./findRouteNode.native.js";
+import { resolveParentRouteName } from "./useNavigation.native.js";
+function node(route, contextKey) {
+  var children = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : [];
+  return {
+    type: children.length ? "layout" : "spa",
+    loadRoute: function () {
+      return {};
+    },
+    children,
+    dynamic: null,
+    route,
+    contextKey
+  };
+}
+describe("focused route state", function () {
+  var current = node("index", "./index/index.tsx");
+  var preloaded = node("detail", "./index/detail.tsx");
+  var layout = node("index", "./index/_layout.tsx", [current, preloaded]);
+  var root = node("", "./_layout.tsx", [layout]);
+  var state = {
+    index: 0,
+    routes: [{
+      name: getReactNavigationRouteName(layout),
+      params: {
+        layout: "active"
+      },
+      state: {
+        index: 0,
+        routes: [{
+          name: "index",
+          params: {
+            page: "current"
+          }
+        }, {
+          name: "detail",
+          params: {
+            page: "preloaded"
+          }
+        }]
+      }
+    }, {
+      name: "other",
+      params: {
+        root: "preloaded"
+      }
+    }]
+  };
+  it("finds the focused node through an internal layout name", function () {
+    expect(findRouteNodeFromState(state, root)).toBe(current);
+    expect(findAllRouteNodesFromState(state, root)).toEqual([layout, current]);
+  });
+  it("collects params only from the focused route chain", function () {
+    expect(extractParamsFromState(state)).toEqual({
+      layout: "active",
+      page: "current"
+    });
+  });
+});
+describe("filesystem paths at React Navigation boundaries", function () {
+  var detail = node("detail", "./index/detail.tsx");
+  var index = node("index", "./index/index.tsx");
+  var collidingLayout = node("index", "./index/_layout.tsx", [index, detail]);
+  var root = node("", "./_layout.tsx", [collidingLayout]);
+  it("resolves absolute and relative parent paths to aliased screen names", function () {
+    var routeNodes = [root, collidingLayout, detail];
+    var routeName = getReactNavigationRouteName(collidingLayout);
+    expect(resolveParentRouteName(routeNodes, "/index/detail", "/index")).toBe(routeName);
+    expect(resolveParentRouteName(routeNodes, "/index/detail", "../")).toBe(routeName);
+    expect(resolveParentRouteName(routeNodes, "/index/detail", "/")).toBe("");
+  });
+  it("uses aliased layout names while resolving a late-mounted child", function () {
+    var state = {
+      index: 0,
+      routes: [{
+        name: getReactNavigationRouteName(collidingLayout),
+        state: {
+          index: 1,
+          routes: [{
+            name: "index"
+          }, {
+            name: "detail"
+          }]
+        }
+      }]
+    };
+    expect(resolveInitialRouteNameFromState("/index", state)).toBe("detail");
+  });
+});
+//# sourceMappingURL=findRouteNode.test.native.js.map

package/dist/esm/router/findRouteNode.test.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["describe","expect","it","getReactNavigationRouteName","resolveInitialRouteNameFromState","extractParamsFromState","findAllRouteNodesFromState","findRouteNodeFromState","resolveParentRouteName","node","route","contextKey","children","arguments","length","type","loadRoute","dynamic","current","preloaded","layout","root","state","index","routes","name","params","page","toBe","toEqual","detail","collidingLayout"],"sources":["../../../src/router/findRouteNode.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAAAC,2BAAA,EAAAC,gCAAA;AAAA,SACEC,sBAAA,EAAAC,0BAAA,EAAAC,sBAAA;AAAA,SACAC,sBAAA;AAAA,SACKC,KAAAC,KAAA,EAAAC,UAAA;EAEP,IAAAC,QAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;EACE;IACAE,IAAA,EAAAH,QAAA,CAAAE,MAAA;IACAE,SAAA,WAAAA,CAAA;MAAA,OACK;IACP;IAEAJ,QAAS;IACPK,OAAO;IACLP,KAAA;IACAC;EAAmB;AACnB;AACSX,QACT;EAAA,IACAkB,OAAA,GAAAT,IAAA;EACF,IAAAU,SAAA,GAAAV,IAAA;EACF,IAAAW,MAAA,GAAAX,IAAA,kCAEAS,OAAS,EACPC,SAAM,CACN;EACA,IAAAE,IAAM,GAAAZ,IAAS,KAAK,eAAS,GAC7BW,MAAM,CACN;EAAc,IACZE,KAAO;IACPC,KAAA,GAAQ;IAAAC,MACN;MAEEC,IAAA,EAAAtB,2BAA2B,CAAAiB,MAAA;MAC3BM,MAAA,EAAO;QACLN,MAAA,EAAO;MAAA;MACCE,KACN,EAAE;QAA2CC,KAC3C;QACJC,MAAA,GACF;UACFC,IAAA;UACQC,MAAA;YACVC,IAAA;UACF;QAEG,GACM;UACAF,IAAA;UACRC,MAAA;YAEEC,IAAA;UACM;QACL;MAED;IACF,GACF;MAEDF,IAAS;MACDC,MAAA;QACAL,IAAA,EAAQ;MACR;IACN;EAGE;EACAnB,EAAA,yDAA8C,cAAe;IAE7DD,MAAA,CAAOM,sBAAA,CAAuBe,KAAA,EAAAD,IAAA,CAAY,EAAAO,IAAA,CAAAV,OAAA;IAC1CjB,MAAA,CAAOK,0BAAuB,CAAAgB,KAAA,EAAAD,IAAY,GAAAQ,OAAA,EAC1CT,MAAO,EACRF,OAAA,CAEE;EACD;EAAchB,EAAA,oDACL;IAAAD,MACP,CAAAI,sBAAQ,CAAAiB,KAAA,GAAAO,OAAA;MAAAT,MACN;MAAAO,IACE;IAAiD;EAC1C;AACE;AACuC3B,QAAA,kDAChD;EAAA,IAAA8B,MACF,GAAArB,IAAA;EAAA,IACFc,KAAA,GAAAd,IAAA;EAAA,IACFsB,eAAA,GAAAtB,IAAA,kCAEAc,KAAA,EACDO,MAAA,CACF","ignoreList":[]}

package/dist/esm/router/getLinkingConfig.test.mjs

@@ -19,6 +19,15 @@ describe("getLinkingConfig", () => {
     });
     expect(linking.prefixes).toEqual(["threepunchconvo://", "threepunchconvo:///", "threepunchconvo://app"]);
   });
+  it("assigns distinct navigation names to nested routes with the same file name", () => {
+    const routes = getRoutes(getMockContext(["_layout.tsx", "index/_layout.tsx", "index/index.tsx"]));
+    const linking = getLinkingConfig(routes, true);
+    const state = linking.getStateFromPath("/", linking.config);
+    const parent = state.routes[0];
+    const child = parent.state.routes[0];
+    expect(parent.name).not.toBe(child.name);
+    expect(linking.getPathFromState(state, linking.config)).toBe("/");
+  });
 });
 describe("normalizeLinkingConfig", () => {
   it("merges manifest-default prefixes with user-supplied scheme/prefixes", () => {

package/dist/esm/router/getLinkingConfig.test.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["describe","expect","it","normalizeLinkingConfig","getRoutes","getLinkingConfig","getMockContext","routes","linking","scheme","prefixes","toEqual","result"],"sources":["../../../src/router/getLinkingConfig.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,sBAAA,QAA8B;AACvC,SAASC,SAAA,QAAiB;AAC1B,SAASC,gBAAA,QAAwB;AACjC,SAASC,cAAA,QAAsB;AAE/BN,QAAA,CAAS,oBAAoB,MAAM;EACjCE,EAAA,CAAG,4CAA4C,MAAM;IACnD,MAAMK,MAAA,GAASH,SAAA,CAAUE,cAAA,CAAe,CAAC,eAAe,WAAW,CAAC,CAAC;IACrE,MAAME,OAAA,GAAUH,gBAAA,CAAiBE,MAAA,EAAQ,MAAM;MAC7CE,MAAA,EAAQ;IACV,CAAC;IAEDR,MAAA,CAAOO,OAAA,CAAQE,QAAQ,EAAEC,OAAA,CAAQ,CAAC,sBAAsB,qBAAqB,CAAC;EAChF,CAAC;EAEDT,EAAA,CAAG,yDAAyD,MAAM;IAChE,MAAMK,MAAA,GAASH,SAAA,CAAUE,cAAA,CAAe,CAAC,eAAe,WAAW,CAAC,CAAC;IACrE,MAAME,OAAA,GAAUH,gBAAA,CAAiBE,MAAA,EAAQ,MAAM;MAC7CE,MAAA,EAAQ;MACRC,QAAA,EAAU,CAAC,uBAAuB;IACpC,CAAC;IAEDT,MAAA,CAAOO,OAAA,CAAQE,QAAQ,EAAEC,OAAA,CAAQ,CAC/B,sBACA,uBACA,wBACD;EACH,CAAC;AACH,CAAC;AAEDX,QAAA,CAAS,0BAA0B,MAAM;EACvCE,EAAA,CAAG,uEAAuE,MAAM;IAC9E,MAAMU,MAAA,GAAST,sBAAA,CACb;MAAEM,MAAA,EAAQ;MAAOC,QAAA,EAAU,CAAC,0BAA0B;IAAE,GACxD,CAAC,UAAU,SAAS,CACtB;IAEAT,MAAA,CAAOW,MAAA,CAAOF,QAAQ,EAAEC,OAAA,CAAQ,CAC9B,UACA,WACA,UACA,WACA,2BACD;EACH,CAAC;EAEDT,EAAA,CAAG,sEAAsE,MAAM;IAC7E,MAAMU,MAAA,GAAST,sBAAA,CAAuB,QAAW,CAAC,UAAU,SAAS,CAAC;IACtEF,MAAA,CAAOW,MAAA,CAAOF,QAAQ,EAAEC,OAAA,CAAQ,CAAC,UAAU,SAAS,CAAC;EACvD,CAAC;EAEDT,EAAA,CAAG,wDAAwD,MAAM;IAC/D,MAAMU,MAAA,GAAST,sBAAA,CAAuB;MAAEM,MAAA,EAAQ;IAAM,GAAG,CAAC,UAAU,SAAS,CAAC;IAC9ER,MAAA,CAAOW,MAAA,CAAOF,QAAQ,EAAEC,OAAA,CAAQ,CAAC,UAAU,SAAS,CAAC;EACvD,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["describe","expect","it","normalizeLinkingConfig","getRoutes","getLinkingConfig","getMockContext","routes","linking","scheme","prefixes","toEqual","state","getStateFromPath","config","parent","child","name","not","toBe","getPathFromState","result"],"sources":["../../../src/router/getLinkingConfig.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,sBAAA,QAA8B;AACvC,SAASC,SAAA,QAAiB;AAC1B,SAASC,gBAAA,QAAwB;AACjC,SAASC,cAAA,QAAsB;AAE/BN,QAAA,CAAS,oBAAoB,MAAM;EACjCE,EAAA,CAAG,4CAA4C,MAAM;IACnD,MAAMK,MAAA,GAASH,SAAA,CAAUE,cAAA,CAAe,CAAC,eAAe,WAAW,CAAC,CAAC;IACrE,MAAME,OAAA,GAAUH,gBAAA,CAAiBE,MAAA,EAAQ,MAAM;MAC7CE,MAAA,EAAQ;IACV,CAAC;IAEDR,MAAA,CAAOO,OAAA,CAAQE,QAAQ,EAAEC,OAAA,CAAQ,CAAC,sBAAsB,qBAAqB,CAAC;EAChF,CAAC;EAEDT,EAAA,CAAG,yDAAyD,MAAM;IAChE,MAAMK,MAAA,GAASH,SAAA,CAAUE,cAAA,CAAe,CAAC,eAAe,WAAW,CAAC,CAAC;IACrE,MAAME,OAAA,GAAUH,gBAAA,CAAiBE,MAAA,EAAQ,MAAM;MAC7CE,MAAA,EAAQ;MACRC,QAAA,EAAU,CAAC,uBAAuB;IACpC,CAAC;IAEDT,MAAA,CAAOO,OAAA,CAAQE,QAAQ,EAAEC,OAAA,CAAQ,CAC/B,sBACA,uBACA,wBACD;EACH,CAAC;EAEDT,EAAA,CAAG,8EAA8E,MAAM;IACrF,MAAMK,MAAA,GAASH,SAAA,CACbE,cAAA,CAAe,CAAC,eAAe,qBAAqB,iBAAiB,CAAC,CACxE;IACA,MAAME,OAAA,GAAUH,gBAAA,CAAiBE,MAAA,EAAQ,IAAI;IAC7C,MAAMK,KAAA,GAAQJ,OAAA,CAAQK,gBAAA,CAAkB,KAAKL,OAAA,CAAQM,MAAe;IACpE,MAAMC,MAAA,GAASH,KAAA,CAAML,MAAA,CAAO,CAAC;IAC7B,MAAMS,KAAA,GAAQD,MAAA,CAAOH,KAAA,CAAOL,MAAA,CAAO,CAAC;IAEpCN,MAAA,CAAOc,MAAA,CAAOE,IAAI,EAAEC,GAAA,CAAIC,IAAA,CAAKH,KAAA,CAAMC,IAAI;IACvChB,MAAA,CAAOO,OAAA,CAAQY,gBAAA,CAAkBR,KAAA,EAAOJ,OAAA,CAAQM,MAAe,CAAC,EAAEK,IAAA,CAAK,GAAG;EAC5E,CAAC;AACH,CAAC;AAEDnB,QAAA,CAAS,0BAA0B,MAAM;EACvCE,EAAA,CAAG,uEAAuE,MAAM;IAC9E,MAAMmB,MAAA,GAASlB,sBAAA,CACb;MAAEM,MAAA,EAAQ;MAAOC,QAAA,EAAU,CAAC,0BAA0B;IAAE,GACxD,CAAC,UAAU,SAAS,CACtB;IAEAT,MAAA,CAAOoB,MAAA,CAAOX,QAAQ,EAAEC,OAAA,CAAQ,CAC9B,UACA,WACA,UACA,WACA,2BACD;EACH,CAAC;EAEDT,EAAA,CAAG,sEAAsE,MAAM;IAC7E,MAAMmB,MAAA,GAASlB,sBAAA,CAAuB,QAAW,CAAC,UAAU,SAAS,CAAC;IACtEF,MAAA,CAAOoB,MAAA,CAAOX,QAAQ,EAAEC,OAAA,CAAQ,CAAC,UAAU,SAAS,CAAC;EACvD,CAAC;EAEDT,EAAA,CAAG,wDAAwD,MAAM;IAC/D,MAAMmB,MAAA,GAASlB,sBAAA,CAAuB;MAAEM,MAAA,EAAQ;IAAM,GAAG,CAAC,UAAU,SAAS,CAAC;IAC9ER,MAAA,CAAOoB,MAAA,CAAOX,QAAQ,EAAEC,OAAA,CAAQ,CAAC,UAAU,SAAS,CAAC;EACvD,CAAC;AACH,CAAC","ignoreList":[]}

package/dist/esm/router/getLinkingConfig.test.native.js

@@ -19,6 +19,15 @@ describe("getLinkingConfig", function () {
     });
     expect(linking.prefixes).toEqual(["threepunchconvo://", "threepunchconvo:///", "threepunchconvo://app"]);
   });
+  it("assigns distinct navigation names to nested routes with the same file name", function () {
+    var routes = getRoutes(getMockContext(["_layout.tsx", "index/_layout.tsx", "index/index.tsx"]));
+    var linking = getLinkingConfig(routes, true);
+    var state = linking.getStateFromPath("/", linking.config);
+    var parent = state.routes[0];
+    var child = parent.state.routes[0];
+    expect(parent.name).not.toBe(child.name);
+    expect(linking.getPathFromState(state, linking.config)).toBe("/");
+  });
 });
 describe("normalizeLinkingConfig", function () {
   it("merges manifest-default prefixes with user-supplied scheme/prefixes", function () {

package/dist/esm/router/getLinkingConfig.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["describe","expect","it","normalizeLinkingConfig","getRoutes","getLinkingConfig","getMockContext","routes","linking","scheme","prefixes","toEqual","result"],"sources":["../../../src/router/getLinkingConfig.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,sBAAA,QAA8B;AACvC,SAASC,SAAA,QAAiB;AAC1B,SAASC,gBAAA,QAAwB;AACjC,SAASC,cAAA,QAAsB;AAE/BN,QAAA,CAAS,oBAAoB,YAAM;EACjCE,EAAA,CAAG,4CAA4C,YAAM;IACnD,IAAAK,MAAM,GAAAH,SAAS,CAAAE,cAAU,EACzB,aAAM,EACJ,WAAQ,CACT;IAED,IAAAE,OAAO,GAAAH,gBAAkB,CAAAE,MAAS;MACnCE,MAAA;IAED,CAAG;IACDR,MAAM,CAAAO,OAAA,CAASE,QAAA,EAAUC,OAAA,EACzB,oBAAgB,EACd,qBAAQ,EACR;EAAkC,EACpC;EAEAT,EAAA,wDAAiC;IAAA,IAC/BK,MAAA,GAAAH,SAAA,CAAAE,cAAA,EACA,eACA,YACD;IACF,IAAAE,OAAA,GAAAH,gBAAA,CAAAE,MAAA;MACFE,MAAA;MAEDC,QAAS,GACJ;IACc,EACb;IAAwDT,MACvD,CAAAO,OAAU,CAAAE,QAAS,EAAAC,OAAA,EACtB,sBAEA,qBAAsB,EACpB,yBACA;EAAA;AACA;AACAX,QACA;EAAAE,EACF,CAAC;IACF,IAAAU,MAAA,GAAAT,sBAAA;MAEEM,MAAA;MACDC,QAAM,GACN,0BAAwB;IAG1B,CAAG,GACD,QAAM,EACN,SAAO,CACR;IACFT,MAAA,CAAAW,MAAA,CAAAF,QAAA,EAAAC,OAAA,E","ignoreList":[]}
+{"version":3,"names":["describe","expect","it","normalizeLinkingConfig","getRoutes","getLinkingConfig","getMockContext","routes","linking","scheme","prefixes","toEqual","state","getStateFromPath","config","parent","child","name","not","toBe","getPathFromState","result"],"sources":["../../../src/router/getLinkingConfig.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,sBAAA,QAA8B;AACvC,SAASC,SAAA,QAAiB;AAC1B,SAASC,gBAAA,QAAwB;AACjC,SAASC,cAAA,QAAsB;AAE/BN,QAAA,CAAS,oBAAoB,YAAM;EACjCE,EAAA,CAAG,4CAA4C,YAAM;IACnD,IAAAK,MAAM,GAAAH,SAAS,CAAAE,cAAU,EACzB,aAAM,EACJ,WAAQ,CACT;IAED,IAAAE,OAAO,GAAAH,gBAAkB,CAAAE,MAAS;MACnCE,MAAA;IAED,CAAG;IACDR,MAAM,CAAAO,OAAA,CAASE,QAAA,EAAUC,OAAA,EACzB,oBAAgB,EACd,qBAAQ,EACR;EAAkC,EACpC;EAEAT,EAAA,wDAAiC;IAAA,IAC/BK,MAAA,GAAAH,SAAA,CAAAE,cAAA,EACA,eACA,YACD;IACF,IAAAE,OAAA,GAAAH,gBAAA,CAAAE,MAAA;MAEEE,MAAA;MACDC,QAAM,GACJ,uBAAgB;IAElB;IACAT,MAAM,CAAAO,OAAQ,CAAAE,QAAQ,EAAAC,OAAA,EACtB,oBAAqB,EACrB,qBAAqB,EAErB,uBAAwB,CACxB;EACF,CAAC;EACFT,EAAA;IAED,IAAAK,MAAS,GAAAH,SAAA,CAAAE,cAAgC,EACpC,eACD,mBAAe,EACb,iBAAiB,CAAuC,CACxD,CAAC;IACH,IAAAE,OAAA,GAAAH,gBAAA,CAAAE,MAAA;IAEA,IAAAK,KAAO,GAAAJ,OAAO,CAAAK,gBAAkB,MAAAL,OAAA,CAAAM,MAAA;IAAA,IAC9BC,MAAA,GAAAH,KAAA,CAAAL,MAAA;IAAA,IACAS,KAAA,GAAAD,MAAA,CAAAH,KAAA,CAAAL,MAAA;IAAAN,MACA,CAAAc,MAAA,CAAAE,IAAA,EAAAC,GAAA,CAAAC,IAAA,CAAAH,KAAA,CAAAC,IAAA;IAAAhB,MACA,CAAAO,OAAA,CAAAY,gBAAA,CAAAR,KAAA,EAAAJ,OAAA,CAAAM,MAAA,GAAAK,IAAA;EAAA;AACA;AACDnB,QACF;EAEDE,EAAA,CAAG,uEAAsE,YAAM;IAC7E,IAAAmB,MAAM,GAAAlB,sBAAS;MACfM,MAAO,OAAO;MACfC,QAAA,GAEE;IAED,IACD,UACF,U","ignoreList":[]}

package/dist/esm/router/getNormalizedStatePath.mjs

@@ -1,9 +1,10 @@
 import { stripBaseUrl } from "../fork/getStateFromPath-mods.mjs";
+import { stripPathSuffix } from "./path.mjs";
 function getNormalizedStatePath({
   path: statePath,
   params
 }, baseUrl) {
-  const [pathname] = statePath.split("?");
+  const pathname = stripPathSuffix(statePath);
   return {
     // Strip empty path at the start
     segments: stripBaseUrl(pathname, baseUrl).split("/").filter(Boolean).map(decodeURIComponent),

package/dist/esm/router/getNormalizedStatePath.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["stripBaseUrl","getNormalizedStatePath","path","statePath","params","baseUrl","pathname","split","segments","filter","Boolean","map","decodeURIComponent","Object","entries","reduce","prev","key","value","Array","isArray","v"],"sources":["../../../src/router/getNormalizedStatePath.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAatB,SAASC,uBACd;EACEC,IAAA,EAAMC,SAAA;EACNC;AACF,GAIAC,OAAA,EACwC;EACxC,MAAM,CAACC,QAAQ,IAAIH,SAAA,CAAUI,KAAA,CAAM,GAAG;EACtC,OAAO;IAAA;IAELC,QAAA,EAAUR,YAAA,CAAaM,QAAA,EAAUD,OAAO,EACrCE,KAAA,CAAM,GAAG,EACTE,MAAA,CAAOC,OAAO,EACdC,GAAA,CAAIC,kBAAkB;IAAA;IAAA;IAGzBR,MAAA,EAAQS,MAAA,CAAOC,OAAA,CAAQV,MAAM,EAAEW,MAAA,CAAO,CAACC,IAAA,EAAM,CAACC,GAAA,EAAKC,KAAK,MAAM;MAC5D,IAAIC,KAAA,CAAMC,OAAA,CAAQF,KAAK,GAAG;QACxBF,IAAA,CAAKC,GAAG,IAAIC,KAAA,CAAMP,GAAA,CAAKU,CAAA,IAAc;UACnC,IAAI;YACF,OAAOT,kBAAA,CAAmBS,CAAC;UAC7B,QAAQ;YACN,OAAOA,CAAA;UACT;QACF,CAAC;MACH,OAAO;QACL,IAAI;UACFL,IAAA,CAAKC,GAAG,IAAIL,kBAAA,CAAmBM,KAAe;QAChD,QAAQ;UACNF,IAAA,CAAKC,GAAG,IAAIC,KAAA;QACd;MACF;MACA,OAAOF,IAAA;IACT,GAAG,CAAC,CAAiB;EACvB;AACF","ignoreList":[]}
+{"version":3,"names":["stripBaseUrl","stripPathSuffix","getNormalizedStatePath","path","statePath","params","baseUrl","pathname","segments","split","filter","Boolean","map","decodeURIComponent","Object","entries","reduce","prev","key","value","Array","isArray","v"],"sources":["../../../src/router/getNormalizedStatePath.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAC7B,SAASC,eAAA,QAAuB;AAazB,SAASC,uBACd;EACEC,IAAA,EAAMC,SAAA;EACNC;AACF,GAIAC,OAAA,EACwC;EACxC,MAAMC,QAAA,GAAWN,eAAA,CAAgBG,SAAS;EAC1C,OAAO;IAAA;IAELI,QAAA,EAAUR,YAAA,CAAaO,QAAA,EAAUD,OAAO,EACrCG,KAAA,CAAM,GAAG,EACTC,MAAA,CAAOC,OAAO,EACdC,GAAA,CAAIC,kBAAkB;IAAA;IAAA;IAGzBR,MAAA,EAAQS,MAAA,CAAOC,OAAA,CAAQV,MAAM,EAAEW,MAAA,CAAO,CAACC,IAAA,EAAM,CAACC,GAAA,EAAKC,KAAK,MAAM;MAC5D,IAAIC,KAAA,CAAMC,OAAA,CAAQF,KAAK,GAAG;QACxBF,IAAA,CAAKC,GAAG,IAAIC,KAAA,CAAMP,GAAA,CAAKU,CAAA,IAAc;UACnC,IAAI;YACF,OAAOT,kBAAA,CAAmBS,CAAC;UAC7B,QAAQ;YACN,OAAOA,CAAA;UACT;QACF,CAAC;MACH,OAAO;QACL,IAAI;UACFL,IAAA,CAAKC,GAAG,IAAIL,kBAAA,CAAmBM,KAAe;QAChD,QAAQ;UACNF,IAAA,CAAKC,GAAG,IAAIC,KAAA;QACd;MACF;MACA,OAAOF,IAAA;IACT,GAAG,CAAC,CAAiB;EACvB;AACF","ignoreList":[]}

package/dist/esm/router/getNormalizedStatePath.native.js

@@ -1,10 +1,11 @@
 import { stripBaseUrl } from "../fork/getStateFromPath-mods.native.js";
+import { stripPathSuffix } from "./path.native.js";
 function getNormalizedStatePath(param, baseUrl) {
   var {
     path: statePath,
     params
   } = param;
-  var [pathname] = statePath.split("?");
+  var pathname = stripPathSuffix(statePath);
   return {
     // Strip empty path at the start
     segments: stripBaseUrl(pathname, baseUrl).split("/").filter(Boolean).map(decodeURIComponent),

package/dist/esm/router/getNormalizedStatePath.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["stripBaseUrl","getNormalizedStatePath","param","baseUrl","path","statePath","params","pathname","split","segments","filter","Boolean","map","decodeURIComponent","Object","entries","reduce","prev","param2","key","value","Array","isArray","v","unused"],"sources":["../../../src/router/getNormalizedStatePath.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAatB,SAASC,uBACdC,KAAA,EAAAC,OAAA;EACE;IAAMC,IAAA,EAAAC,SAAA;IAAAC;EAAA,IAAAJ,KAAA;EACN,KAAAK,QAAA,IAAAF,SAAA,CAAAG,KAAA;EACF,OAIA;IAEA;IACAC,QAAO,EAAAT,YAAA,CAAAO,QAAA,EAAAJ,OAAA,EAAAK,KAAA,MAAAE,MAAA,CAAAC,OAAA,EAAAC,GAAA,CAAAC,kBAAA;IAAA;IAEL;IAGyBP,MAAA,EAAAQ,MAAA,CAAAC,OAAA,CAAAT,MAAA,EAAAU,MAAA,WAAAC,IAAA,EAAAC,MAAA;MAAA,KAAAC,GAAA,EAAAC,KAAA,IAAAF,MAAA;MAGzB,IAAAG,KAAQ,CAAAC,OAAO,CAAAF,KAAQ;QACrBH,IAAI,CAAAE,GAAM,IAAAC,KAAQ,CAAAR,GAAK,WAAGW,CAAA;UACxB,IAAK;YACH,OAAIV,kBAAA,CAAAU,CAAA;UACF,SAAOC,MAAA;YACT,OAAQD,CAAA;UACN;QAAO,EACT;MAAA,OACD;QACH;UACEN,IAAI,CAAAE,GAAA,IAAAN,kBAAA,CAAAO,KAAA;QACF,SAAKI,MAAO;UACdP,IAAA,CAAAE,GAAQ,IAAAC,KAAA;QACN;MAAY;MAEhB,OAAAH,IAAA;IACA;EAAO;AACY;AAEzB,S","ignoreList":[]}
+{"version":3,"names":["stripBaseUrl","stripPathSuffix","getNormalizedStatePath","param","baseUrl","path","statePath","params","pathname","segments","split","filter","Boolean","map","decodeURIComponent","Object","entries","reduce","prev","param2","key","value","Array","isArray","v","unused"],"sources":["../../../src/router/getNormalizedStatePath.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAC7B,SAASC,eAAA,QAAuB;AAazB,SAASC,uBACdC,KAAA,EAAAC,OAAA;EACE;IAAMC,IAAA,EAAAC,SAAA;IAAAC;EAAA,IAAAJ,KAAA;EACN,IAAAK,QAAA,GAAAP,eAAA,CAAAK,SAAA;EACF,OAIA;IAEA;IACAG,QAAO,EAAAT,YAAA,CAAAQ,QAAA,EAAAJ,OAAA,EAAAM,KAAA,MAAAC,MAAA,CAAAC,OAAA,EAAAC,GAAA,CAAAC,kBAAA;IAAA;IAEL;IAGyBP,MAAA,EAAAQ,MAAA,CAAAC,OAAA,CAAAT,MAAA,EAAAU,MAAA,WAAAC,IAAA,EAAAC,MAAA;MAAA,KAAAC,GAAA,EAAAC,KAAA,IAAAF,MAAA;MAGzB,IAAAG,KAAQ,CAAAC,OAAO,CAAAF,KAAQ;QACrBH,IAAI,CAAAE,GAAM,IAAAC,KAAQ,CAAAR,GAAK,WAAGW,CAAA;UACxB,IAAK;YACH,OAAIV,kBAAA,CAAAU,CAAA;UACF,SAAOC,MAAA;YACT,OAAQD,CAAA;UACN;QAAO,EACT;MAAA,OACD;QACH;UACEN,IAAI,CAAAE,GAAA,IAAAN,kBAAA,CAAAO,KAAA;QACF,SAAKI,MAAO;UACdP,IAAA,CAAAE,GAAQ,IAAAC,KAAA;QACN;MAAY;MAEhB,OAAAH,IAAA;IACA;EAAO;AACY;AAEzB,S","ignoreList":[]}

package/dist/esm/router/getRouteInfo.mjs

@@ -3,6 +3,7 @@ import { stripBaseUrl } from "../fork/getStateFromPath-mods.mjs";
 import { getNormalizedStatePath } from "./getNormalizedStatePath.mjs";
 import { isIndexPath } from "./isIndexPath.mjs";
 import { getResolvedLinking } from "./linkingConfig.mjs";
+import { stripPathSuffix } from "./path.mjs";
 function getRouteInfo(state) {
   return getRouteInfoFromState((state2, asPath) => {
     return getPathDataFromState(state2, {
@@ -20,10 +21,12 @@ function getRouteInfoFromState(getPathFromState, state, baseUrl) {
   const qualified = getPathFromState(state, true);
   return {
     unstable_globalHref: path,
-    pathname: stripBaseUrl(path, baseUrl).split("?")[0],
+    // a hash href serializes as /page#section; the pathname the router compares
+    // against pending navigation and the URL must drop the hash as well as the query
+    pathname: stripPathSuffix(stripBaseUrl(path, baseUrl)),
     isIndex: isIndexPath(state),
     ...getNormalizedStatePath(qualified, baseUrl)
   };
 }
-export { getRouteInfo };
+export { getRouteInfo, getRouteInfoFromState };
 //# sourceMappingURL=getRouteInfo.mjs.map

package/dist/esm/router/getRouteInfo.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["getPathDataFromState","stripBaseUrl","getNormalizedStatePath","isIndexPath","getResolvedLinking","getRouteInfo","state","getRouteInfoFromState","asPath","screens","config","preserveDynamicRoutes","preserveGroups","getPathFromState","baseUrl","path","qualified","unstable_globalHref","pathname","split","isIndex"],"sources":["../../../src/router/getRouteInfo.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,oBAAA,QAAwC;AACjD,SAASC,YAAA,QAAoB;AAE7B,SAASC,sBAAA,QAA8C;AACvD,SAASC,WAAA,QAAmB;AAC5B,SAASC,kBAAA,QAA0B;AAE5B,SAASC,aAAaC,KAAA,EAA8B;EACzD,OAAOC,qBAAA,CACL,CAACD,MAAA,EAAuDE,MAAA,KAAoB;IAC1E,OAAOR,oBAAA,CAAqBM,MAAA,EAAO;MACjCG,OAAA,EAAS,EAAC;MACV,GAAGL,kBAAA,CAAmB,GAAGM,MAAA;MACzBC,qBAAA,EAAuBH,MAAA;MACvBI,cAAA,EAAgBJ;IAClB,CAAC;EACH,GACAF,KACF;AACF;AAEA,SAASC,sBACPM,gBAAA,EACAP,KAAA,EACAQ,OAAA,EACW;EACX,MAAM;IAAEC;EAAK,IAAIF,gBAAA,CAAiBP,KAAA,EAAO,KAAK;EAC9C,MAAMU,SAAA,GAAYH,gBAAA,CAAiBP,KAAA,EAAO,IAAI;EAE9C,OAAO;IACLW,mBAAA,EAAqBF,IAAA;IACrBG,QAAA,EAAUjB,YAAA,CAAac,IAAA,EAAMD,OAAO,EAAEK,KAAA,CAAM,GAAG,EAAE,CAAC;IAClDC,OAAA,EAASjB,WAAA,CAAYG,KAAK;IAC1B,GAAGJ,sBAAA,CAAuBc,SAAA,EAAWF,OAAO;EAC9C;AACF","ignoreList":[]}
+{"version":3,"names":["getPathDataFromState","stripBaseUrl","getNormalizedStatePath","isIndexPath","getResolvedLinking","stripPathSuffix","getRouteInfo","state","getRouteInfoFromState","asPath","screens","config","preserveDynamicRoutes","preserveGroups","getPathFromState","baseUrl","path","qualified","unstable_globalHref","pathname","isIndex"],"sources":["../../../src/router/getRouteInfo.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,oBAAA,QAAwC;AACjD,SAASC,YAAA,QAAoB;AAE7B,SAASC,sBAAA,QAA8C;AACvD,SAASC,WAAA,QAAmB;AAC5B,SAASC,kBAAA,QAA0B;AACnC,SAASC,eAAA,QAAuB;AAEzB,SAASC,aAAaC,KAAA,EAA8B;EACzD,OAAOC,qBAAA,CACL,CAACD,MAAA,EAAuDE,MAAA,KAAoB;IAC1E,OAAOT,oBAAA,CAAqBO,MAAA,EAAO;MACjCG,OAAA,EAAS,EAAC;MACV,GAAGN,kBAAA,CAAmB,GAAGO,MAAA;MACzBC,qBAAA,EAAuBH,MAAA;MACvBI,cAAA,EAAgBJ;IAClB,CAAC;EACH,GACAF,KACF;AACF;AAEO,SAASC,sBACdM,gBAAA,EACAP,KAAA,EACAQ,OAAA,EACW;EACX,MAAM;IAAEC;EAAK,IAAIF,gBAAA,CAAiBP,KAAA,EAAO,KAAK;EAC9C,MAAMU,SAAA,GAAYH,gBAAA,CAAiBP,KAAA,EAAO,IAAI;EAE9C,OAAO;IACLW,mBAAA,EAAqBF,IAAA;IAAA;IAAA;IAGrBG,QAAA,EAAUd,eAAA,CAAgBJ,YAAA,CAAae,IAAA,EAAMD,OAAO,CAAC;IACrDK,OAAA,EAASjB,WAAA,CAAYI,KAAK;IAC1B,GAAGL,sBAAA,CAAuBe,SAAA,EAAWF,OAAO;EAC9C;AACF","ignoreList":[]}

package/dist/esm/router/getRouteInfo.native.js

@@ -3,6 +3,7 @@ import { stripBaseUrl } from "../fork/getStateFromPath-mods.native.js";
 import { getNormalizedStatePath } from "./getNormalizedStatePath.native.js";
 import { isIndexPath } from "./isIndexPath.native.js";
 import { getResolvedLinking } from "./linkingConfig.native.js";
+import { stripPathSuffix } from "./path.native.js";
 function getRouteInfo(state) {
   return getRouteInfoFromState(function (state2, asPath) {
     var _getResolvedLinking;
@@ -21,10 +22,12 @@ function getRouteInfoFromState(getPathFromState, state, baseUrl) {
   var qualified = getPathFromState(state, true);
   return {
     unstable_globalHref: path,
-    pathname: stripBaseUrl(path, baseUrl).split("?")[0],
+    // a hash href serializes as /page#section; the pathname the router compares
+    // against pending navigation and the URL must drop the hash as well as the query
+    pathname: stripPathSuffix(stripBaseUrl(path, baseUrl)),
     isIndex: isIndexPath(state),
     ...getNormalizedStatePath(qualified, baseUrl)
   };
 }
-export { getRouteInfo };
+export { getRouteInfo, getRouteInfoFromState };
 //# sourceMappingURL=getRouteInfo.native.js.map