one 1.15.1 → 1.15.2

package/dist/cjs/views/Navigator.cjs

@@ -145,15 +145,12 @@ function QualifiedNavigator({
     const browserPath = import_router.initialPathname ?? (typeof window !== "undefined" ? window.location.pathname : void 0);
     if (!browserPath) return void 0;
     const layoutUrlPrefix = (0, import_matchers.stripGroupSegmentsFromPath)(contextKey).replace(/\/+$/, "");
-    let relativePath = browserPath;
-    if (layoutUrlPrefix && browserPath.startsWith(layoutUrlPrefix)) {
-      relativePath = browserPath.slice(layoutUrlPrefix.length) || "/";
-    }
     let best;
     for (const screen of screens) {
       const name = screen?.props?.name;
       if (!name) continue;
-      const match = (0, import_matchers.matchRoutePattern)(name, relativePath);
+      const fullPattern = layoutUrlPrefix ? `${layoutUrlPrefix}/${name}` : name;
+      const match = (0, import_matchers.matchRoutePattern)(fullPattern, browserPath);
       if (!match) continue;
       if (!best || match.specificity > best.specificity) {
         best = {

package/dist/cjs/views/Navigator.native.js

@@ -155,10 +155,6 @@ function QualifiedNavigator(param) {
     var browserPath = import_router.initialPathname !== null && import_router.initialPathname !== void 0 ? import_router.initialPathname : typeof window !== "undefined" ? window.location.pathname : void 0;
     if (!browserPath) return void 0;
     var layoutUrlPrefix = (0, import_matchers.stripGroupSegmentsFromPath)(contextKey).replace(/\/+$/, "");
-    var relativePath = browserPath;
-    if (layoutUrlPrefix && browserPath.startsWith(layoutUrlPrefix)) {
-      relativePath = browserPath.slice(layoutUrlPrefix.length) || "/";
-    }
     var best;
     var _iteratorNormalCompletion = true,
       _didIteratorError = false,
@@ -169,7 +165,8 @@ function QualifiedNavigator(param) {
         var _screen_props;
         var name = screen === null || screen === void 0 ? void 0 : (_screen_props = screen.props) === null || _screen_props === void 0 ? void 0 : _screen_props.name;
         if (!name) continue;
-        var match = (0, import_matchers.matchRoutePattern)(name, relativePath);
+        var fullPattern = layoutUrlPrefix ? `${layoutUrlPrefix}/${name}` : name;
+        var match = (0, import_matchers.matchRoutePattern)(fullPattern, browserPath);
         if (!match) continue;
         if (!best || match.specificity > best.specificity) {
           best = {

package/dist/cjs/views/Navigator.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Navigator_exports","__export","DefaultNavigator","NamedSlot","Navigator","NavigatorContext","QualifiedSlot","Slot","clearAllSlotStates","getScopedSlotKey","getSlotState","setSlotState","useNamedSlot","useNavigatorContext","useSlot","module","exports","import_jsx_runtime","require","import_native","React","__toESM","import_react_native_safe_area_context","import_withLayoutContext","import_notFoundState","import_Route","import_matchers","import_router","import_router2","import_useScreens","import_Screen","import_interceptRoutes","SLOT_STATIC_KEY","globalSlotState","Map","slotStateListeners","Set","slotName","get","state","delete","set","forEach","listener","clear","registerClearSlotStates","registerSetSlotState","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","createContext","process","env","NODE_ENV","displayName","param","initialRouteName","screenOptions","children","router","contextKey","useContextKey","screens","otherSlot","protectedScreens","useFilterScreenChildren","isCustomNavigator","registerProtectedRoutes","unregisterProtectedRoutes","sorted","useSortedScreens","length","console","warn","jsx","QualifiedNavigator","StackRouter","resolvedInitialRouteName","useMemo","browserPath","initialPathname","window","location","pathname","layoutUrlPrefix","stripGroupSegmentsFromPath","replace","relativePath","startsWith","slice","best","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","screen","_screen_props","name","props","match","matchRoutePattern","specificity","err","return","navigation","descriptors","NavigationContent","useNavigationBuilder","id","descriptorsRef","useRef","current","Provider","context","useContext","Error","_ref","_descriptorsRef_current_current_key","notFoundState","useNotFoundState","notFoundRouteNode","findRouteNodeByPath","notFoundPath","routeNode","findNearestNotFoundRoute","originalPath","NotFoundComponent","getQualifiedRouteComponent","route","params","routes","index","renderedElement","key","render","cloneElement","memo","Slot2","SafeAreaView","style","flex"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Navigator_exports","__export","DefaultNavigator","NamedSlot","Navigator","NavigatorContext","QualifiedSlot","Slot","clearAllSlotStates","getScopedSlotKey","getSlotState","setSlotState","useNamedSlot","useNavigatorContext","useSlot","module","exports","import_jsx_runtime","require","import_native","React","__toESM","import_react_native_safe_area_context","import_withLayoutContext","import_notFoundState","import_Route","import_matchers","import_router","import_router2","import_useScreens","import_Screen","import_interceptRoutes","SLOT_STATIC_KEY","globalSlotState","Map","slotStateListeners","Set","slotName","get","state","delete","set","forEach","listener","clear","registerClearSlotStates","registerSetSlotState","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","createContext","process","env","NODE_ENV","displayName","param","initialRouteName","screenOptions","children","router","contextKey","useContextKey","screens","otherSlot","protectedScreens","useFilterScreenChildren","isCustomNavigator","registerProtectedRoutes","unregisterProtectedRoutes","sorted","useSortedScreens","length","console","warn","jsx","QualifiedNavigator","StackRouter","resolvedInitialRouteName","useMemo","browserPath","initialPathname","window","location","pathname","layoutUrlPrefix","stripGroupSegmentsFromPath","replace","best","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","screen","_screen_props","name","props","fullPattern","match","matchRoutePattern","specificity","err","return","navigation","descriptors","NavigationContent","useNavigationBuilder","id","descriptorsRef","useRef","current","Provider","context","useContext","Error","_ref","_descriptorsRef_current_current_key","notFoundState","useNotFoundState","notFoundRouteNode","findRouteNodeByPath","notFoundPath","routeNode","findNearestNotFoundRoute","originalPath","NotFoundComponent","getQualifiedRouteComponent","route","params","routes","index","renderedElement","key","render","cloneElement","memo","Slot2","SafeAreaView","style","flex"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/views/Navigator.mjs

@@ -95,15 +95,12 @@ function QualifiedNavigator({
     const browserPath = initialPathname ?? (typeof window !== "undefined" ? window.location.pathname : void 0);
     if (!browserPath) return void 0;
     const layoutUrlPrefix = stripGroupSegmentsFromPath(contextKey).replace(/\/+$/, "");
-    let relativePath = browserPath;
-    if (layoutUrlPrefix && browserPath.startsWith(layoutUrlPrefix)) {
-      relativePath = browserPath.slice(layoutUrlPrefix.length) || "/";
-    }
     let best;
     for (const screen of screens) {
       const name = screen?.props?.name;
       if (!name) continue;
-      const match = matchRoutePattern(name, relativePath);
+      const fullPattern = layoutUrlPrefix ? `${layoutUrlPrefix}/${name}` : name;
+      const match = matchRoutePattern(fullPattern, browserPath);
       if (!match) continue;
       if (!best || match.specificity > best.specificity) {
         best = {

package/dist/esm/views/Navigator.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["StackRouter","useNavigationBuilder","React","SafeAreaView","useFilterScreenChildren","findNearestNotFoundRoute","findRouteNodeByPath","useNotFoundState","useContextKey","matchRoutePattern","stripGroupSegmentsFromPath","routeNode","globalRouteNode","initialPathname","registerProtectedRoutes","unregisterProtectedRoutes","useSortedScreens","getQualifiedRouteComponent","Screen","registerClearSlotStates","registerSetSlotState","Fragment","jsx","SLOT_STATIC_KEY","globalSlotState","Map","slotStateListeners","Set","getSlotState","slotName","get","setSlotState","state","delete","set","forEach","listener","clearAllSlotStates","clear","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","initialRouteName","screenOptions","children","router","contextKey","screens","otherSlot","protectedScreens","isCustomNavigator","sorted","length","console","warn","QualifiedNavigator","resolvedInitialRouteName","useMemo","browserPath","window","location","pathname","layoutUrlPrefix","replace","relativePath","startsWith","slice","best","screen","name","props","match","specificity","navigation","descriptors","NavigationContent","id","descriptorsRef","useRef","current","value","Provider","useNavigatorContext","context","useContext","Error","useSlot","notFoundState","notFoundRouteNode","notFoundPath","originalPath","NotFoundComponent","route","params","routes","index","renderedElement","key","render","cloneElement","Slot","memo","Slot2","QualifiedSlot","DefaultNavigator","style","flex","getScopedSlotKey","layoutContextKey","useNamedSlot","scopedKey","slotState","activeRouteKey","isIntercepted","activeRouteNode","Component","NamedSlot","slotContent"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["StackRouter","useNavigationBuilder","React","SafeAreaView","useFilterScreenChildren","findNearestNotFoundRoute","findRouteNodeByPath","useNotFoundState","useContextKey","matchRoutePattern","stripGroupSegmentsFromPath","routeNode","globalRouteNode","initialPathname","registerProtectedRoutes","unregisterProtectedRoutes","useSortedScreens","getQualifiedRouteComponent","Screen","registerClearSlotStates","registerSetSlotState","Fragment","jsx","SLOT_STATIC_KEY","globalSlotState","Map","slotStateListeners","Set","getSlotState","slotName","get","setSlotState","state","delete","set","forEach","listener","clearAllSlotStates","clear","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","initialRouteName","screenOptions","children","router","contextKey","screens","otherSlot","protectedScreens","isCustomNavigator","sorted","length","console","warn","QualifiedNavigator","resolvedInitialRouteName","useMemo","browserPath","window","location","pathname","layoutUrlPrefix","replace","best","screen","name","props","fullPattern","match","specificity","navigation","descriptors","NavigationContent","id","descriptorsRef","useRef","current","value","Provider","useNavigatorContext","context","useContext","Error","useSlot","notFoundState","notFoundRouteNode","notFoundPath","originalPath","NotFoundComponent","route","params","routes","index","renderedElement","key","render","cloneElement","Slot","memo","Slot2","QualifiedSlot","DefaultNavigator","style","flex","getScopedSlotKey","layoutContextKey","useNamedSlot","scopedKey","slotState","activeRouteKey","isIntercepted","activeRouteNode","Component","NamedSlot","slotContent"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/views/Navigator.native.js

@@ -103,10 +103,6 @@ function QualifiedNavigator(param) {
     var browserPath = initialPathname !== null && initialPathname !== void 0 ? initialPathname : typeof window !== "undefined" ? window.location.pathname : void 0;
     if (!browserPath) return void 0;
     var layoutUrlPrefix = stripGroupSegmentsFromPath(contextKey).replace(/\/+$/, "");
-    var relativePath = browserPath;
-    if (layoutUrlPrefix && browserPath.startsWith(layoutUrlPrefix)) {
-      relativePath = browserPath.slice(layoutUrlPrefix.length) || "/";
-    }
     var best;
     var _iteratorNormalCompletion = true,
       _didIteratorError = false,
@@ -117,7 +113,8 @@ function QualifiedNavigator(param) {
         var _screen_props;
         var name = screen === null || screen === void 0 ? void 0 : (_screen_props = screen.props) === null || _screen_props === void 0 ? void 0 : _screen_props.name;
         if (!name) continue;
-        var match = matchRoutePattern(name, relativePath);
+        var fullPattern = layoutUrlPrefix ? `${layoutUrlPrefix}/${name}` : name;
+        var match = matchRoutePattern(fullPattern, browserPath);
         if (!match) continue;
         if (!best || match.specificity > best.specificity) {
           best = {

package/dist/esm/views/Navigator.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["jsx","_jsx","Fragment","_Fragment","StackRouter","useNavigationBuilder","React","SafeAreaView","useFilterScreenChildren","findNearestNotFoundRoute","findRouteNodeByPath","useNotFoundState","useContextKey","matchRoutePattern","stripGroupSegmentsFromPath","routeNode","globalRouteNode","initialPathname","registerProtectedRoutes","unregisterProtectedRoutes","useSortedScreens","getQualifiedRouteComponent","Screen","registerClearSlotStates","registerSetSlotState","SLOT_STATIC_KEY","globalSlotState","Map","slotStateListeners","Set","getSlotState","slotName","get","setSlotState","state","delete","set","forEach","listener","clearAllSlotStates","clear","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","param","initialRouteName","screenOptions","children","router","contextKey","screens","otherSlot","protectedScreens","isCustomNavigator","sorted","length","console","warn","QualifiedNavigator","resolvedInitialRouteName","useMemo","browserPath","window","location","pathname","layoutUrlPrefix","replace","relativePath","startsWith","slice","best","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","screen","value","_screen_props","name","props","match","specificity","err","return","navigation","descriptors","NavigationContent","id","descriptorsRef","useRef","current","Provider","useNavigatorContext","context","useContext","Error","useSlot","_ref","_descriptorsRef_current_current_key","notFoundState","notFoundRouteNode","notFoundPath","originalPath","NotFoundComponent","route","params","routes","index","renderedElement","key","render","cloneElement","Slot","memo","Slot2","QualifiedSlot","DefaultNavigator","style","flex"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["jsx","_jsx","Fragment","_Fragment","StackRouter","useNavigationBuilder","React","SafeAreaView","useFilterScreenChildren","findNearestNotFoundRoute","findRouteNodeByPath","useNotFoundState","useContextKey","matchRoutePattern","stripGroupSegmentsFromPath","routeNode","globalRouteNode","initialPathname","registerProtectedRoutes","unregisterProtectedRoutes","useSortedScreens","getQualifiedRouteComponent","Screen","registerClearSlotStates","registerSetSlotState","SLOT_STATIC_KEY","globalSlotState","Map","slotStateListeners","Set","getSlotState","slotName","get","setSlotState","state","delete","set","forEach","listener","clearAllSlotStates","clear","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","param","initialRouteName","screenOptions","children","router","contextKey","screens","otherSlot","protectedScreens","isCustomNavigator","sorted","length","console","warn","QualifiedNavigator","resolvedInitialRouteName","useMemo","browserPath","window","location","pathname","layoutUrlPrefix","replace","best","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","screen","value","_screen_props","name","props","fullPattern","match","specificity","err","return","navigation","descriptors","NavigationContent","id","descriptorsRef","useRef","current","Provider","useNavigatorContext","context","useContext","Error","useSlot","_ref","_descriptorsRef_current_current_key","notFoundState","notFoundRouteNode","notFoundPath","originalPath","NotFoundComponent","route","params","routes","index","renderedElement","key","render","cloneElement","Slot","memo","Slot2","QualifiedSlot","DefaultNavigator","style","flex"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"AACA,SAAAA,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA;AAAA,SAEEC,WAAA,EAAAC,oBAAA;AAAA,OACA,KAAAC,KAAA;AAAA,SACKC,YAAA;AACP,SAAAC,uBAAuB;AACvB,SAASC,wBAAoB,EAAAC,mBAAA,EAAAC,gBAAA;AAC7B,SAASC,aAAA,mCAA+B;AACxC,SAAAC,iBAAA,EAAAC,0BAAA;AAAA,SACEC,SAAA,IAAAC,eAAA,EAAAC,eAAA;AAAA,SACAC,uBAAA,EAAAC,yBAAA;AAAA,SACAC,gBAAA,EAAAC,0BAAA;AAAA,SACKC,MAAA;AACP,SAASC,uBAAqB,EAAAC,oBAAA;AAC9B,IAAAC,eAAS,wBAAmB;AAC5B,IAAAC,eAAS,GAAa,mBAAiBC,GAAA;AACvC,IAAAC,kBAAS,kBAAyB,IAAAC,GAAA;AAClC,SAASC,aAAAC,QAAkB;EAC3B,OAASL,eAAc,CAAAM,GAAA,CAAAD,QAAA;AAWvB;AA4HI,SAqSOE,YArSPA,CAAAF,QAAA,EAAAG,KAAA;EAlIJ,IAAMA,KAAA;IAqBNR,eAAM,CAAAS,MAAkB,CAAAJ,QAAA;EACxB,OAAM;IAECL,eAAS,CAAAU,GAAa,CAAAL,QAAyC,EAAAG,KAAA;EACpE;EACFN,kBAAA,CAAAS,OAAA,WAAAC,QAAA;IAEO,OAASA,QAAA;EACd;AACE;AAA+B,SAC1BC,mBAAA;EACLb,eAAA,CAAAc,KAAgB,CAAI;EACtBZ,kBAAA,CAAAS,OAAA,WAAAC,QAAA;IAEA,OAAAA,QAAA,EAAmB;EACrB;AAEO;AACLf,uBAAgB,CAAMgB,kBAAA;AACtBf,oBAAA,CAAmBS,YAAS;AAC9B,SAAAQ,yBAAA;EAGA,OAAAC,WAAA,IAAwBpC,KAAA,CAAAqC,UAAA,WAAkBC,CAAA;IAC1C,OAAAA,CAAA;EAEA;EACEtC,KAAA,CAAMuC,SAAG,aAAe;IAExBjB,kBAAgB,CAAAkB,GAAM,CAAAJ,WAAA;IACpB;MACAd,kBAAa,CAAAO,MAAA,CAAAO,WAAA;IACX;EAAqC,GACvC;AAAA;AAEJ,IAAAK,gBAAA,kBAAAzC,KAAA,CAAA0C,aAAA;AAGO,IAAAC,OAAM,CAAAC,GAAA,CAAAC,QAAA,KAAmB,YAAM;EAQtCJ,gBAAgB,CAAAK,WAAa,qBAAc;AACzC;AACF,SAAAC,UAAAC,KAAA;EAwBO;IAAAC,gBAAmB;IAAAC,aAAA;IAAAC,QAAA;IAAAC;EAAA,IAAAJ,KAAA;EACxB,IAAAK,UAAA,GAAA/C,aAAA;EACA;IAAAgD,OAAA;IAAAH,QAAA,EAAAI,SAAA;IAAAC;EAAA,IAAAtD,uBAAA,CAAAiD,QAAA;IACAM,iBAAA;IACAJ;EACF,CAAmB;EACjBzC,uBAAmB,CAAAyC,UAAc,EAAAG,gBAAA;EAGjCxD,KAAA,CAAMuC,SAAA;IACJ3B,uBAAA,CAAAyC,UAAA,EAAAG,gBAAA;IACA,mBAAU;MACV3C,yBAAA,CAAAwC,UAAA;IACF;EAAsC,GACpC,CACAA,UAAA,EACDG,gBAAA,CAID;EAEA,IAAAE,MAAM,GAAA5C,gBAAgB,CAAAwC,OAAA,aAAAA,OAAA,cAAAA,OAAA;IACpBE;EACA;EACE,KAAAE,MAAA,CAAAC,MAAA;IACFC,OAAA,CAAAC,IAAA,kBAAAR,UAAA;IACF,OAAI;EAEJ;EAEA,OAAK,eAAe1D,IAAA,CAAAmE,kBAAA;IAClBb,gBAAa;IACbC,aAAO;IACTI,OAAA,EAAAI,MAAA;IAEAL,UACE;IAACD,MAAA;IAAAD,QAAA,EAAAI;EAAA;AACC;AACA,SACAO,kBAASA,CAAAd,KAAA;EAAA,IACT;IAAAC,gBAAA;IAAAC,aAAA;IAAAC,QAAA;IAAAG,OAAA;IAAAD,UAAA;IAAAD,MAAA,GAAAtD;EAAA,IAAAkD,KAAA;EAAA,IACAe,wBAAA,GAAA/D,KAAA,CAAAgE,OAAA;IAAA,IAECf,gBAAA,SAAAA,gBAAA;IAAA,IAAAgB,WAAA,GAAAtD,eAAA,aAAAA,eAAA,cAAAA,eAAA,UAAAuD,MAAA,mBAAAA,MAAA,CAAAC,QAAA,CAAAC,QAAA;IACH,KAAAH,WAAA;IAEJ,IAAAI,eAAA,GAAA7D,0BAAA,CAAA6C,UAAA,EAAAiB,OAAA;IAEA,IAAAC,IAAS;IACP,IAAAC,yBAAA;MAAAC,iBAAA;MAAAC,cAAA;IACA;MACA,SAAAC,SAAA,GAAArB,OAAA,CAAAsB,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;QACA,IAAAS,MAAA,GAAAH,KAAA,CAAAI,KAAA;QACA,IAAAC,aAAA;QACA,IAASC,IAAA,GAAAH,MAAA,aAAAA,MAAA,wBAAAE,aAAA,GAAAF,MAAA,CAAAI,KAAA,cAAAF,aAAA,uBAAAA,aAAA,CAAAC,IAAA;QAC6D,KAAAA,IAAA;QAmBhE,IAAAE,WAAA,GAAAjB,eAAiC,MAAAA,eAAc,IAAAe,IAAA,KAAAA,IAAA;QAC/C,IAAAG,KAAA,GAAAhF,iBAAyB,CAAA+E,WAAA,EAAArB,WAAA;QAE7B,IAAM,CAAAsB,KAAA;QAGF,IAAC,CAAAhB,IAAA,IAAagB,KAAA,CAAAC,WAAO,GAAAjB,IAAA,CAAAiB,WAAA;UAcnBjB,IAAA;YAOFa,IAAA;YACJI,WAAW,EAAUD,KAAA,CAAAC;UACnB;QACA;MACA;IACA,SAAMC,GAAA;MACNhB,iBAAY;MACZC,cAAa,GAAAe,GAAM;IACjB;MACF;QACF,KAAAjB,yBAAA,IAAAG,SAAA,CAAAe,MAAA;UAEAf,SAAa,CAAAe,MAAA;QACX;MAEJ,UAAQ;QACN,IAAAjB,iBAAA;UACA,MAAAC,cAAA;QAAA;MAEE;IAAI;IACM,OACVH,IAAA,aAAAA,IAAA,uBAAAA,IAAA,CAAAa,IAAA;EAAA,IAEFnC,gBAAA,EACFK,OAAA,EAMAD,UAAM,CACN;EAEA;IAAMzB,KAAA;IAAA+D,UAAc;IAAAC,WAAc;IAAAC;EAAA,IAAA9F,oBAAA,CAAAqD,MAAA;IAChC;IAAO0C,EACL,EAAAzC,UAAA;IAAAF,QACA,EAAAG,OAAA;IAAAJ,aACA;IAAAD,gBACA,EAAAc;EAAA;EACA,IACFgC,cAAA,GAAA/F,KAAA,CAAAgG,MAAA,CAAAJ,WAAA;EACFG,cAAI,CAAAE,OAAY,GAAOL,WAAY;EAEnC,IAAAV,KACE,GAAAlF,KAAA,CAAAgE,OAAA,aAAC;IAIL;MAEOX,UAAS;MACdzB,KAAM;MACF+D,UAAU;MACZI,cAAgB;MAClB3C;IACA;EACF,IAEOC,UAAS,EACdzB,KAAM,EACN+D,UAAQ,EACRvC,MAAM,CAGN;EAKE,sBAAMzD,IAAA,CACJ8C,gBAAc,CAAAyD,QAAA;IAIhBhB,KAAI;IACF/B,QAAM,iBAAAxD,IAAoB,CAAAkG,iBAAA;MAC1B1C;IACF;EAIA;AAAO;AAGT,SAAKgD,mBAAcA,CAAA;EACjB,IAAAC,OAAO,GAAApG,KAAA,CAAAqG,UAAA,CAAA5D,gBAAA;EACT,KAAA2D,OAAA;IAEA,MAAM,IAAAE,KAAU,0DAAwB;EAExC;EACE,OAAAF,OAAO;AAAA;AAGT,SAAMG,QAAA;EAKN,IAAIC,IAAA;EACF,IAAAC,mCAA0B;EAAiB,IACzCL,OAAK,GAAGD,mBAAmB;EAAY,IACxC;IAAAvE,KAAA;IAAAmE;EAAA,IAAAK,OAAA;EACH,IAAAM,aAAA,GAAArG,gBAAA;EAEA,IAAAqG,aAAO;IACT,IAAAC,iBAAA,GAAAD,aAAA,CAAAC,iBAAA,IAAAvG,mBAAA,CAAAsG,aAAA,CAAAE,YAAA,EAAAlG,eAAA,KAAAP,wBAAA,CAAAuG,aAAA,CAAAG,YAAA,EAAAnG,eAAA;IAGO,IAAMiG,iBAAkB;MAC7B,IAAMG,iBAAa,GAAA/F,0BAAc,CAAA4F,iBAAA;MACjC,OAAM,eAAgBhH,IAAA,CAAAmH,iBAA2B;QAG7CC,KAAA,EAAS;UAEXC,MACE;QAIJ;MAEA,GAAO,sBAAC;IACT;IAEM,OAAS;EACd;EACF,KAAApF,KAAA,CAAAqF,MAAA;IAEO,OAAS;EACd;EAOF,IAAAhB,OAAA,GAAArE,KAAA,CAAAqF,MAAA,CAAArF,KAAA,CAAAsF,KAAA;EAEA,KAAAjB,OAAU;IACV,OAAU;EAGV;EAUO,IAAAkB,eAAS,IAAAX,IAAiB,IAAAC,mCAAqD,GAAAV,cAAA,CAAAE,OAAA,CAAAA,OAAA,CAAAmB,GAAA,eAAAX,mCAAA,uBAAAA,mCAAA,CAAAY,MAAA,gBAAAb,IAAA,cAAAA,IAAA;EACpF,IAAIW,eAAC,KAAkB,MAAO;IAC9B,OAAO,eAAGnH,KAAoB,CAAAsH,YAAQ,CAAAH,eAAA;MACxCC,GAAA,KAAAjG,eAAA,IAAA8E,OAAA,CAAAb,IAAA;IASO;EAKL;EAEA,OAAM+B,eAAY;AAClB;AAEA,IAAAI,IAAK,kBAAWvH,KAAA,CAAAwH,IAAmB,UAAUC,MAAApC,KAAA;EAE3C,IAAAhC,UAAO,GAAA/C,aAAA;EACT,IAAA8F,OAAA,GAAApG,KAAA,CAAAqG,UAAA,CAAA5D,gBAAA;EAGA,IAAI,CAAA2D,OAAA,KAAU,QAAAA,OAAiB,uBAAAA,OAAA,CAAA/C,UAAA,MAAAA,UAAA;IAC7B,OAAM,eAAY1D,IAAA,CAAAoD,SAAA;MAElB,GAAAsC,KACE;MAAClC,QAAA,iBAAAxD,IAAA,CAAA+H,aAAA;IAAA;EAAA;EAEyC,sBAAA/H,IAAA,CAAA+H,aAAA;AAAA;AADzB,SAEjBA,cAAA;EAEJ,OAAAnB,OAAA;AAEA;AACF,SAAAoB,iBAAA;EAmBO,OAAS,eAAUhI,IAAA,CAAAM,YAAA;IACxB2H,KAAA;MACAC,IAAA;IACA;IAQC1E,QAAA,iBAAAxD,IAAA,CAAAoD,SAAA;MACDI,QAAM,iBAAcxD,IAAa,CAAA+H,aAAM;IAEvC;EACE;AAAsB;AAIxB3E,SAAO,CAAAwE,IAAA,GAAAA,IAAA;AACTxE,SAAA,CAAAsD,UAAA,GAAAF,mBAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.15.1",
+  "version": "1.15.2",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -165,17 +165,17 @@
     "@react-navigation/routers": "~7.5.3",
     "@swc/core": "^1.14.0",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "1.15.1",
-    "@vxrn/compiler": "1.15.1",
-    "@vxrn/resolve": "1.15.1",
-    "@vxrn/tslib-lite": "1.15.1",
-    "@vxrn/use-isomorphic-layout-effect": "1.15.1",
-    "@vxrn/vite-plugin-metro": "1.15.1",
+    "@vxrn/color-scheme": "1.15.2",
+    "@vxrn/compiler": "1.15.2",
+    "@vxrn/resolve": "1.15.2",
+    "@vxrn/tslib-lite": "1.15.2",
+    "@vxrn/use-isomorphic-layout-effect": "1.15.2",
+    "@vxrn/vite-plugin-metro": "1.15.2",
     "babel-dead-code-elimination": "1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.15.1",
+    "create-vxrn": "1.15.2",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~55.0.7",
     "expo-modules-core": "~55.0.16",
@@ -195,7 +195,7 @@
     "ts-pattern": "^5.6.2",
     "use-latest-callback": "^0.2.3",
     "vite": "^8.0.0",
-    "vxrn": "1.15.1",
+    "vxrn": "1.15.2",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },

package/src/views/Navigator.tsx

@@ -198,27 +198,31 @@ function QualifiedNavigator({
       (typeof window !== 'undefined' ? window.location.pathname : undefined)
     if (!browserPath) return undefined
 
-    // screen names are relative to this navigator's parent layout, so we
-    // need to strip the parent layout's URL prefix from browserPath before
-    // matching. contextKey is the layout's path (including group segments),
-    // e.g. `/hooks/cases/route-group-pathname/(tabs)` — we strip groups
-    // to get the URL-relevant prefix and remove it from browserPath.
+    // screen names are relative to this navigator's parent layout. rather
+    // than trying to strip the layout prefix from browserPath (which fails
+    // when the layout path contains dynamic segments like
+    // /project/[projectId] — a literal startsWith won't match `/project/foo`),
+    // prepend the layout prefix to each screen name and match the full
+    // pattern against browserPath. matchRoutePattern handles dynamic segments
+    // segment-by-segment, so both the prefix and the screen-relative suffix
+    // resolve correctly.
+    //
+    // contextKey is the layout's path including group segments, e.g.
+    // `/(app)/project/[projectId]` or `/hooks/cases/route-group-pathname/(tabs)`.
+    // stripping groups gives the URL-relevant prefix the screens live under.
     const layoutUrlPrefix = stripGroupSegmentsFromPath(contextKey).replace(/\/+$/, '')
-    let relativePath = browserPath
-    if (layoutUrlPrefix && browserPath.startsWith(layoutUrlPrefix)) {
-      relativePath = browserPath.slice(layoutUrlPrefix.length) || '/'
-    }
 
-    // score each screen by how specifically its pattern matches the URL.
-    // screen names may contain dynamic segments `[param]`/`[...param]`.
-    // `matchRoutePattern` does a prefix match so layout screens (like
+    // score each screen by how specifically its full pattern matches the
+    // URL. screen names may contain dynamic segments `[param]`/`[...param]`.
+    // matchRoutePattern does a prefix match so layout screens (like
     // `project`) can match deeper URLs; the specificity score then tiebreaks
     // to pick the best leaf.
     let best: { name: string; specificity: number } | undefined
     for (const screen of screens) {
       const name = (screen as any)?.props?.name
       if (!name) continue
-      const match = matchRoutePattern(name, relativePath)
+      const fullPattern = layoutUrlPrefix ? `${layoutUrlPrefix}/${name}` : name
+      const match = matchRoutePattern(fullPattern, browserPath)
       if (!match) continue
       if (!best || match.specificity > best.specificity) {
         best = { name, specificity: match.specificity }

package/types/views/Navigator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Navigator.d.ts","sourceRoot":"","sources":["../../src/views/Navigator.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Navigator.d.ts","sourceRoot":"","sources":["../../src/views/Navigator.tsx"],"names":[],"mappings":"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"}