expo-router 58.0.16 → 58.0.18

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'expo.modules.router'
-version = '58.0.16'
+version = '58.0.18'
 
 android {
   namespace "expo.modules.router"
   defaultConfig {
     versionCode 1
-    versionName "58.0.16"
+    versionName "58.0.18"
   }
   lintOptions {
     abortOnError false

package/build/ExpoRoot.js

@@ -113,27 +113,24 @@ const INITIAL_METRICS = _reactnative().Platform.OS === 'web' || isTestEnv ? {
 } : undefined;
 function ExpoRoot({ wrapper: ParentWrapper = _react().Fragment, ...props }) {
     (0, _screensFeatureFlags.initScreensFeatureFlags)();
-    /*
-   * Due to static rendering we need to wrap these top level views in second wrapper
-   * View's like <SafeAreaProvider /> generate a <div> so if the parent wrapper
-   * is a HTML document, we need to ensure its inside the <body>
-   */ const wrapper = (0, _react().useMemo)(()=>({ children })=>{
-            return /*#__PURE__*/ (0, _jsxruntime().jsx)(ParentWrapper, {
-                children: /*#__PURE__*/ (0, _jsxruntime().jsx)(_LinkPreviewContext.LinkPreviewContextProvider, {
-                    children: /*#__PURE__*/ (0, _jsxruntime().jsx)(_reactnativesafeareacontext().SafeAreaProvider, {
-                        // SSR support
-                        initialMetrics: INITIAL_METRICS,
-                        children: children
-                    })
-                })
-            });
-        }, [
-        ParentWrapper
-    ]);
-    return /*#__PURE__*/ (0, _jsxruntime().jsx)(_routingQueueContext.RoutingQueueProvider, {
-        children: /*#__PURE__*/ (0, _jsxruntime().jsx)(ContextNavigator, {
-            ...props,
-            wrapper: wrapper
+    // On the server, the parent wrapper renders the HTML document and `<div id="root">`. It stays
+    // outside the navigation container, so the container's Suspense boundary is inside `#root`
+    // like in the browser.
+    return /*#__PURE__*/ (0, _jsxruntime().jsx)(ParentWrapper, {
+        children: /*#__PURE__*/ (0, _jsxruntime().jsx)(_routingQueueContext.RoutingQueueProvider, {
+            children: /*#__PURE__*/ (0, _jsxruntime().jsx)(ContextNavigator, {
+                ...props,
+                wrapper: AppWrapper
+            })
+        })
+    });
+}
+function AppWrapper({ children }) {
+    return /*#__PURE__*/ (0, _jsxruntime().jsx)(_LinkPreviewContext.LinkPreviewContextProvider, {
+        children: /*#__PURE__*/ (0, _jsxruntime().jsx)(_reactnativesafeareacontext().SafeAreaProvider, {
+            // SSR support
+            initialMetrics: INITIAL_METRICS,
+            children: children
         })
     });
 }

package/build/ExpoRoot.js.map

@@ -1 +1 @@
-{"version":3,"sources":["ExpoRoot.tsx"],"sourcesContent":[null],"names":["ExpoRoot","isTestEnv","process","env","NODE_ENV","INITIAL_METRICS","Platform","OS","frame","x","y","width","height","insets","top","left","right","bottom","undefined","wrapper","ParentWrapper","Fragment","props","initScreensFeatureFlags","useMemo","children","LinkPreviewContextProvider","SafeAreaProvider","initialMetrics","RoutingQueueProvider","ContextNavigator","initialUrl","window","URL","location","href","context","initialLocation","WrapperComponent","linking","serverUrl","url","parseUrlUsingCustomBase","pathname","search","hash","routerConfig","rootComponent","useRouterConfig","linkingConfig","routeNode","useDomComponentNavigation","SplashScreen","hideAsync","Tutorial","require","RouterConfigContext","Provider","value","RemovalPreventionProvider","UpstreamNavigationContainer","ref","navigationRef","Content","Screen","name","INTERNAL_SLOT_NAME","component","shouldAppendNotFound","push","NOT_FOUND_ROUTE_NAME","RootUnmatched","shouldAppendSitemap","SITEMAP_ROUTE_NAME","Sitemap","state","descriptors","NavigationContent","useNavigationBuilder","StackRouter","id","useEffect","maybeHideSplashScreen","routes","index","key","render"],"mappings":"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"}
+{"version":3,"sources":["ExpoRoot.tsx"],"sourcesContent":[null],"names":["ExpoRoot","isTestEnv","process","env","NODE_ENV","INITIAL_METRICS","Platform","OS","frame","x","y","width","height","insets","top","left","right","bottom","undefined","wrapper","ParentWrapper","Fragment","props","initScreensFeatureFlags","RoutingQueueProvider","ContextNavigator","AppWrapper","children","LinkPreviewContextProvider","SafeAreaProvider","initialMetrics","initialUrl","window","URL","location","href","context","initialLocation","WrapperComponent","linking","serverUrl","useMemo","url","parseUrlUsingCustomBase","pathname","search","hash","routerConfig","rootComponent","useRouterConfig","linkingConfig","routeNode","useDomComponentNavigation","SplashScreen","hideAsync","Tutorial","require","RouterConfigContext","Provider","value","RemovalPreventionProvider","UpstreamNavigationContainer","ref","navigationRef","Content","Screen","name","INTERNAL_SLOT_NAME","component","shouldAppendNotFound","push","NOT_FOUND_ROUTE_NAME","RootUnmatched","shouldAppendSitemap","SITEMAP_ROUTE_NAME","Sitemap","state","descriptors","NavigationContent","useNavigationBuilder","StackRouter","id","useEffect","maybeHideSplashScreen","routes","index","key","render"],"mappings":"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"}

package/build/Route.d.ts

@@ -1,6 +1,5 @@
 import type { GenerateMetadataFunction, LoaderFunction } from 'expo-server';
 import { type ComponentType, type PropsWithChildren } from 'react';
-import type { PartialRoute, Route as NavigationRoute } from './react-navigation/routers';
 import { sortRoutesWithInitial, sortRoutes } from './sortRoutes';
 import type { SuspenseFallbackProps } from './views/SuspenseFallback';
 import type { ErrorBoundaryProps } from './views/Try';
@@ -34,8 +33,8 @@ export type RouteNode = {
     type: 'route' | 'api' | 'layout' | 'redirect' | 'rewrite';
     /** Load a route into memory. Returns the exports from a route. */
     loadRoute: () => LoadedRoute;
-    /** Loaded initial route name. */
-    initialRouteName?: string;
+    /** Last group in the layout path. Selects group-specific `unstable_settings` and the default anchor. */
+    groupName?: string;
     /** Nested routes */
     children: RouteNode[];
     /** Is the route a dynamic path */
@@ -68,13 +67,6 @@ export declare const ScreenErrorBoundaryContext: import("react").Context<Compone
 export declare const LocalRouteParamsContext: import("react").Context<object | undefined>;
 /** Return the RouteNode at the current contextual boundary. */
 export declare function useRouteNode(): RouteNode | null;
-export declare function findRouteNodeByName(node: RouteNode | null | undefined, name: string | undefined): RouteNode | undefined;
-export declare function findRouteNodeAndParamsForState(node: RouteNode | null | undefined, state: PartialRoute<NavigationRoute<string>>['state']): {
-    routeNode: RouteNode | undefined;
-    params: Record<string, unknown>;
-};
-export declare function getValidInitialRoute(node: RouteNode | null, initialRouteName?: string | undefined, groupName?: string): RouteNode | undefined;
-export declare const getValidInitialRouteName: (node: RouteNode | null, initialRouteName?: string | undefined) => string | undefined;
 export declare function useContextKey(): string;
 export type RouteProps = PropsWithChildren<{
     node: RouteNode;

package/build/Route.js

@@ -8,10 +8,6 @@ Object.defineProperty(exports, "__esModule", {
     Route: null,
     ScreenErrorBoundaryContext: null,
     SuspenseFallbackContext: null,
-    findRouteNodeAndParamsForState: null,
-    findRouteNodeByName: null,
-    getValidInitialRoute: null,
-    getValidInitialRouteName: null,
     sortRoutes: null,
     sortRoutesWithInitial: null,
     useContextKey: null,
@@ -36,18 +32,6 @@ _export(exports, {
     get SuspenseFallbackContext () {
         return SuspenseFallbackContext;
     },
-    get findRouteNodeAndParamsForState () {
-        return findRouteNodeAndParamsForState;
-    },
-    get findRouteNodeByName () {
-        return findRouteNodeByName;
-    },
-    get getValidInitialRoute () {
-        return getValidInitialRoute;
-    },
-    get getValidInitialRouteName () {
-        return getValidInitialRouteName;
-    },
     get sortRoutes () {
         return _sortRoutes.sortRoutes;
     },
@@ -87,40 +71,6 @@ if (process.env.NODE_ENV !== 'production') {
 function useRouteNode() {
     return (0, _react().use)(CurrentRouteContext);
 }
-function findRouteNodeByName(node, name) {
-    return node?.children.find((child)=>child.route === name);
-}
-function findRouteNodeAndParamsForState(node, state) {
-    const params = {};
-    if (!state) {
-        return {
-            routeNode: undefined,
-            params
-        };
-    }
-    let routeNode = node ?? undefined;
-    while(state){
-        const route = state.routes[state.index ?? state.routes.length - 1];
-        Object.assign(params, route?.params);
-        routeNode = findRouteNodeByName(routeNode, route?.name);
-        state = route?.state;
-    }
-    return {
-        routeNode,
-        params
-    };
-}
-function getValidInitialRoute(node, initialRouteName = node?.initialRouteName, groupName) {
-    if (!node || !initialRouteName) {
-        return undefined;
-    }
-    const route = findRouteNodeByName(node, initialRouteName) || findRouteNodeByName(node, `${initialRouteName}/index`);
-    if (!route) {
-        throw new Error(`The initial route name "${initialRouteName}"${groupName ? ` for group "${groupName}"` : ''} was not found in the layout at "${node.contextKey}". ` + `Available routes are: ${node.children.map(({ route })=>`"${route}"`).join(', ')}. ` + 'Set `unstable_settings.anchor` to the name of a route in this layout.');
-    }
-    return route;
-}
-const getValidInitialRouteName = (node, initialRouteName = node?.initialRouteName)=>getValidInitialRoute(node, initialRouteName)?.route;
 function useContextKey() {
     const node = useRouteNode();
     if (node == null) {

package/build/Route.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Route.tsx"],"sourcesContent":[null],"names":["LocalRouteParamsContext","Route","ScreenErrorBoundaryContext","SuspenseFallbackContext","findRouteNodeAndParamsForState","findRouteNodeByName","getValidInitialRoute","getValidInitialRouteName","sortRoutes","sortRoutesWithInitial","useContextKey","useRouteNode","CurrentRouteContext","createContext","undefined","process","env","NODE_ENV","displayName","use","node","name","children","find","child","route","state","params","routeNode","routes","index","length","Object","assign","initialRouteName","groupName","Error","contextKey","map","join","getContextKey","Provider","value"],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;QA6EaA;eAAAA;;QA+EGC;eAAAA;;QAlFHC;eAAAA;;QAJAC;eAAAA;;QAyBGC;eAAAA;;QAPAC;eAAAA;;QA4BAC;eAAAA;;QAqBHC;eAAAA;;QA2BmBC;eAAAA,sBAAU;;QAAjCC;eAAAA,iCAAqB;;QAtBdC;eAAAA;;QA1DAC;eAAAA;;;;;;;;;;;yBAjF+D;;;;;;0BAEjD;4BAEoB;AA6DlD,MAAMC,oCAAsBC,IAAAA,sBAAa,EAAmB;AAErD,MAAMV,wCAA0BU,IAAAA,sBAAa,EAElDC;AAEK,MAAMZ,2CAA6BW,IAAAA,sBAAa,EAErDC;AACK,MAAMd,wCAA0Ba,IAAAA,sBAAa,EAAqB,CAAC;AAE1E,IAAIE,QAAQC,GAAG,CAACC,QAAQ,KAAK,cAAc;IACzCL,oBAAoBM,WAAW,GAAG;AACpC;AAGO,SAASP;IACd,OAAOQ,IAAAA,YAAG,EAACP;AACb;AAEO,SAASP,oBACde,IAAkC,EAClCC,IAAwB;IAExB,OAAOD,MAAME,SAASC,KAAK,CAACC,QAAUA,MAAMC,KAAK,KAAKJ;AACxD;AAEO,SAASjB,+BACdgB,IAAkC,EAClCM,KAAqD;IAErD,MAAMC,SAAkC,CAAC;IACzC,IAAI,CAACD,OAAO;QACV,OAAO;YAAEE,WAAWd;YAAWa;QAAO;IACxC;IACA,IAAIC,YAAYR,QAAQN;IAExB,MAAOY,MAAO;QACZ,MAAMD,QACJC,MAAMG,MAAM,CAACH,MAAMI,KAAK,IAAIJ,MAAMG,MAAM,CAACE,MAAM,GAAG,EAAE;QACtDC,OAAOC,MAAM,CAACN,QAAQF,OAAOE;QAC7BC,YAAYvB,oBAAoBuB,WAAWH,OAAOJ;QAClDK,QAAQD,OAAOC;IACjB;IAEA,OAAO;QAAEE;QAAWD;IAAO;AAC7B;AAEO,SAASrB,qBACdc,IAAsB,EACtBc,mBAAmBd,MAAMc,gBAAgB,EACzCC,SAAkB;IAElB,IAAI,CAACf,QAAQ,CAACc,kBAAkB;QAC9B,OAAOpB;IACT;IACA,MAAMW,QACJpB,oBAAoBe,MAAMc,qBAC1B7B,oBAAoBe,MAAM,GAAGc,iBAAiB,MAAM,CAAC;IACvD,IAAI,CAACT,OAAO;QACV,MAAM,IAAIW,MACR,CAAC,wBAAwB,EAAEF,iBAAiB,CAAC,EAAEC,YAAY,CAAC,YAAY,EAAEA,UAAU,CAAC,CAAC,GAAG,GAAG,iCAAiC,EAAEf,KAAKiB,UAAU,CAAC,GAAG,CAAC,GACjJ,CAAC,sBAAsB,EAAEjB,KAAKE,QAAQ,CAACgB,GAAG,CAAC,CAAC,EAAEb,KAAK,EAAE,GAAK,CAAC,CAAC,EAAEA,MAAM,CAAC,CAAC,EAAEc,IAAI,CAAC,MAAM,EAAE,CAAC,GACtF;IAEN;IACA,OAAOd;AACT;AAEO,MAAMlB,2BAA2B,CACtCa,MACAc,mBAAmBd,MAAMc,gBAAgB,GACtC5B,qBAAqBc,MAAMc,mBAAmBT;AAE5C,SAASf;IACd,MAAMU,OAAOT;IACb,IAAIS,QAAQ,MAAM;QAChB,MAAM,IAAIgB,MAAM;IAClB;IACA,OAAOI,IAAAA,uBAAa,EAACpB,KAAKiB,UAAU;AACtC;AAQO,SAASpC,MAAM,EAAEqB,QAAQ,EAAEF,IAAI,EAAEO,MAAM,EAAc;IAC1D,qBACE,uBAAC3B,wBAAwByC,QAAQ;QAACC,OAAOf;kBACvC,cAAA,uBAACf,oBAAoB6B,QAAQ;YAACC,OAAOtB;sBAAOE;;;AAGlD"}
+{"version":3,"sources":["Route.tsx"],"sourcesContent":[null],"names":["LocalRouteParamsContext","Route","ScreenErrorBoundaryContext","SuspenseFallbackContext","sortRoutes","sortRoutesWithInitial","useContextKey","useRouteNode","CurrentRouteContext","createContext","undefined","process","env","NODE_ENV","displayName","use","node","Error","getContextKey","contextKey","children","params","Provider","value"],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;QA4EaA;eAAAA;;QAyBGC;eAAAA;;QA5BHC;eAAAA;;QAJAC;eAAAA;;QAwCmBC;eAAAA,sBAAU;;QAAjCC;eAAAA,iCAAqB;;QAtBdC;eAAAA;;QAJAC;eAAAA;;;;;;;;;;;yBAhF+D;;;;;;0BAEjD;4BACoB;AA6DlD,MAAMC,oCAAsBC,IAAAA,sBAAa,EAAmB;AAErD,MAAMN,wCAA0BM,IAAAA,sBAAa,EAElDC;AAEK,MAAMR,2CAA6BO,IAAAA,sBAAa,EAErDC;AACK,MAAMV,wCAA0BS,IAAAA,sBAAa,EAAqB,CAAC;AAE1E,IAAIE,QAAQC,GAAG,CAACC,QAAQ,KAAK,cAAc;IACzCL,oBAAoBM,WAAW,GAAG;AACpC;AAGO,SAASP;IACd,OAAOQ,IAAAA,YAAG,EAACP;AACb;AAEO,SAASF;IACd,MAAMU,OAAOT;IACb,IAAIS,QAAQ,MAAM;QAChB,MAAM,IAAIC,MAAM;IAClB;IACA,OAAOC,IAAAA,uBAAa,EAACF,KAAKG,UAAU;AACtC;AAQO,SAASlB,MAAM,EAAEmB,QAAQ,EAAEJ,IAAI,EAAEK,MAAM,EAAc;IAC1D,qBACE,uBAACrB,wBAAwBsB,QAAQ;QAACC,OAAOF;kBACvC,cAAA,uBAACb,oBAAoBc,QAAQ;YAACC,OAAOP;sBAAOI;;;AAGlD"}

package/build/fork/NavigationContainer.js

@@ -36,7 +36,6 @@ const _getPathFromState = require("./getPathFromState");
 const _getStateFromPath = require("./getStateFromPath");
 const _useBackButton = require("./useBackButton");
 const _useLinking = require("./useLinking");
-const _useThenable = require("./useThenable");
 const _validatePathConfig = require("./validatePathConfig");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -70,11 +69,39 @@ globalThis.REACT_NAVIGATION_DEVTOOLS = new WeakMap();
         }), [
         linking
     ]);
+    // Kept outside the Suspense boundary so a retry after loading reads the same promise.
+    const [initialState] = _react().default.useState(getInitialState);
+    return /*#__PURE__*/ (0, _jsxruntime().jsx)(_react().default.Suspense, {
+        fallback: /*#__PURE__*/ (0, _jsxruntime().jsx)(_native.ThemeProvider, {
+            value: theme,
+            children: fallback
+        }),
+        children: /*#__PURE__*/ (0, _jsxruntime().jsx)(_native.LocaleDirContext.Provider, {
+            value: direction,
+            children: /*#__PURE__*/ (0, _jsxruntime().jsx)(_native.LinkingContext.Provider, {
+                value: linkingContext,
+                children: /*#__PURE__*/ (0, _jsxruntime().jsx)(InitialStateNavigationContainer, {
+                    ...rest,
+                    initialState: initialState,
+                    linking: linking,
+                    theme: theme,
+                    routeNode: routerConfig?.routeNode ?? undefined,
+                    containerRef: refContainer,
+                    ref: ref
+                })
+            })
+        })
+    });
+}
+function InitialStateNavigationContainer({ initialState: initialStateOrPromise, linking, routeNode, containerRef, ref, ...rest }) {
+    const initialState = isThenable(initialStateOrPromise) ? _react().default.use(initialStateOrPromise) : initialStateOrPromise;
+    // Set here, not in the parent, so the ref is set once the container mounts after waiting.
+    _react().default.useImperativeHandle(ref, ()=>containerRef.current);
     // Add additional linking related info to the ref
     // This will be used by the devtools
     _react().default.useEffect(()=>{
-        if (refContainer.current) {
-            REACT_NAVIGATION_DEVTOOLS.set(refContainer.current, {
+        if (containerRef.current) {
+            REACT_NAVIGATION_DEVTOOLS.set(containerRef.current, {
                 get linking () {
                     return {
                         ...linking,
@@ -86,33 +113,19 @@ globalThis.REACT_NAVIGATION_DEVTOOLS = new WeakMap();
             });
         }
     });
-    const [isResolved, initialState] = (0, _useThenable.useThenable)(getInitialState);
-    _react().default.useImperativeHandle(ref, ()=>refContainer.current);
-    if (!isResolved) {
-        // This is temporary until we have Suspense for data-fetching
-        // Then the fallback will be handled by a parent `Suspense` component
-        return /*#__PURE__*/ (0, _jsxruntime().jsx)(_native.ThemeProvider, {
-            value: theme,
-            children: fallback
-        });
-    }
     if (initialState === undefined) {
         throw new Error('Linking did not produce an initial navigation state. Expo Router always seeds a complete initial state before rendering the navigation container, so this is most likely a bug in expo-router. Please report it at https://github.com/expo/expo/issues.');
     }
-    return /*#__PURE__*/ (0, _jsxruntime().jsx)(_native.LocaleDirContext.Provider, {
-        value: direction,
-        children: /*#__PURE__*/ (0, _jsxruntime().jsx)(_native.LinkingContext.Provider, {
-            value: linkingContext,
-            children: /*#__PURE__*/ (0, _jsxruntime().jsx)(_BaseNavigationContainer.BaseNavigationContainer, {
-                ...rest,
-                theme: theme,
-                initialState: initialState,
-                UNSTABLE_routeNode: routerConfig?.routeNode ?? undefined,
-                ref: refContainer
-            })
-        })
+    return /*#__PURE__*/ (0, _jsxruntime().jsx)(_BaseNavigationContainer.BaseNavigationContainer, {
+        ...rest,
+        initialState: initialState,
+        UNSTABLE_routeNode: routeNode,
+        ref: containerRef
     });
 }
+function isThenable(value) {
+    return typeof value === 'object' && value !== null && 'then' in value && typeof value.then === 'function';
+}
 const NavigationContainer = NavigationContainerInner;
 
 //# sourceMappingURL=NavigationContainer.js.map

package/build/fork/NavigationContainer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["fork/NavigationContainer.tsx"],"sourcesContent":[null],"names":["NavigationContainer","globalThis","REACT_NAVIGATION_DEVTOOLS","WeakMap","NavigationContainerInner","direction","I18nManager","getConstants","isRTL","theme","DefaultTheme","linking","fallback","ref","rest","routerConfig","React","use","RouterConfigContext","config","validatePathConfig","refContainer","useRef","useBackButton","getInitialState","useLinking","prefixes","linkingContext","useMemo","options","useEffect","current","set","getStateFromPath","getPathFromState","isResolved","initialState","useThenable","useImperativeHandle","ThemeProvider","value","undefined","Error","LocaleDirContext","Provider","LinkingContext","BaseNavigationContainer","UNSTABLE_routeNode","routeNode"],"mappings":";;;;+BA8HaA;;;eAAAA;;;;;;;;;;;gEA9HK;;;;;;;yBACU;;;;;;qCAEQ;yCACI;wBAajC;kCAC0B;kCACA;+BACH;4BACH;6BACC;oCACO;;;;;;AAUnCC,WAAWC,yBAAyB,GAAG,IAAIC;AAQ3C;;;;;;;;;;CAUC,GACD,SAASC,yBAAyB,EAChCC,YAAYC,0BAAW,CAACC,YAAY,GAAGC,KAAK,GAAG,QAAQ,KAAK,EAC5DC,QAAQC,oBAAY,EACpBC,OAAO,EACPC,WAAW,IAAI,EACfC,GAAG,EACH,GAAGC,MAGJ;IACC,MAAMC,eAAeC,gBAAK,CAACC,GAAG,CAACC,wCAAmB;IAElD,IAAIP,SAASQ,QAAQ;QACnBC,IAAAA,sCAAkB,EAACT,QAAQQ,MAAM;IACnC;IAEA,MAAME,eAAeL,gBAAK,CAACM,MAAM,CAA+C;IAEhFC,IAAAA,4BAAa,EAACF;IAEd,MAAM,EAAEG,eAAe,EAAE,GAAGC,IAAAA,sBAAU,EAACJ,cAAc;QACnDK,UAAU,EAAE;QACZ,GAAGf,OAAO;IACZ;IAEA,MAAMgB,iBAAiBX,gBAAK,CAACY,OAAO,CAAC,IAAO,CAAA;YAAEC,SAASlB;QAAQ,CAAA,GAAI;QAACA;KAAQ;IAC5E,iDAAiD;IACjD,oCAAoC;IACpCK,gBAAK,CAACc,SAAS,CAAC;QACd,IAAIT,aAAaU,OAAO,EAAE;YACxB7B,0BAA0B8B,GAAG,CAACX,aAAaU,OAAO,EAAE;gBAClD,IAAIpB,WAAU;oBACZ,OAAO;wBACL,GAAGA,OAAO;wBACVe,UAAUf,SAASe,YAAY,EAAE;wBACjCO,kBAAkBtB,SAASsB,oBAAoBA,kCAAgB;wBAC/DC,kBAAkBvB,SAASuB,oBAAoBA,kCAAgB;oBACjE;gBACF;YACF;QACF;IACF;IAEA,MAAM,CAACC,YAAYC,aAAa,GAAGC,IAAAA,wBAAW,EAACb;IAC/CR,gBAAK,CAACsB,mBAAmB,CAACzB,KAAK,IAAMQ,aAAaU,OAAO;IAEzD,IAAI,CAACI,YAAY;QACf,6DAA6D;QAC7D,qEAAqE;QACrE,qBAAO,uBAACI,qBAAa;YAACC,OAAO/B;sBAAQG;;IACvC;IAEA,IAAIwB,iBAAiBK,WAAW;QAC9B,MAAM,IAAIC,MACR;IAEJ;IAEA,qBACE,uBAACC,wBAAgB,CAACC,QAAQ;QAACJ,OAAOnC;kBAChC,cAAA,uBAACwC,sBAAc,CAACD,QAAQ;YAACJ,OAAOb;sBAC9B,cAAA,uBAACmB,gDAAuB;gBACrB,GAAGhC,IAAI;gBACRL,OAAOA;gBACP2B,cAAcA;gBACdW,oBAAoBhC,cAAciC,aAAaP;gBAC/C5B,KAAKQ;;;;AAKf;AAGO,MAAMrB,sBAAsBI"}
+{"version":3,"sources":["fork/NavigationContainer.tsx"],"sourcesContent":[null],"names":["NavigationContainer","globalThis","REACT_NAVIGATION_DEVTOOLS","WeakMap","NavigationContainerInner","direction","I18nManager","getConstants","isRTL","theme","DefaultTheme","linking","fallback","ref","rest","routerConfig","React","use","RouterConfigContext","config","validatePathConfig","refContainer","useRef","useBackButton","getInitialState","useLinking","prefixes","linkingContext","useMemo","options","initialState","useState","Suspense","ThemeProvider","value","LocaleDirContext","Provider","LinkingContext","InitialStateNavigationContainer","routeNode","undefined","containerRef","initialStateOrPromise","isThenable","useImperativeHandle","current","useEffect","set","getStateFromPath","getPathFromState","Error","BaseNavigationContainer","UNSTABLE_routeNode","then"],"mappings":";;;;+BAkKaA;;;eAAAA;;;;;;;;;;;gEAlKK;;;;;;;yBACU;;;;;;qCAGQ;yCACI;wBAcjC;kCAC0B;kCACA;+BACH;4BACH;oCACQ;;;;;;AAUnCC,WAAWC,yBAAyB,GAAG,IAAIC;AAQ3C;;;;;;;;;;CAUC,GACD,SAASC,yBAAyB,EAChCC,YAAYC,0BAAW,CAACC,YAAY,GAAGC,KAAK,GAAG,QAAQ,KAAK,EAC5DC,QAAQC,oBAAY,EACpBC,OAAO,EACPC,WAAW,IAAI,EACfC,GAAG,EACH,GAAGC,MAGJ;IACC,MAAMC,eAAeC,gBAAK,CAACC,GAAG,CAACC,wCAAmB;IAElD,IAAIP,SAASQ,QAAQ;QACnBC,IAAAA,sCAAkB,EAACT,QAAQQ,MAAM;IACnC;IAEA,MAAME,eAAeL,gBAAK,CAACM,MAAM,CAA+C;IAEhFC,IAAAA,4BAAa,EAACF;IAEd,MAAM,EAAEG,eAAe,EAAE,GAAGC,IAAAA,sBAAU,EAACJ,cAAc;QACnDK,UAAU,EAAE;QACZ,GAAGf,OAAO;IACZ;IAEA,MAAMgB,iBAAiBX,gBAAK,CAACY,OAAO,CAAC,IAAO,CAAA;YAAEC,SAASlB;QAAQ,CAAA,GAAI;QAACA;KAAQ;IAC5E,sFAAsF;IACtF,MAAM,CAACmB,aAAa,GAAGd,gBAAK,CAACe,QAAQ,CAACP;IAEtC,qBACE,uBAACR,gBAAK,CAACgB,QAAQ;QAACpB,wBAAU,uBAACqB,qBAAa;YAACC,OAAOzB;sBAAQG;;kBACtD,cAAA,uBAACuB,wBAAgB,CAACC,QAAQ;YAACF,OAAO7B;sBAChC,cAAA,uBAACgC,sBAAc,CAACD,QAAQ;gBAACF,OAAOP;0BAC9B,cAAA,uBAACW;oBACE,GAAGxB,IAAI;oBACRgB,cAAcA;oBACdnB,SAASA;oBACTF,OAAOA;oBACP8B,WAAWxB,cAAcwB,aAAaC;oBACtCC,cAAcpB;oBACdR,KAAKA;;;;;AAMjB;AAEA,SAASyB,gCAAgC,EACvCR,cAAcY,qBAAqB,EACnC/B,OAAO,EACP4B,SAAS,EACTE,YAAY,EACZ5B,GAAG,EACH,GAAGC,MAOJ;IACC,MAAMgB,eAAea,WAAWD,yBAC5B1B,gBAAK,CAACC,GAAG,CAACyB,yBACVA;IACJ,0FAA0F;IAC1F1B,gBAAK,CAAC4B,mBAAmB,CAAC/B,KAAK,IAAM4B,aAAaI,OAAO;IACzD,iDAAiD;IACjD,oCAAoC;IACpC7B,gBAAK,CAAC8B,SAAS,CAAC;QACd,IAAIL,aAAaI,OAAO,EAAE;YACxB3C,0BAA0B6C,GAAG,CAACN,aAAaI,OAAO,EAAE;gBAClD,IAAIlC,WAAU;oBACZ,OAAO;wBACL,GAAGA,OAAO;wBACVe,UAAUf,SAASe,YAAY,EAAE;wBACjCsB,kBAAkBrC,SAASqC,oBAAoBA,kCAAgB;wBAC/DC,kBAAkBtC,SAASsC,oBAAoBA,kCAAgB;oBACjE;gBACF;YACF;QACF;IACF;IACA,IAAInB,iBAAiBU,WAAW;QAC9B,MAAM,IAAIU,MACR;IAEJ;IAEA,qBACE,uBAACC,gDAAuB;QACrB,GAAGrC,IAAI;QACRgB,cAAcA;QACdsB,oBAAoBb;QACpB1B,KAAK4B;;AAGX;AAEA,SAASE,WAAcT,KAAyB;IAC9C,OACE,OAAOA,UAAU,YACjBA,UAAU,QACV,UAAUA,SACV,OAAOA,MAAMmB,IAAI,KAAK;AAE1B;AAGO,MAAMrD,sBAAsBI"}

package/build/fork/useLinking.d.ts

@@ -2,7 +2,7 @@ import { type RefObject } from 'react';
 import { type LinkingOptions, type NavigationContainerRef, type ParamListBase } from '../react-navigation/native';
 type Options = LinkingOptions<ParamListBase>;
 export declare function useLinking(_ref: RefObject<NavigationContainerRef<ParamListBase> | null>, { prefixes, config, getInitialURL, getStateFromPath, }: Options): {
-    getInitialState: () => PromiseLike<Readonly<{
+    getInitialState: () => Readonly<{
         key: string;
         routeKeySeq: number;
         index: number;
@@ -11,7 +11,16 @@ export declare function useLinking(_ref: RefObject<NavigationContainerRef<ParamL
         routes: import("../react-navigation").NavigationRoute<ParamListBase, string>[];
         type?: string;
         stale: false;
-    }> | undefined>;
+    }> | Promise<Readonly<{
+        key: string;
+        routeKeySeq: number;
+        index: number;
+        routeNames: string[];
+        history?: unknown[];
+        routes: import("../react-navigation").NavigationRoute<ParamListBase, string>[];
+        type?: string;
+        stale: false;
+    }> | undefined> | undefined;
 };
 export declare function getInitialURLWithTimeout(): string | null | Promise<string | null>;
 export {};

package/build/fork/useLinking.js

@@ -29,6 +29,7 @@ function _react() {
 }
 const _createSeededNavigationState = require("../global-state/createSeededNavigationState");
 const _routerConfigContext = require("../global-state/routerConfigContext");
+const _layoutAnchor = require("../layoutAnchor");
 const _native = require("../react-navigation/native");
 const _stateKeys = require("../react-navigation/routers/stateKeys");
 const _extractPathFromURL = require("./extractPathFromURL");
@@ -55,7 +56,7 @@ function useLinking(_ref, { prefixes, config, getInitialURL = getInitialURLWithT
             }
         };
     }, []);
-    // `useThenable` only consumes this function from the first render, keeping initialization options consistent.
+    // `NavigationContainer` only consumes this function from the first render, keeping initialization options consistent.
     const getInitialState = ()=>{
         const getStateFromURL = (url)=>{
             let path = url ? (0, _extractPathFromURL.extractExpoPathFromURL)(prefixes, url) : undefined;
@@ -64,23 +65,13 @@ function useLinking(_ref, { prefixes, config, getInitialURL = getInitialURLWithT
             }
             const parsedState = path ? getStateFromPath(path, config) : undefined;
             const routeNode = routerConfig?.routeNode;
-            const state = routeNode ? (0, _createSeededNavigationState.createSeededRootState)(parsedState, routeNode) : (0, _createSeededNavigationState.completeParsedState)(parsedState, _stateKeys.ROOT_CHAIN);
-            return state;
+            return routeNode ? (0, _layoutAnchor.withLoadedLayouts)(()=>(0, _createSeededNavigationState.createSeededRootState)(parsedState, routeNode)) : (0, _createSeededNavigationState.completeParsedState)(parsedState, _stateKeys.ROOT_CHAIN);
         };
         const url = getInitialURL();
         if (typeof url !== 'string' && url != null) {
             return url.then(getStateFromURL);
         }
-        const state = getStateFromURL(url);
-        const thenable = {
-            then (onfulfilled) {
-                return Promise.resolve(onfulfilled ? onfulfilled(state) : state);
-            },
-            catch () {
-                return thenable;
-            }
-        };
-        return thenable;
+        return getStateFromURL(url);
     };
     return {
         getInitialState

package/build/fork/useLinking.js.map

@@ -1 +1 @@
-{"version":3,"sources":["fork/useLinking.ts"],"sourcesContent":[null],"names":["getInitialURLWithTimeout","useLinking","linkingHandlers","_ref","prefixes","config","getInitialURL","getStateFromPath","getStateFromPathDefault","routerConfig","use","RouterConfigContext","useEffect","process","env","NODE_ENV","undefined","length","console","error","join","trim","handler","Symbol","push","index","indexOf","splice","getInitialState","getStateFromURL","url","path","extractExpoPathFromURL","startsWith","parsedState","routeNode","state","createSeededRootState","completeParsedState","ROOT_CHAIN","then","thenable","onfulfilled","Promise","resolve","catch","window","location","href"],"mappings":";;;;;;;;;;;;;;;QAuGgBA;eAAAA;;QAlFAC;eAAAA;;;;yBArB+B;;;;;;6CAKxC;qCAC6B;wBAO7B;2BACoB;oCACY;AAEvC,MAAMC,kBAA4B,EAAE;AAI7B,SAASD,WACdE,IAA6D,EAC7D,EACEC,QAAQ,EACRC,MAAM,EACNC,gBAAgBN,wBAAwB,EACxCO,mBAAmBC,wBAAuB,EAClC;IAEV,MAAMC,eAAeC,IAAAA,YAAG,EAACC,wCAAmB;IAE5CC,IAAAA,kBAAS,EAAC;QACR,IAAIC,QAAQC,GAAG,CAACC,QAAQ,KAAK,cAAc;YACzC,OAAOC;QACT;QAEA,IAAId,gBAAgBe,MAAM,EAAE;YAC1BC,QAAQC,KAAK,CACX;gBACE;gBACA;gBACA;aACD,CACEC,IAAI,CAAC,MACLC,IAAI;QAEX;QAEA,MAAMC,UAAUC;QAEhBrB,gBAAgBsB,IAAI,CAACF;QAErB,OAAO;YACL,MAAMG,QAAQvB,gBAAgBwB,OAAO,CAACJ;YAEtC,IAAIG,QAAQ,CAAC,GAAG;gBACdvB,gBAAgByB,MAAM,CAACF,OAAO;YAChC;QACF;IACF,GAAG,EAAE;IAEL,8GAA8G;IAC9G,MAAMG,kBAAkB;QACtB,MAAMC,kBAAkB,CAACC;YACvB,IAAIC,OAAOD,MAAME,IAAAA,0CAAsB,EAAC5B,UAAU0B,OAAOd;YACzD,IAAIe,SAASf,aAAa,CAACe,KAAKE,UAAU,CAAC,MAAM;gBAC/CF,OAAO,CAAC,CAAC,EAAEA,MAAM;YACnB;YAEA,MAAMG,cAAcH,OAAOxB,iBAAiBwB,MAAM1B,UAAUW;YAC5D,MAAMmB,YAAY1B,cAAc0B;YAChC,MAAMC,QAAQD,YACVE,IAAAA,kDAAqB,EAACH,aAAaC,aACnCG,IAAAA,gDAAmB,EAACJ,aAAaK,qBAAU;YAE/C,OAAOH;QACT;QACA,MAAMN,MAAMxB;QAEZ,IAAI,OAAOwB,QAAQ,YAAYA,OAAO,MAAM;YAC1C,OAAOA,IAAIU,IAAI,CAACX;QAClB;QAEA,MAAMO,QAAQP,gBAAgBC;QAE9B,MAAMW,WAAW;YACfD,MAAKE,WAA0D;gBAC7D,OAAOC,QAAQC,OAAO,CAACF,cAAcA,YAAYN,SAASA;YAC5D;YACAS;gBACE,OAAOJ;YACT;QACF;QAEA,OAAOA;IACT;IAEA,OAAO;QACLb;IACF;AACF;AAEO,SAAS5B;IACd,OAAO,OAAO8C,WAAW,cAAc,KAAKA,OAAOC,QAAQ,CAACC,IAAI;AAClE"}
+{"version":3,"sources":["fork/useLinking.ts"],"sourcesContent":[null],"names":["getInitialURLWithTimeout","useLinking","linkingHandlers","_ref","prefixes","config","getInitialURL","getStateFromPath","getStateFromPathDefault","routerConfig","use","RouterConfigContext","useEffect","process","env","NODE_ENV","undefined","length","console","error","join","trim","handler","Symbol","push","index","indexOf","splice","getInitialState","getStateFromURL","url","path","extractExpoPathFromURL","startsWith","parsedState","routeNode","withLoadedLayouts","createSeededRootState","completeParsedState","ROOT_CHAIN","then","window","location","href"],"mappings":";;;;;;;;;;;;;;;QA0FgBA;eAAAA;;QArEAC;eAAAA;;;;yBArB+B;;;;;;6CAKxC;qCAC6B;8BACF;wBAM3B;2BACoB;oCACY;AAEvC,MAAMC,kBAA4B,EAAE;AAI7B,SAASD,WACdE,IAA6D,EAC7D,EACEC,QAAQ,EACRC,MAAM,EACNC,gBAAgBN,wBAAwB,EACxCO,mBAAmBC,wBAAuB,EAClC;IAEV,MAAMC,eAAeC,IAAAA,YAAG,EAACC,wCAAmB;IAE5CC,IAAAA,kBAAS,EAAC;QACR,IAAIC,QAAQC,GAAG,CAACC,QAAQ,KAAK,cAAc;YACzC,OAAOC;QACT;QAEA,IAAId,gBAAgBe,MAAM,EAAE;YAC1BC,QAAQC,KAAK,CACX;gBACE;gBACA;gBACA;aACD,CACEC,IAAI,CAAC,MACLC,IAAI;QAEX;QAEA,MAAMC,UAAUC;QAEhBrB,gBAAgBsB,IAAI,CAACF;QAErB,OAAO;YACL,MAAMG,QAAQvB,gBAAgBwB,OAAO,CAACJ;YAEtC,IAAIG,QAAQ,CAAC,GAAG;gBACdvB,gBAAgByB,MAAM,CAACF,OAAO;YAChC;QACF;IACF,GAAG,EAAE;IAEL,sHAAsH;IACtH,MAAMG,kBAAkB;QACtB,MAAMC,kBAAkB,CAACC;YACvB,IAAIC,OAAOD,MAAME,IAAAA,0CAAsB,EAAC5B,UAAU0B,OAAOd;YACzD,IAAIe,SAASf,aAAa,CAACe,KAAKE,UAAU,CAAC,MAAM;gBAC/CF,OAAO,CAAC,CAAC,EAAEA,MAAM;YACnB;YAEA,MAAMG,cAAcH,OAAOxB,iBAAiBwB,MAAM1B,UAAUW;YAC5D,MAAMmB,YAAY1B,cAAc0B;YAChC,OAAOA,YACHC,IAAAA,+BAAiB,EAAC,IAAMC,IAAAA,kDAAqB,EAACH,aAAaC,cAC3DG,IAAAA,gDAAmB,EAACJ,aAAaK,qBAAU;QACjD;QACA,MAAMT,MAAMxB;QAEZ,IAAI,OAAOwB,QAAQ,YAAYA,OAAO,MAAM;YAC1C,OAAOA,IAAIU,IAAI,CAACX;QAClB;QAEA,OAAOA,gBAAgBC;IACzB;IAEA,OAAO;QACLF;IACF;AACF;AAEO,SAAS5B;IACd,OAAO,OAAOyC,WAAW,cAAc,KAAKA,OAAOC,QAAQ,CAACC,IAAI;AAClE"}

package/build/fork/useLinking.native.d.ts

@@ -2,7 +2,7 @@ import { type RefObject } from 'react';
 import { type LinkingOptions, type NavigationContainerRef, type ParamListBase } from '../react-navigation/native';
 type Options = LinkingOptions<ParamListBase>;
 export declare function useLinking(ref: RefObject<NavigationContainerRef<ParamListBase>>, { prefixes, filter, config, getInitialURL, subscribe, getStateFromPath, }: Options): {
-    getInitialState: () => PromiseLike<Readonly<{
+    getInitialState: () => Readonly<{
         key: string;
         routeKeySeq: number;
         index: number;
@@ -11,6 +11,15 @@ export declare function useLinking(ref: RefObject<NavigationContainerRef<ParamLi
         routes: import("../react-navigation").NavigationRoute<ParamListBase, string>[];
         type?: string;
         stale: false;
-    }> | undefined>;
+    }> | Promise<Readonly<{
+        key: string;
+        routeKeySeq: number;
+        index: number;
+        routeNames: string[];
+        history?: unknown[];
+        routes: import("../react-navigation").NavigationRoute<ParamListBase, string>[];
+        type?: string;
+        stale: false;
+    }> | undefined> | undefined;
 };
 export {};

package/build/fork/useLinking.native.js

@@ -26,6 +26,7 @@ const _createSeededNavigationState = require("../global-state/createSeededNaviga
 const _getRouteInfoFromState = require("../global-state/getRouteInfoFromState");
 const _routerConfigContext = require("../global-state/routerConfigContext");
 const _routingQueueContext = require("../global-state/routingQueueContext");
+const _layoutAnchor = require("../layoutAnchor");
 const _native = require("../react-navigation/native");
 const _stateKeys = require("../react-navigation/routers/stateKeys");
 const _extractPathFromURL = require("./extractPathFromURL");
@@ -78,9 +79,8 @@ function useLinking(ref, { prefixes, filter, config, getInitialURL = ()=>(0, _ge
         }
         const path = (0, _extractPathFromURL.extractExpoPathFromURL)(prefixes, url);
         if (path !== undefined) {
-            // TODO(@ubax): check if this is performant
             // TODO(@ubax): check if ref.current?.getRootState() can be replaced with the context read
-            const segments = (0, _getRouteInfoFromState.getRouteInfoFromState)(ref.current?.getRootState()).segments;
+            const segments = (0, _getRouteInfoFromState.getRouteSegmentsFromState)(ref.current?.getRootState());
             return getStateFromPath(path, config, segments);
         }
         return undefined;
@@ -88,27 +88,15 @@ function useLinking(ref, { prefixes, filter, config, getInitialURL = ()=>(0, _ge
     const getInitialState = (0, _react().useCallback)(()=>{
         const url = getInitialURL();
         const createInitialState = (url)=>{
-            let parsedState;
-            if (url && (!filter || filter(url))) {
-                const path = getInitialPath(prefixes, url);
-                parsedState = getStateFromPath(path, config);
-            }
+            const shouldParseURL = url && (!filter || filter(url));
+            const parsedState = shouldParseURL ? getStateFromPath(getInitialPath(prefixes, url), config) : undefined;
             const routeNode = routerConfig?.routeNode;
-            return routeNode ? (0, _createSeededNavigationState.createSeededRootState)(parsedState, routeNode) : (0, _createSeededNavigationState.completeParsedState)(parsedState, _stateKeys.ROOT_CHAIN);
+            return routeNode ? (0, _layoutAnchor.withLoadedLayouts)(()=>(0, _createSeededNavigationState.createSeededRootState)(parsedState, routeNode)) : (0, _createSeededNavigationState.completeParsedState)(parsedState, _stateKeys.ROOT_CHAIN);
         };
         if (url != null && typeof url !== 'string') {
             return url.then(createInitialState);
         }
-        const state = createInitialState(url);
-        const thenable = {
-            then (onfulfilled) {
-                return Promise.resolve(onfulfilled ? onfulfilled(state) : state);
-            },
-            catch () {
-                return thenable;
-            }
-        };
-        return thenable;
+        return createInitialState(url);
     }, [
         config,
         filter,

package/build/fork/useLinking.native.js.map

@@ -1 +1 @@
-{"version":3,"sources":["fork/useLinking.native.ts"],"sourcesContent":[null],"names":["useLinking","linkingHandlers","getInitialPath","prefixes","url","path","extractExpoPathFromURL","startsWith","ref","filter","config","getInitialURL","getInitialURLWithTimeout","subscribe","listener","callback","subscription","Linking","addEventListener","removeEventListener","bind","remove","getStateFromPath","getStateFromPathDefault","routerConfig","use","RouterConfigContext","enqueue","useEnqueueRoutingIntent","useEffect","process","env","NODE_ENV","undefined","length","console","error","join","trim","handler","Symbol","push","index","indexOf","splice","getStateFromURL","useEffectEvent","segments","getRouteInfoFromState","current","getRootState","getInitialState","useCallback","createInitialState","parsedState","routeNode","createSeededRootState","completeParsedState","ROOT_CHAIN","then","state","thenable","onfulfilled","Promise","resolve","catch","navigation","rootState","routes","some","r","routeNames","includes","name","type","payload","href","originalHref","options","event"],"mappings":"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"}
+{"version":3,"sources":["fork/useLinking.native.ts"],"sourcesContent":[null],"names":["useLinking","linkingHandlers","getInitialPath","prefixes","url","path","extractExpoPathFromURL","startsWith","ref","filter","config","getInitialURL","getInitialURLWithTimeout","subscribe","listener","callback","subscription","Linking","addEventListener","removeEventListener","bind","remove","getStateFromPath","getStateFromPathDefault","routerConfig","use","RouterConfigContext","enqueue","useEnqueueRoutingIntent","useEffect","process","env","NODE_ENV","undefined","length","console","error","join","trim","handler","Symbol","push","index","indexOf","splice","getStateFromURL","useEffectEvent","segments","getRouteSegmentsFromState","current","getRootState","getInitialState","useCallback","createInitialState","shouldParseURL","parsedState","routeNode","withLoadedLayouts","createSeededRootState","completeParsedState","ROOT_CHAIN","then","navigation","state","rootState","routes","some","r","routeNames","includes","name","type","payload","href","originalHref","options","event"],"mappings":"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"}

package/build/getReactNavigationConfig.js

@@ -24,6 +24,7 @@ _export(exports, {
         return parseRouteSegments;
     }
 });
+const _layoutAnchor = require("./layoutAnchor");
 const _matchers = require("./matchers");
 // `[page]` -> `:page`
 // `page` -> `page`
@@ -70,12 +71,11 @@ function convertRouteNodeToScreen(node, metaOnly) {
         path,
         screens
     };
-    if (node.initialRouteName) {
-        // NOTE(EvanBacon): This is bad because it forces all Layout Routes
-        // to be loaded into memory. We should move towards a system where
-        // the initial route name is either loaded asynchronously in the Layout Route
-        // or defined via a file system convention.
-        screen.initialRouteName = node.initialRouteName;
+    // When several routes match a URL equally well, the URL parser prefers the layout's initial route.
+    // The anchor from `unstable_settings` is not used, because reading it loads the layout.
+    const groupMatchingRouteName = (0, _layoutAnchor.getGroupMatchingRouteName)(node);
+    if (groupMatchingRouteName) {
+        screen.initialRouteName = groupMatchingRouteName;
     }
     if (!metaOnly) {
         screen._route = node;
@@ -89,16 +89,10 @@ function getReactNavigationScreensConfig(nodes, metaOnly) {
         ]));
 }
 function getReactNavigationConfig(routeTree, metaOnly) {
-    const config = {
+    return {
         initialRouteName: undefined,
         screens: routeTree ? getReactNavigationScreensConfig(routeTree.children, metaOnly) : {}
     };
-    if (routeTree?.initialRouteName) {
-        // We're using LinkingOptions the generic type is `object` instead of a proper ParamList.
-        // So we need to cast the initialRouteName to `any` to avoid type errors.
-        config.initialRouteName = routeTree.initialRouteName;
-    }
-    return config;
 }
 
 //# sourceMappingURL=getReactNavigationConfig.js.map

package/build/getReactNavigationConfig.js.map

@@ -1 +1 @@
-{"version":3,"sources":["getReactNavigationConfig.ts"],"sourcesContent":[null],"names":["getReactNavigationConfig","getReactNavigationScreensConfig","parseRouteSegments","convertDynamicRouteToReactNavigation","segment","dynamicName","matchDynamicName","deep","name","segments","split","map","filter","Boolean","join","convertRouteNodeToScreen","node","metaOnly","path","route","children","length","screens","_route","screen","initialRouteName","nodes","Object","fromEntries","routeTree","config","undefined"],"mappings":";;;;;;;;;;;;;;;;QA2FgBA;eAAAA;;QATAC;eAAAA;;QAlDAC;eAAAA;;;0BA/BiB;AAWjC,sBAAsB;AACtB,mBAAmB;AACnB,SAASC,qCAAqCC,OAAe;IAC3D,wEAAwE;IACxE,IAAIA,YAAY,SAAS;QACvB,OAAO;IACT;IACA,IAAIA,YAAY,cAAc;QAC5B,OAAO;IACT;IACA,MAAMC,cAAcC,IAAAA,0BAAgB,EAACF;IACrC,IAAIC,eAAe,CAACA,YAAYE,IAAI,EAAE;QACpC,OAAO,CAAC,CAAC,EAAEF,YAAYG,IAAI,EAAE;IAC/B,OAAO,IAAIH,aAAaE,MAAM;QAC5B,OAAO,MAAMF,YAAYG,IAAI;IAC/B,OAAO;QACL,OAAOJ;IACT;AACF;AAEO,SAASF,mBAAmBO,QAAgB;IACjD,OACE,gEAAgE;IAChE,yDAAyD;IACzD,qEAAqE;IACrEA,SACGC,KAAK,CAAC,IACP,qDAAqD;KACpDC,GAAG,CAACR,qCACL,sDAAsD;KACrDS,MAAM,CAACC,QACR,4BAA4B;KAC3BC,IAAI,CAAC;AAEZ;AAEA,SAASC,yBAAyBC,IAAe,EAAEC,QAAiB;IAClE,MAAMC,OAAOhB,mBAAmBc,KAAKG,KAAK;IAC1C,IAAI,CAACH,KAAKI,QAAQ,CAACC,MAAM,EAAE;QACzB,IAAI,CAACJ,UAAU;YACb,OAAO;gBACLC;gBACAI,SAAS,CAAC;gBACVC,QAAQP;YACV;QACF;QACA,OAAOE;IACT;IACA,MAAMI,UAAUrB,gCAAgCe,KAAKI,QAAQ,EAAEH;IAE/D,MAAMO,SAAiB;QACrBN;QACAI;IACF;IAEA,IAAIN,KAAKS,gBAAgB,EAAE;QACzB,mEAAmE;QACnE,kEAAkE;QAClE,6EAA6E;QAC7E,2CAA2C;QAC3CD,OAAOC,gBAAgB,GAAGT,KAAKS,gBAAgB;IACjD;IAEA,IAAI,CAACR,UAAU;QACbO,OAAOD,MAAM,GAAGP;IAClB;IAEA,OAAOQ;AACT;AAEO,SAASvB,gCACdyB,KAAkB,EAClBT,QAAiB;IAEjB,OAAOU,OAAOC,WAAW,CACvBF,MAAMf,GAAG,CAAC,CAACK,OAAS;YAACA,KAAKG,KAAK;YAAEJ,yBAAyBC,MAAMC;SAAU;AAE9E;AAEO,SAASjB,yBAAyB6B,SAA2B,EAAEZ,QAAiB;IACrF,MAAMa,SAAS;QACbL,kBAAkBM;QAClBT,SAASO,YAAY5B,gCAAgC4B,UAAUT,QAAQ,EAAEH,YAAY,CAAC;IACxF;IAEA,IAAIY,WAAWJ,kBAAkB;QAC/B,yFAAyF;QACzF,yEAAyE;QACzEK,OAAOL,gBAAgB,GAAGI,UAAUJ,gBAAgB;IACtD;IAEA,OAAOK;AACT"}
+{"version":3,"sources":["getReactNavigationConfig.ts"],"sourcesContent":[null],"names":["getReactNavigationConfig","getReactNavigationScreensConfig","parseRouteSegments","convertDynamicRouteToReactNavigation","segment","dynamicName","matchDynamicName","deep","name","segments","split","map","filter","Boolean","join","convertRouteNodeToScreen","node","metaOnly","path","route","children","length","screens","_route","screen","groupMatchingRouteName","getGroupMatchingRouteName","initialRouteName","nodes","Object","fromEntries","routeTree","undefined"],"mappings":";;;;;;;;;;;;;;;;QA2FgBA;eAAAA;;QATAC;eAAAA;;QAjDAC;eAAAA;;;8BAhC0B;0BACT;AAWjC,sBAAsB;AACtB,mBAAmB;AACnB,SAASC,qCAAqCC,OAAe;IAC3D,wEAAwE;IACxE,IAAIA,YAAY,SAAS;QACvB,OAAO;IACT;IACA,IAAIA,YAAY,cAAc;QAC5B,OAAO;IACT;IACA,MAAMC,cAAcC,IAAAA,0BAAgB,EAACF;IACrC,IAAIC,eAAe,CAACA,YAAYE,IAAI,EAAE;QACpC,OAAO,CAAC,CAAC,EAAEF,YAAYG,IAAI,EAAE;IAC/B,OAAO,IAAIH,aAAaE,MAAM;QAC5B,OAAO,MAAMF,YAAYG,IAAI;IAC/B,OAAO;QACL,OAAOJ;IACT;AACF;AAEO,SAASF,mBAAmBO,QAAgB;IACjD,OACE,gEAAgE;IAChE,yDAAyD;IACzD,qEAAqE;IACrEA,SACGC,KAAK,CAAC,IACP,qDAAqD;KACpDC,GAAG,CAACR,qCACL,sDAAsD;KACrDS,MAAM,CAACC,QACR,4BAA4B;KAC3BC,IAAI,CAAC;AAEZ;AAEA,SAASC,yBAAyBC,IAAe,EAAEC,QAAiB;IAClE,MAAMC,OAAOhB,mBAAmBc,KAAKG,KAAK;IAC1C,IAAI,CAACH,KAAKI,QAAQ,CAACC,MAAM,EAAE;QACzB,IAAI,CAACJ,UAAU;YACb,OAAO;gBACLC;gBACAI,SAAS,CAAC;gBACVC,QAAQP;YACV;QACF;QACA,OAAOE;IACT;IACA,MAAMI,UAAUrB,gCAAgCe,KAAKI,QAAQ,EAAEH;IAE/D,MAAMO,SAAiB;QACrBN;QACAI;IACF;IAEA,mGAAmG;IACnG,wFAAwF;IACxF,MAAMG,yBAAyBC,IAAAA,uCAAyB,EAACV;IACzD,IAAIS,wBAAwB;QAC1BD,OAAOG,gBAAgB,GAAGF;IAC5B;IAEA,IAAI,CAACR,UAAU;QACbO,OAAOD,MAAM,GAAGP;IAClB;IAEA,OAAOQ;AACT;AAEO,SAASvB,gCACd2B,KAAkB,EAClBX,QAAiB;IAEjB,OAAOY,OAAOC,WAAW,CACvBF,MAAMjB,GAAG,CAAC,CAACK,OAAS;YAACA,KAAKG,KAAK;YAAEJ,yBAAyBC,MAAMC;SAAU;AAE9E;AAEO,SAASjB,yBAAyB+B,SAA2B,EAAEd,QAAiB;IACrF,OAAO;QACLU,kBAAkBK;QAClBV,SAASS,YAAY9B,gCAAgC8B,UAAUX,QAAQ,EAAEH,YAAY,CAAC;IACxF;AACF"}

package/build/getRoutesCore.d.ts

@@ -1,4 +1,4 @@
-import { type DynamicConvention, type RouteNode } from './Route';
+import type { DynamicConvention, RouteNode } from './Route';
 import type { RequireContext } from './types';
 export type Options = {
     ignore?: RegExp[];