expo-router 58.0.22 → 58.0.24

package/android/build.gradle

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

package/build/exports.d.ts

@@ -45,7 +45,7 @@ export { attachRouteState, extendRouter, extendRouterActions, isActionHandled, R
 export { NativeStackView } from './react-navigation/native-stack';
 export { enableLegacyHeaderAppearance } from './react-navigation/native-stack/views/headerAppearance';
 export type { NativeStackDescriptorMap, NativeStackViewState, } from './react-navigation/native-stack';
-export type { CommonNavigationAction, DefaultRouterOptions, NavigationAction, NavigationState, Router, RouterActionContext, RouterActionReducer, RouterActionResult, RouterBrowserHistoryAction, RouterConfigOptions, RouterExtension, RouterExtensionContext, RouterExtensionOptions, RouterFactory, StackActionType, StackNavigationState, StackRouterOptions, TabActionType, TabNavigationState, TabRouterOptions, } from './react-navigation/routers';
+export type { CommonNavigationAction, DefaultRouterOptions, ExtendedRouter, NavigationAction, NavigationState, Router, RouterActionContext, RouterActionReducer, RouterActionResult, RouterBrowserHistoryAction, RouterConfigOptions, RouterExtension, RouterExtensionContext, RouterExtensionMembers, RouterExtensionOptions, RouterFactory, StackActionType, StackNavigationState, StackRouterOptions, TabActionType, TabNavigationState, TabRouterOptions, } from './react-navigation/routers';
 export { unstable_enablePerformanceIntegration, unstable_performance, unstable_PerformanceObserver, } from './performance';
 export type { RouterPageMarkDetail, RouterActionMarkDetail, RouterPagePreloadedMark, RouterPageFocusedMark, RouterPageBlurredMark, RouterPageRemovedMark, RouterActionEnqueuedMark, RouterActionDispatchedMark, RouterPerformanceMark, RouterPerformanceMarkByName, BaseRouterPerformanceMark, } from './performance';
 /**

package/build/exports.js.map

@@ -1 +1 @@
-{"version":3,"sources":["exports.ts"],"sourcesContent":[null],"names":["Badge","DarkTheme","DefaultTheme","ErrorBoundary","ExperimentalStack","ExpoRoot","Icon","IsWithinNativeNavigator","Label","LocaleProvider","NativeStackView","NavigationAwareActivity","Navigator","RouterActionHandling","Sitemap","Slot","SplashScreen","StackRouter","SuspenseFallback","TabRouter","Tabs","ThemeProvider","Unmatched","VectorIcon","attachRouteState","createBaseStackProps","createBaseTabProps","createNativeStackProps","createStandardRouterNavigator","enableLegacyHeaderAppearance","extendRouter","extendRouterActions","integrateWithRouter","isActionHandled","router","unstable_PerformanceObserver","unstable_createStandardRouterNavigator","unstable_enablePerformanceIntegration","unstable_integrateWithRouter","unstable_performance","unstable_useIsNavigating","useIsNavigating","useCurrentRouteInfo","useFocusEffect","useGlobalSearchParams","useIsFocused","useLoaderData","useLocalSearchParams","useNavigation","useNavigationContainerRef","usePathname","usePreventRemove","useRootNavigation","useRootNavigationState","useRoute","useRoutePath","useRouter","useScrollToTop","useSegments","useSitemap","useTheme","useUnstableGlobalHref","withLayoutContext"],"mappings":"AAAA,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAkEhBA;eAAAA,iBAAK;;QApBEC;eAAAA,oBAAS;;QACTC;eAAAA,0BAAY;;QAlBZC;eAAAA,4BAAa;;QAoIbC;eAAAA,oCAAiB;;QAzIjBC;eAAAA,kBAAQ;;QA4CfC;eAAAA,gBAAI;;QASJC;eAAAA,2CAAuB;;QAPvBC;eAAAA,iBAAK;;QApBEC;eAAAA,8BAAc;;QA0DdC;eAAAA,4BAAe;;QA7EfC;eAAAA,gDAAuB;;QAVvBC;eAAAA,oBAAS;;QAmFhBC;eAAAA,6BAAoB;;QA9EbC;eAAAA,gBAAO;;QALIC;eAAAA,eAAI;;QAiBZC;;;QAmEVC;eAAAA,oBAAW;;QA3EJC;eAAAA,kCAAgB;;QA4EvBC;eAAAA,kBAAS;;QAqDFC;eAAAA,UAAI;;QA/GJC;eAAAA,4BAAa;;QAvBbC;eAAAA,oBAAS;;QA+ChBC;eAAAA,sBAAU;;QA4BVC;eAAAA,yBAAgB;;QATTC;eAAAA,0CAAoB;;QACpBC;eAAAA,sCAAkB;;QAClBC;eAAAA,8CAAsB;;QAf7BC;eAAAA,iDAA6B;;QA+BtBC;eAAAA,8CAA4B;;QARnCC;eAAAA,qBAAY;;QACZC;eAAAA,4BAAmB;;QAvBnBC;eAAAA,uCAAmB;;QAwBnBC;eAAAA,wBAAe;;QAtFRC;eAAAA,qBAAM;;QA2HbC;eAAAA,yCAA4B;;QA5D5BC;eAAAA,0DAAsC;;QA0DtCC;eAAAA,kDAAqC;;QAzDrCC;eAAAA,gDAA4B;;QA0D5BC;eAAAA,iCAAoB;;QAzHMC;eAAnBC,gCAAe;;QAJtBC;eAAAA,0BAAmB;;QA4BZC;eAAAA,8BAAc;;QAlCrBC;eAAAA,4BAAqB;;QAmCdC;eAAAA,0BAAY;;QA9BnBC;eAAAA,oBAAa;;QAJbC;eAAAA,2BAAoB;;QAgCbC;eAAAA,4BAAa;;QAlCpBC;eAAAA,gCAAyB;;QADzBC;eAAAA,kBAAW;;QAmDXC;eAAAA,kCAAgB;;QA9ChBC;eAAAA,wBAAiB;;QACjBC;eAAAA,6BAAsB;;QA0CfC;eAAAA,kBAAQ;;QAFRC;eAAAA,0BAAY;;QAhDnBC;eAAAA,gBAAS;;QAiDFC;eAAAA,8BAAc;;QA3CrBC;eAAAA,kBAAW;;QAiBJC;eAAAA,sBAAU;;QAsBVC;eAAAA,kBAAQ;;QA5CfC;eAAAA,4BAAqB;;QAedC;eAAAA,oCAAiB;;;2BAnBM;uBAczB;+BAEsE;iCACjB;mCAE1B;0BAIT;2BACC;yBACF;4BACqB;+BAEf;kCAC+B;yCACrB;gEAOV;+BAGA;gCACsB;8BACvB;2BAGH;8BACG;+BACC;0BACL;gCACgC;8BAE5B;gCACE;0BACN;kCAIlB;4BAgBA;oCAQA;sCAS8B;oCACF;wCACI;yBAchC;6BACyB;kCACa;6BAgCtC;sBAkBc;mCAEa"}
+{"version":3,"sources":["exports.ts"],"sourcesContent":[null],"names":["Badge","DarkTheme","DefaultTheme","ErrorBoundary","ExperimentalStack","ExpoRoot","Icon","IsWithinNativeNavigator","Label","LocaleProvider","NativeStackView","NavigationAwareActivity","Navigator","RouterActionHandling","Sitemap","Slot","SplashScreen","StackRouter","SuspenseFallback","TabRouter","Tabs","ThemeProvider","Unmatched","VectorIcon","attachRouteState","createBaseStackProps","createBaseTabProps","createNativeStackProps","createStandardRouterNavigator","enableLegacyHeaderAppearance","extendRouter","extendRouterActions","integrateWithRouter","isActionHandled","router","unstable_PerformanceObserver","unstable_createStandardRouterNavigator","unstable_enablePerformanceIntegration","unstable_integrateWithRouter","unstable_performance","unstable_useIsNavigating","useIsNavigating","useCurrentRouteInfo","useFocusEffect","useGlobalSearchParams","useIsFocused","useLoaderData","useLocalSearchParams","useNavigation","useNavigationContainerRef","usePathname","usePreventRemove","useRootNavigation","useRootNavigationState","useRoute","useRoutePath","useRouter","useScrollToTop","useSegments","useSitemap","useTheme","useUnstableGlobalHref","withLayoutContext"],"mappings":"AAAA,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAkEhBA;eAAAA,iBAAK;;QApBEC;eAAAA,oBAAS;;QACTC;eAAAA,0BAAY;;QAlBZC;eAAAA,4BAAa;;QAsIbC;eAAAA,oCAAiB;;QA3IjBC;eAAAA,kBAAQ;;QA4CfC;eAAAA,gBAAI;;QASJC;eAAAA,2CAAuB;;QAPvBC;eAAAA,iBAAK;;QApBEC;eAAAA,8BAAc;;QA0DdC;eAAAA,4BAAe;;QA7EfC;eAAAA,gDAAuB;;QAVvBC;eAAAA,oBAAS;;QAmFhBC;eAAAA,6BAAoB;;QA9EbC;eAAAA,gBAAO;;QALIC;eAAAA,eAAI;;QAiBZC;;;QAmEVC;eAAAA,oBAAW;;QA3EJC;eAAAA,kCAAgB;;QA4EvBC;eAAAA,kBAAS;;QAuDFC;eAAAA,UAAI;;QAjHJC;eAAAA,4BAAa;;QAvBbC;eAAAA,oBAAS;;QA+ChBC;eAAAA,sBAAU;;QA4BVC;eAAAA,yBAAgB;;QATTC;eAAAA,0CAAoB;;QACpBC;eAAAA,sCAAkB;;QAClBC;eAAAA,8CAAsB;;QAf7BC;eAAAA,iDAA6B;;QA+BtBC;eAAAA,8CAA4B;;QARnCC;eAAAA,qBAAY;;QACZC;eAAAA,4BAAmB;;QAvBnBC;eAAAA,uCAAmB;;QAwBnBC;eAAAA,wBAAe;;QAtFRC;eAAAA,qBAAM;;QA6HbC;eAAAA,yCAA4B;;QA9D5BC;eAAAA,0DAAsC;;QA4DtCC;eAAAA,kDAAqC;;QA3DrCC;eAAAA,gDAA4B;;QA4D5BC;eAAAA,iCAAoB;;QA3HMC;eAAnBC,gCAAe;;QAJtBC;eAAAA,0BAAmB;;QA4BZC;eAAAA,8BAAc;;QAlCrBC;eAAAA,4BAAqB;;QAmCdC;eAAAA,0BAAY;;QA9BnBC;eAAAA,oBAAa;;QAJbC;eAAAA,2BAAoB;;QAgCbC;eAAAA,4BAAa;;QAlCpBC;eAAAA,gCAAyB;;QADzBC;eAAAA,kBAAW;;QAmDXC;eAAAA,kCAAgB;;QA9ChBC;eAAAA,wBAAiB;;QACjBC;eAAAA,6BAAsB;;QA0CfC;eAAAA,kBAAQ;;QAFRC;eAAAA,0BAAY;;QAhDnBC;eAAAA,gBAAS;;QAiDFC;eAAAA,8BAAc;;QA3CrBC;eAAAA,kBAAW;;QAiBJC;eAAAA,sBAAU;;QAsBVC;eAAAA,kBAAQ;;QA5CfC;eAAAA,4BAAqB;;QAedC;eAAAA,oCAAiB;;;2BAnBM;uBAczB;+BAEsE;iCACjB;mCAE1B;0BAIT;2BACC;yBACF;4BACqB;+BAEf;kCAC+B;yCACrB;gEAOV;+BAGA;gCACsB;8BACvB;2BAGH;8BACG;+BACC;0BACL;gCACgC;8BAE5B;gCACE;0BACN;kCAIlB;4BAgBA;oCAQA;sCAS8B;oCACF;wCACI;yBAchC;6BACyB;kCACa;6BAkCtC;sBAkBc;mCAEa"}

package/build/fork/useLinking.native.js

@@ -121,7 +121,8 @@ function useLinking(ref, { prefixes, filter, config, getInitialURL = ()=>(0, _ge
                         href: path,
                         originalHref: url,
                         options: {
-                            event: 'NAVIGATE'
+                            event: 'NAVIGATE',
+                            __internal__popToNavigator: true
                         }
                     }
                 });

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","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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"}
+{"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","__internal__popToNavigator"],"mappings":"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"}

package/build/global-state/getNavigationAction.js

@@ -40,7 +40,10 @@ function getNavigateAction(baseHref, options, config, type, withAnchor, singular
             type: type ?? 'NAVIGATE',
             payload: {
                 singular,
-                __internal__PreviewKey: previewKey
+                __internal__PreviewKey: previewKey,
+                ...options.__internal__popToNavigator ? {
+                    pop: true
+                } : undefined
             }
         },
         withAnchor,

package/build/global-state/getNavigationAction.js.map

@@ -1 +1 @@
-{"version":3,"sources":["global-state/getNavigationAction.ts"],"sourcesContent":[null],"names":["getNavigateAction","baseHref","options","config","type","withAnchor","singular","previewKey","navigationState","linking","routeNode","Error","routeInfo","getRouteInfoFromState","href","applyRedirects","resolveHrefStringWithSegments","redirects","state","getStateFromPath","segments","routes","length","status","internalParams","__internal__previewId","undefined","INTERNAL_EXPO_ROUTER_PREVIEW_ID_PARAM_NAME","action","resolveNavigationDestination","targetState","registry","payload","__internal__PreviewKey"],"mappings":";;;;+BA2BgBA;;;eAAAA;;;oCAzBe;sBACe;kCAIvC;uCAI+B;8CACO;AAetC,SAASA,kBACdC,QAAgB,EAChBC,OAAsB,EACtBC,MAA4B,EAC5BC,IAAwB,EACxBC,UAA+B,EAC/BC,QAAqC,EACrCC,UAA8B,EAC9BC,eAAgC;IAEhC,IAAI,CAACL,OAAOM,OAAO,IAAI,CAACN,OAAOO,SAAS,EAAE;QACxC,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAMC,YAAYC,IAAAA,4CAAqB,EAACL;IACxC,MAAMM,OAAOC,IAAAA,kCAAc,EACzBC,IAAAA,mCAA6B,EAACf,UAAUW,WAAWV,UACnDC,OAAOc,SAAS;IAGlB,MAAMC,QAAQf,OAAOM,OAAO,CAACU,gBAAgB,CAAEL,MAAMX,OAAOM,OAAO,CAACN,MAAM,EAAES,UAAUQ,QAAQ;IAC9F,IAAI,CAACF,SAASA,MAAMG,MAAM,CAACC,MAAM,KAAK,GAAG;QACvC,OAAO;YAAEC,QAAQ;YAAWT;QAAK;IACnC;IAEA,MAAMU,iBAA2C;QAC/C,GAAItB,QAAQuB,qBAAqB,KAAKC,YAClC;YACE,CAACC,4DAA0C,CAAC,EAAEzB,QAAQuB,qBAAqB;QAC7E,IACA,CAAC,CAAC;IACR;IACA,MAAMG,SAASC,IAAAA,0DAA4B,EAAC;QAC1CC,aAAaZ;QACbV;QACAE,WAAWP,OAAOO,SAAS;QAC3BqB,UAAU5B,OAAO4B,QAAQ;QACzBH,QAAQ;YACNxB,MAAMA,QAAQ;YACd4B,SAAS;gBAAE1B;gBAAU2B,wBAAwB1B;YAAW;QAC1D;QACAF;QACAmB;IACF;IAEA,OAAO;QAAED,QAAQ;QAAUK;IAAO;AACpC"}
+{"version":3,"sources":["global-state/getNavigationAction.ts"],"sourcesContent":[null],"names":["getNavigateAction","baseHref","options","config","type","withAnchor","singular","previewKey","navigationState","linking","routeNode","Error","routeInfo","getRouteInfoFromState","href","applyRedirects","resolveHrefStringWithSegments","redirects","state","getStateFromPath","segments","routes","length","status","internalParams","__internal__previewId","undefined","INTERNAL_EXPO_ROUTER_PREVIEW_ID_PARAM_NAME","action","resolveNavigationDestination","targetState","registry","payload","__internal__PreviewKey","__internal__popToNavigator","pop"],"mappings":";;;;+BA2BgBA;;;eAAAA;;;oCAzBe;sBACe;kCAIvC;uCAI+B;8CACO;AAetC,SAASA,kBACdC,QAAgB,EAChBC,OAAsB,EACtBC,MAA4B,EAC5BC,IAAwB,EACxBC,UAA+B,EAC/BC,QAAqC,EACrCC,UAA8B,EAC9BC,eAAgC;IAEhC,IAAI,CAACL,OAAOM,OAAO,IAAI,CAACN,OAAOO,SAAS,EAAE;QACxC,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAMC,YAAYC,IAAAA,4CAAqB,EAACL;IACxC,MAAMM,OAAOC,IAAAA,kCAAc,EACzBC,IAAAA,mCAA6B,EAACf,UAAUW,WAAWV,UACnDC,OAAOc,SAAS;IAGlB,MAAMC,QAAQf,OAAOM,OAAO,CAACU,gBAAgB,CAAEL,MAAMX,OAAOM,OAAO,CAACN,MAAM,EAAES,UAAUQ,QAAQ;IAC9F,IAAI,CAACF,SAASA,MAAMG,MAAM,CAACC,MAAM,KAAK,GAAG;QACvC,OAAO;YAAEC,QAAQ;YAAWT;QAAK;IACnC;IAEA,MAAMU,iBAA2C;QAC/C,GAAItB,QAAQuB,qBAAqB,KAAKC,YAClC;YACE,CAACC,4DAA0C,CAAC,EAAEzB,QAAQuB,qBAAqB;QAC7E,IACA,CAAC,CAAC;IACR;IACA,MAAMG,SAASC,IAAAA,0DAA4B,EAAC;QAC1CC,aAAaZ;QACbV;QACAE,WAAWP,OAAOO,SAAS;QAC3BqB,UAAU5B,OAAO4B,QAAQ;QACzBH,QAAQ;YACNxB,MAAMA,QAAQ;YACd4B,SAAS;gBACP1B;gBACA2B,wBAAwB1B;gBACxB,GAAIL,QAAQgC,0BAA0B,GAAG;oBAAEC,KAAK;gBAAK,IAAIT,SAAS;YACpE;QACF;QACArB;QACAmB;IACF;IAEA,OAAO;QAAED,QAAQ;QAAUK;IAAO;AACpC"}

package/build/global-state/resolveNavigationDestination.js

@@ -23,6 +23,7 @@ const _stateKeys = require("../react-navigation/routers/stateKeys");
 const _utils = require("../react-navigation/routers/utils");
 const _routeNode = require("../routeNode");
 const _sortRoutes = require("../sortRoutes");
+const _getSingularId = require("../utils/getSingularId");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -83,20 +84,34 @@ function resolveNavigationDestination({ targetState, navigationState, routeNode,
         targetState: target,
         navigationState: current,
         routeNode: node,
+        rootRouteNode: routeNode,
         registry,
         action: resolvedAction,
         withAnchor,
         internalParams
     });
 }
-function createResolvedAction({ targetState, navigationState, routeNode, registry, action, withAnchor = false, internalParams = {} }) {
+function createResolvedAction({ targetState, navigationState, routeNode, rootRouteNode, registry, action, withAnchor = false, internalParams = {} }) {
     const targetRoute = getFocusedRoute(targetState);
     if (!targetRoute) {
         return action;
     }
     const params = (0, _navigationParams.appendInternalExpoRouterParams)(targetRoute.params, internalParams) ?? {};
+    const childTarget = targetRoute.state;
+    const childNode = findDestinationNode(routeNode, targetRoute.name);
+    const { pop, ...actionPayload } = action.payload;
+    const shouldPop = pop === true && shouldPopTo({
+        targetRoute,
+        navigationState,
+        routeNode,
+        rootRouteNode,
+        childNode
+    });
     const payload = {
-        ...action.payload,
+        ...actionPayload,
+        ...shouldPop ? {
+            pop
+        } : undefined,
         name: targetRoute.name,
         params,
         ...targetRoute.path !== undefined ? {
@@ -109,8 +124,6 @@ function createResolvedAction({ targetState, navigationState, routeNode, registr
     };
     const result = registry.get(navigationState.key)?.reduce(navigationState, baseAction);
     const selectedRoute = getSelection(result)?.route;
-    const childTarget = targetRoute.state;
-    const childNode = findDestinationNode(routeNode, targetRoute.name);
     if (!childTarget || !childNode) {
         return baseAction;
     }
@@ -120,11 +133,13 @@ function createResolvedAction({ targetState, navigationState, routeNode, registr
         targetState: childTarget,
         navigationState: selectedRoute?.state,
         routeNode: childNode,
+        rootRouteNode,
         registry,
         withAnchor,
         internalParams,
         parentChain,
-        previewKey: action.payload.__internal__PreviewKey
+        previewKey: action.payload.__internal__PreviewKey,
+        pop: pop === true
     });
     return {
         ...baseAction,
@@ -134,7 +149,7 @@ function createResolvedAction({ targetState, navigationState, routeNode, registr
         }
     };
 }
-function resolveState({ targetState, navigationState, routeNode, registry, withAnchor, internalParams, parentChain, previewKey }) {
+function resolveState({ targetState, navigationState, routeNode, rootRouteNode, registry, withAnchor, internalParams, parentChain, previewKey, pop }) {
     if (navigationState?.stale !== false || !registry.has(navigationState.key)) {
         return createDestinationState(targetState, routeNode, withAnchor, internalParams, parentChain);
     }
@@ -146,11 +161,15 @@ function resolveState({ targetState, navigationState, routeNode, registry, withA
         targetState: targetState,
         navigationState,
         routeNode,
+        rootRouteNode,
         registry,
         action: {
             type: 'NAVIGATE',
             payload: {
-                __internal__PreviewKey: previewKey
+                __internal__PreviewKey: previewKey,
+                ...pop ? {
+                    pop
+                } : undefined
             }
         },
         withAnchor,
@@ -236,6 +255,26 @@ function routesMatch(targetRoute, currentRoute) {
     const dynamic = (0, _matchers.matchDynamicName)(targetRoute.name);
     return !dynamic || targetRoute.params?.[dynamic.name] === currentRoute.params?.[dynamic.name];
 }
+/**
+ * Whether a `pop` request should apply to the target in this navigator. This follows React
+ * Navigation's `getActionFromState`, which incoming links used before: the root layout's navigator
+ * pops only to a route that holds a navigator, and every navigator below it pops to the target
+ * screen too. Stacks pop to the last route with the target's name, so for a dynamic route that
+ * route must also have the target's params; otherwise the link pushes a new instance instead of
+ * taking over another one.
+ */ function shouldPopTo({ targetRoute, navigationState, routeNode, rootRouteNode, childNode }) {
+    const isRootLayoutNavigator = routeNode === rootRouteNode && targetRoute.name !== _constants.INTERNAL_SLOT_NAME;
+    const holdsNavigator = targetRoute.state !== undefined || (childNode?.children.length ?? 0) > 0;
+    if (isRootLayoutNavigator && !holdsNavigator) {
+        return false;
+    }
+    const popTarget = navigationState.routes.findLast((route)=>route.name === targetRoute.name);
+    return !popTarget || (0, _getSingularId.getSingularId)(targetRoute.name, {
+        params: targetRoute.params
+    }) === (0, _getSingularId.getSingularId)(popTarget.name, {
+        params: popTarget.params
+    });
+}
 function findDestinationNode(routeNode, routeName) {
     return routeName === _constants.INTERNAL_SLOT_NAME ? routeNode : (0, _routeNode.findRouteNodeByName)(routeNode, routeName);
 }

package/build/global-state/resolveNavigationDestination.js.map

@@ -1 +1 @@
-{"version":3,"sources":["global-state/resolveNavigationDestination.ts"],"sourcesContent":[null],"names":["resolveNavigationDestination","supportedActionTypes","Set","targetState","navigationState","routeNode","registry","action","withAnchor","internalParams","has","type","Error","target","current","node","descended","targetRoute","getFocusedRoute","currentRoute","routes","find","route","name","index","childNode","findDestinationNode","childTarget","state","childState","routesMatch","stale","key","childRoute","probeAction","payload","params","appendInternalExpoRouterParams","getSelection","get","reduce","undefined","resolvedAction","source","createResolvedAction","path","baseAction","result","selectedRoute","parentChain","getChainFromRouteKey","createRouteKeyMinter","mint","resolveState","previewKey","__internal__PreviewKey","markState","createDestinationState","selection","isEqual","initialRouteName","getValidInitialRouteName","routeNames","children","sort","sortRoutesWithInitial","map","child","createInitialState","includes","console","warn","hasAnchor","destination","minter","destinationRouteKey","findRouteNodeByName","destinationRoute","routeKeySeq","length","dynamic","matchDynamicName","routeName","INTERNAL_SLOT_NAME","isActionHandled","affectedRouteKey","__internal__routerActionState"],"mappings":"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"}
+{"version":3,"sources":["global-state/resolveNavigationDestination.ts"],"sourcesContent":[null],"names":["resolveNavigationDestination","supportedActionTypes","Set","targetState","navigationState","routeNode","registry","action","withAnchor","internalParams","has","type","Error","target","current","node","descended","targetRoute","getFocusedRoute","currentRoute","routes","find","route","name","index","childNode","findDestinationNode","childTarget","state","childState","routesMatch","stale","key","childRoute","probeAction","payload","params","appendInternalExpoRouterParams","getSelection","get","reduce","undefined","resolvedAction","source","createResolvedAction","rootRouteNode","pop","actionPayload","shouldPop","shouldPopTo","path","baseAction","result","selectedRoute","parentChain","getChainFromRouteKey","createRouteKeyMinter","mint","resolveState","previewKey","__internal__PreviewKey","markState","createDestinationState","selection","isEqual","initialRouteName","getValidInitialRouteName","routeNames","children","sort","sortRoutesWithInitial","map","child","createInitialState","includes","console","warn","hasAnchor","destination","minter","destinationRouteKey","findRouteNodeByName","destinationRoute","routeKeySeq","length","dynamic","matchDynamicName","isRootLayoutNavigator","INTERNAL_SLOT_NAME","holdsNavigator","popTarget","findLast","getSingularId","routeName","isActionHandled","affectedRouteKey","__internal__routerActionState"],"mappings":"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"}

package/build/global-state/types.d.ts

@@ -30,7 +30,8 @@ export type LinkToOptions = {
     dangerouslySingular?: SingularOptions;
     __internal__PreviewKey?: string;
     __internal__previewId?: string;
+    __internal__popToNavigator?: boolean;
 };
-export type NavigationOptions = Omit<LinkToOptions, 'event'>;
+export type NavigationOptions = Omit<LinkToOptions, 'event' | '__internal__popToNavigator'>;
 export type TransitionOptions = Pick<LinkToOptions, 'inTransition'>;
 export type NavigationTransitionMode = 'always' | 'never' | 'preload-only';

package/build/layouts/stack-router.d.ts

@@ -1,4 +1,4 @@
-import { type CommonNavigationAction, type ParamListBase, RouterActionHandling, type RouterConfigOptions, type StackActionType, type StackNavigationState } from '../react-navigation/native';
+import { type CommonNavigationAction, type ParamListBase, type StackActionType, type StackNavigationState } from '../react-navigation/native';
 import type { NativeStackNavigatorProps } from '../react-navigation/native-stack';
 /**
  * React Navigation matches a screen by its name or a 'getID' function that uniquely identifies a screen.
@@ -10,6 +10,4 @@ import type { NativeStackNavigatorProps } from '../react-navigation/native-stack
  *
  */
 export declare const stackRouterOverride: NonNullable<NativeStackNavigatorProps['UNSTABLE_router']>;
-export declare const StackRouter: (options: import("..").StackRouterOptions) => Omit<import("..").Router<StackNavigationState<ParamListBase>, CommonNavigationAction | StackActionType>, "getStateForAction"> & {
-    getStateForAction(state: StackNavigationState<ParamListBase>, action: CommonNavigationAction | StackActionType, options: RouterConfigOptions): RouterActionHandling.Unhandled | import("..").RouterActionResult<StackNavigationState<ParamListBase>>;
-};
+export declare const StackRouter: (options: import("..").StackRouterOptions) => import("..").ExtendedRouter<StackNavigationState<ParamListBase>, CommonNavigationAction | StackActionType>;

package/build/native-tabs/NativeBottomTabsRouter.d.ts

@@ -1,4 +1 @@
-import { RouterActionHandling } from '../react-navigation/native';
-export declare const NativeBottomTabsRouter: (options: import("..").TabRouterOptions) => Omit<import("..").Router<import("..").TabNavigationState<import("../react-navigation").ParamListBase>, import("..").CommonNavigationAction | import("..").TabActionType>, "getStateForAction"> & {
-    getStateForAction(state: import("..").TabNavigationState<import("../react-navigation").ParamListBase>, action: import("..").CommonNavigationAction | import("..").TabActionType, options: import("..").RouterConfigOptions): RouterActionHandling.Unhandled | import("..").RouterActionResult<import("..").TabNavigationState<import("../react-navigation").ParamListBase>>;
-};
+export declare const NativeBottomTabsRouter: (options: import("..").TabRouterOptions) => import("..").ExtendedRouter<import("..").TabNavigationState<import("../react-navigation").ParamListBase>, import("..").CommonNavigationAction | import("..").TabActionType>;

package/build/react-navigation/routers/BaseRouter.d.ts

@@ -1,9 +1,9 @@
-import { type CommonNavigationAction, RouterActionHandling } from './types';
+import { type CommonNavigationAction } from './types';
 /**
  * Base router that handles the common actions (`SET_PARAMS`, `REPLACE_PARAMS`, `RESET`) and
  * filters undeclared routes. Every built-in router extends it.
  */
-export declare const BaseRouter: (options: import("./types").DefaultRouterOptions) => Omit<import("./types").Router<Readonly<{
+export declare const BaseRouter: (options: import("./types").DefaultRouterOptions) => import("./extendRouter").ExtendedRouter<Readonly<{
     key: string;
     routeKeySeq: number;
     index: number;
@@ -12,24 +12,4 @@ export declare const BaseRouter: (options: import("./types").DefaultRouterOption
     routes: import("./types").NavigationRoute<import("./types").ParamListBase, string>[];
     type?: string;
     stale: false;
-}>, CommonNavigationAction>, "getStateForAction"> & {
-    getStateForAction(state: Readonly<{
-        key: string;
-        routeKeySeq: number;
-        index: number;
-        routeNames: string[];
-        history?: unknown[];
-        routes: import("./types").NavigationRoute<import("./types").ParamListBase, string>[];
-        type?: string;
-        stale: false;
-    }>, action: CommonNavigationAction, options: import("./types").RouterConfigOptions): RouterActionHandling.Unhandled | import("./types").RouterActionResult<Readonly<{
-        key: string;
-        routeKeySeq: number;
-        index: number;
-        routeNames: string[];
-        history?: unknown[];
-        routes: import("./types").NavigationRoute<import("./types").ParamListBase, string>[];
-        type?: string;
-        stale: false;
-    }>>;
-};
+}>, CommonNavigationAction>;

package/build/react-navigation/routers/DrawerRouter.d.ts

@@ -1,5 +1,5 @@
 import { type TabActionHelpers, type TabActionType, type TabNavigationState, type TabRouterOptions } from './TabRouter';
-import { type CommonNavigationAction, type ParamListBase, RouterActionHandling } from './types';
+import { type CommonNavigationAction, type ParamListBase } from './types';
 export type DrawerStatus = 'open' | 'closed';
 export type DrawerActionType = TabActionType | {
     type: 'OPEN_DRAWER' | 'CLOSE_DRAWER' | 'TOGGLE_DRAWER';
@@ -67,6 +67,4 @@ export declare const DrawerActions: {
 /**
  * DrawerRouter is considered internal implementation and its behavior may change without a notice between expo-router's version
  */
-export declare const DrawerRouter: (options: DrawerRouterOptions) => Omit<import("./types").Router<DrawerNavigationState<ParamListBase>, CommonNavigationAction | DrawerActionType>, "getStateForAction"> & {
-    getStateForAction(state: DrawerNavigationState<ParamListBase>, action: CommonNavigationAction | DrawerActionType, options: import("./types").RouterConfigOptions): RouterActionHandling.Unhandled | import("./types").RouterActionResult<DrawerNavigationState<ParamListBase>>;
-};
+export declare const DrawerRouter: (options: DrawerRouterOptions) => import("./extendRouter").ExtendedRouter<DrawerNavigationState<ParamListBase>, CommonNavigationAction | DrawerActionType>;

package/build/react-navigation/routers/StackRouter.d.ts

@@ -1,5 +1,5 @@
 import { type RouteState } from './attachRouteState';
-import { type CommonNavigationAction, type DefaultRouterOptions, type NavigationState, type ParamListBase, RouterActionHandling, type RouterBrowserHistoryAction, type NavigationAction } from './types';
+import { type CommonNavigationAction, type DefaultRouterOptions, type NavigationState, type ParamListBase, type RouterBrowserHistoryAction, type NavigationAction } from './types';
 export type StackActionType = {
     type: 'REPLACE';
     payload: {
@@ -133,6 +133,4 @@ export declare const StackActions: {
 /**
  * StackRouter is considered an internal implementation and its behavior may change without a notice between expo-router's version
  */
-export declare const StackRouter: (options: StackRouterOptions) => Omit<import("./types").Router<StackNavigationState<ParamListBase>, CommonNavigationAction | StackActionType>, "getStateForAction"> & {
-    getStateForAction(state: StackNavigationState<ParamListBase>, action: CommonNavigationAction | StackActionType, options: import("./types").RouterConfigOptions): RouterActionHandling.Unhandled | import("./types").RouterActionResult<StackNavigationState<ParamListBase>>;
-};
+export declare const StackRouter: (options: StackRouterOptions) => import("./extendRouter").ExtendedRouter<StackNavigationState<ParamListBase>, CommonNavigationAction | StackActionType>;

package/build/react-navigation/routers/TabRouter.d.ts

@@ -1,5 +1,5 @@
 import { type RouteState } from './attachRouteState';
-import { type CommonNavigationAction, type DefaultRouterOptions, type NavigationState, type ParamListBase, RouterActionHandling } from './types';
+import { type CommonNavigationAction, type DefaultRouterOptions, type NavigationState, type ParamListBase } from './types';
 export type TabActionType = {
     type: 'JUMP_TO';
     payload: {
@@ -92,7 +92,5 @@ export declare const ensureStateHistory: (state: TabNavigationState<ParamListBas
 /**
  * TabRouter is considered an internal implementation and its behavior may change without a notice between expo-router's version
  */
-export declare const TabRouter: (options: TabRouterOptions) => Omit<import("./types").Router<TabNavigationState<ParamListBase>, CommonNavigationAction | TabActionType>, "getStateForAction"> & {
-    getStateForAction(state: TabNavigationState<ParamListBase>, action: CommonNavigationAction | TabActionType, options: import("./types").RouterConfigOptions): RouterActionHandling.Unhandled | import("./types").RouterActionResult<TabNavigationState<ParamListBase>>;
-};
+export declare const TabRouter: (options: TabRouterOptions) => import("./extendRouter").ExtendedRouter<TabNavigationState<ParamListBase>, CommonNavigationAction | TabActionType>;
 export {};

package/build/react-navigation/routers/extendRouter.d.ts

@@ -43,7 +43,12 @@ export type RouterExtensionMembers<State extends NavigationState, Action extends
  * state type, so an extension that changes the state type returns its own unless the base's fits.
  */
 export type RouterExtension<State extends NavigationState, Action extends NavigationAction, Options extends DefaultRouterOptions> = (context: RouterExtensionContext<State, Action, Options>) => Partial<RouterExtensionMembers<State, Action>>;
-type ExtendedRouter<State extends NavigationState, Action extends NavigationAction> = Omit<Router<State, Action>, 'getStateForAction'> & {
+/**
+ * The router that a factory from `extendRouter` or `extendRouterActions` creates. Its
+ * `getStateForAction` returns `RouterActionHandling.Unhandled`, never `null`, for an action that
+ * it does not handle.
+ */
+export type ExtendedRouter<State extends NavigationState, Action extends NavigationAction> = Omit<Router<State, Action>, 'getStateForAction'> & {
     getStateForAction(state: State, action: Action, options: RouterConfigOptions): RouterActionResult<State> | RouterActionHandling.Unhandled;
 };
 /**
@@ -86,4 +91,3 @@ export type RouterActionReducer<State extends NavigationState, Action extends Na
  * ```
  */
 export declare function extendRouterActions<State extends NavigationState, BaseAction extends NavigationAction, BaseOptions extends DefaultRouterOptions, Action extends NavigationAction = BaseAction, Options extends BaseOptions = BaseOptions>(base: RouterFactory<State, BaseAction, BaseOptions>, reducer: RouterActionReducer<State, Action, Options>): (options: Options) => ExtendedRouter<State, Action>;
-export {};

package/build/react-navigation/routers/extendRouter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["react-navigation/routers/extendRouter.tsx"],"sourcesContent":[null],"names":["extendRouter","extendRouterActions","base","extension","type","extendedType","warnedNull","options","baseRouter","ensureType","state","undefined","ensureStateType","current","key","routeKeySeq","start","config","stamp","finish","stateType","stamped","typed","normalizeState","delegate","getStateForAction","action","Error","result","isActionHandled","RouterActionHandling","Unhandled","Math","max","nextKey","name","minter","createRouteKeyMinter","mint","router","getStateForDeclaredRoutes","routeNames","getStateForRouteFocus","typedState","process","env","NODE_ENV","console","warn","resolved","Delegate","finishedState","getBrowserHistoryForAction","browserHistory","reducer","warnedUndefined","overrides"],"mappings":"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"}
+{"version":3,"sources":["react-navigation/routers/extendRouter.tsx"],"sourcesContent":[null],"names":["extendRouter","extendRouterActions","base","extension","type","extendedType","warnedNull","options","baseRouter","ensureType","state","undefined","ensureStateType","current","key","routeKeySeq","start","config","stamp","finish","stateType","stamped","typed","normalizeState","delegate","getStateForAction","action","Error","result","isActionHandled","RouterActionHandling","Unhandled","Math","max","nextKey","name","minter","createRouteKeyMinter","mint","router","getStateForDeclaredRoutes","routeNames","getStateForRouteFocus","typedState","process","env","NODE_ENV","console","warn","resolved","Delegate","finishedState","getBrowserHistoryForAction","browserHistory","reducer","warnedUndefined","overrides"],"mappings":";;;;;;;;;;;;;;;QAkHgBA;eAAAA;;QAsKAC;eAAAA;;;iCAxRgB;2BACK;uBAU9B;uBACyB;AAsGzB,SAASD,aAQdE,IAAuD,EACvDC,SAAkD,EAClD,EAAEC,MAAMC,YAAY,EAAiC,GAAG,CAAC,CAAC;IAM1D,sFAAsF;IACtF,IAAIC,aAAa;IACjB,OAAO,CAACC;QACN,2FAA2F;QAC3F,4FAA4F;QAC5F,MAAMC,aAAaN,KAAKK;QACxB,MAAMH,OAAOC,gBAAgBG,WAAWJ,IAAI;QAC5C,MAAMK,aAAa,CAACC,QAClBN,SAASO,YAAYD,QAAQE,IAAAA,gCAAe,EAACF,OAAON;QAEtD,8FAA8F;QAC9F,wFAAwF;QACxF,IAAIS,UAA8E;YAChFC,KAAK;YACLC,aAAa;QACf;QACA,MAAMC,QAAQ,CAACN,OAAcO;YAC3BJ,UAAU;gBAAEC,KAAKJ,MAAMI,GAAG;gBAAEC,aAAaL,MAAMK,WAAW;gBAAEE;YAAO;YACnE,OAAOP;QACT;QACA,MAAMQ,QAAQ,CAACR,QACbA,MAAMK,WAAW,GAAGF,QAAQE,WAAW,GACnC;gBAAE,GAAGL,KAAK;gBAAEK,aAAaF,QAAQE,WAAW;YAAC,IAC7CL;QACN,2FAA2F;QAC3F,0FAA0F;QAC1F,oFAAoF;QACpF,mEAAmE;QACnE,MAAMS,SAAS,CAACT,OAAcU;YAC5B,MAAMC,UAAUH,MAAMR;YACtB,MAAMY,QAAQF,cAAcT,YAAYU,UAAUT,IAAAA,gCAAe,EAACS,SAASD;YAC3E,OAAOG,iBAAiBA,eAAeD,SAASA;QAClD;QAEA,MAAME,WAAyE;YAC7E,GAAGhB,UAAU;YACbiB,mBAAkBf,KAAK,EAAEgB,MAAM,EAAET,SAASJ,QAAQI,MAAM;gBACtD,IAAIA,WAAWN,WAAW;oBACxB,MAAM,IAAIgB,MACR;gBAEJ;gBACA,MAAMC,SAASpB,WAAWiB,iBAAiB,CAACP,MAAMR,QAAQgB,QAAQT;gBAClE,+DAA+D;gBAC/D,IAAI,CAACY,IAAAA,sBAAe,EAACD,SAAS;oBAC5B,OAAOE,2BAAoB,CAACC,SAAS;gBACvC;gBACAlB,QAAQE,WAAW,GAAGiB,KAAKC,GAAG,CAACpB,QAAQE,WAAW,EAAEa,OAAOlB,KAAK,CAACK,WAAW;gBAC5E,OAAOa;YACT;QACF;QACA,MAAMM,UAAU,CAACC;YACf,MAAMC,SAASC,IAAAA,+BAAoB,EAACxB;YACpC,MAAMC,MAAMsB,OAAOE,IAAI,CAACH;YACxBtB,QAAQE,WAAW,GAAGqB,OAAOrB,WAAW;YACxC,OAAOD;QACT;QAEA,MAAMyB,SAAgD;YACpD,GAAGf,QAAQ;YACX,GAAGrB,UAAU;gBAAEK,YAAYgB;gBAAUjB;gBAAS2B;YAAQ,EAAE;YACxD9B;QACF;QACA,MAAM,EAAEmB,cAAc,EAAE,GAAGgB;QAE3B,OAAO;YACL,GAAGA,MAAM;YACTC,2BAA0B9B,KAAK,EAAE+B,UAAU;gBACzC,0FAA0F;gBAC1F,OAAOtB,OAAOoB,OAAOC,yBAAyB,CAACxB,MAAMN,QAAQ+B,aAAa/B,MAAMN,IAAI;YACtF;YACAsC,uBAAsBhC,KAAK,EAAEI,GAAG;gBAC9B,MAAM6B,aAAalC,WAAWO,MAAMN;gBACpC,OAAOS,OAAOoB,OAAOG,qBAAqB,CAACC,YAAY7B,MAAM6B,WAAWvC,IAAI;YAC9E;YACAqB,mBAAkBf,KAAK,EAAEgB,MAAM,EAAET,MAAM;gBACrC,MAAM0B,aAAalC,WAAWO,MAAMN,OAAOO;gBAC3C,MAAMW,SAASW,OAAOd,iBAAiB,CAACkB,YAAYjB,QAAQT;gBAC5D,IAAIW,WAAW,QAAQgB,QAAQC,GAAG,CAACC,QAAQ,KAAK,gBAAgB,CAACxC,YAAY;oBAC3EA,aAAa;oBACbyC,QAAQC,IAAI,CACV,CAAC,4FAA4F,EAAEtB,OAAOtB,IAAI,CAAC,6LAA6L,CAAC;gBAE7S;gBACA,MAAM6C,WACJrB,WAAWE,2BAAoB,CAACoB,QAAQ,GACpC1B,SAASC,iBAAiB,CAACkB,YAAYjB,QAAQT,UAC/CW;gBAEN,IAAI,CAACC,IAAAA,sBAAe,EAACoB,WAAW;oBAC9B,OAAOnB,2BAAoB,CAACC,SAAS;gBACvC;gBAEA,MAAMoB,gBAAgBhC,OAAO8B,SAASvC,KAAK,EAAEiC,WAAWvC,IAAI;gBAC5D,IAAImC,OAAOa,0BAA0B,EAAE;oBACrC,MAAMC,iBAAiBd,OAAOa,0BAA0B,CACtDT,YACAQ,eACAzB;oBAEF,IAAI2B,mBAAmBJ,SAASI,cAAc,EAAE;wBAC9C,OAAO;4BAAE,GAAGJ,QAAQ;4BAAEvC,OAAOyC;4BAAeE;wBAAe;oBAC7D;gBACF;gBACA,OAAOF,kBAAkBF,SAASvC,KAAK,GAAGuC,WAAW;oBAAE,GAAGA,QAAQ;oBAAEvC,OAAOyC;gBAAc;YAC3F;QACF;IACF;AACF;AA0CO,SAASlD,oBAOdC,IAAmD,EACnDoD,OAAoD;IAEpD,sFAAsF;IACtF,IAAIC,kBAAkB;IACtB,OAAOvD,aACLE,MACA,CAAC,EAAEM,UAAU,EAAED,OAAO,EAAE2B,OAAO,EAAE;QAC/B,2FAA2F;QAC3F,+EAA+E;QAC/E,MAAMsB,YAAY;YAChB/B,mBAAkBf,KAAY,EAAEgB,MAAc,EAAET,MAA2B;gBACzE,MAAMW,SAAS0B,QAAQ5C,OAAOgB,QAAQ;oBAAE,GAAGT,MAAM;oBAAET;oBAAYD;oBAAS2B;gBAAQ;gBAChF,IAAIN,WAAWjB,WAAW;oBACxB,OAAOiB;gBACT;gBACA,IAAIgB,QAAQC,GAAG,CAACC,QAAQ,KAAK,gBAAgB,CAACS,iBAAiB;oBAC7DA,kBAAkB;oBAClBR,QAAQC,IAAI,CACV,CAAC,mEAAmE,EAAEtB,OAAOtB,IAAI,CAAC,mIAAmI,CAAC;gBAE1N;gBACA,OAAO0B,2BAAoB,CAACoB,QAAQ;YACtC;QACF;QACA,OAAOM;IACT;AAEJ"}

package/build/react-navigation/routers/index.d.ts

@@ -5,7 +5,7 @@ export { attachRouteState } from './attachRouteState';
 export type { DrawerActionHelpers, DrawerActionType, DrawerNavigationState, DrawerRouterOptions, DrawerStatus, } from './DrawerRouter';
 export { DrawerActions, DrawerRouter } from './DrawerRouter';
 export { extendRouter, extendRouterActions } from './extendRouter';
-export type { RouterActionContext, RouterActionReducer, RouterExtension, RouterExtensionContext, RouterExtensionOptions, } from './extendRouter';
+export type { ExtendedRouter, RouterActionContext, RouterActionReducer, RouterExtension, RouterExtensionContext, RouterExtensionMembers, RouterExtensionOptions, } from './extendRouter';
 export type { StackActionHelpers, StackActionType, StackNavigationState, StackRouterOptions, } from './StackRouter';
 export { StackActions, StackRouter } from './StackRouter';
 export type { TabActionHelpers, TabActionType, TabNavigationState, TabRouterOptions, } from './TabRouter';

package/build/react-navigation/routers/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["react-navigation/routers/index.tsx"],"sourcesContent":[null],"names":["BaseRouter","CommonActions","DrawerActions","DrawerRouter","StackActions","StackRouter","TabActions","TabRouter","attachRouteState","extendRouter","extendRouterActions","isActionHandled"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;QAISA;eAAAA,sBAAU;;QAFVC;eAAAA;;QAWAC;eAAAA,2BAAa;;QAAEC;eAAAA,0BAAY;;QAe3BC;eAAAA,yBAAY;;QAAEC;eAAAA,wBAAW;;QAOzBC;eAAAA,qBAAU;;QAAEC;eAAAA,oBAAS;;QA9BrBC;eAAAA,kCAAgB;;QAShBC;eAAAA,0BAAY;;QAAEC;eAAAA,iCAAmB;;QAuBjCC;eAAAA,sBAAe;;;;uEArCO;4BAIJ;kCACM;8BAQW;8BACM;6BAcR;2BAOJ;qBACxB;uBACkB"}
+{"version":3,"sources":["react-navigation/routers/index.tsx"],"sourcesContent":[null],"names":["BaseRouter","CommonActions","DrawerActions","DrawerRouter","StackActions","StackRouter","TabActions","TabRouter","attachRouteState","extendRouter","extendRouterActions","isActionHandled"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;QAISA;eAAAA,sBAAU;;QAFVC;eAAAA;;QAWAC;eAAAA,2BAAa;;QAAEC;eAAAA,0BAAY;;QAiB3BC;eAAAA,yBAAY;;QAAEC;eAAAA,wBAAW;;QAOzBC;eAAAA,qBAAU;;QAAEC;eAAAA,oBAAS;;QAhCrBC;eAAAA,kCAAgB;;QAShBC;eAAAA,0BAAY;;QAAEC;eAAAA,iCAAmB;;QAyBjCC;eAAAA,sBAAe;;;;uEAvCO;4BAIJ;kCACM;8BAQW;8BACM;6BAgBR;2BAOJ;qBACxB;uBACkB"}

package/build/ui/TabRouter.d.ts

@@ -1,4 +1,4 @@
-import { type CommonNavigationAction, type ParamListBase, RouterActionHandling, type TabActionType as RNTabActionType, type TabNavigationState, type TabRouterOptions as RNTabRouterOptions } from '../react-navigation/native';
+import { type CommonNavigationAction, type ParamListBase, type TabActionType as RNTabActionType, type TabNavigationState, type TabRouterOptions as RNTabRouterOptions } from '../react-navigation/native';
 import { type RouteState } from '../react-navigation/routers/attachRouteState';
 import { type TriggerMap } from './common';
 export type ExpoTabRouterOptions = RNTabRouterOptions & {
@@ -15,6 +15,4 @@ export type ExpoTabActionType = RNTabActionType | CommonNavigationAction | {
         state?: RouteState;
     };
 };
-export declare const ExpoTabRouter: (options: ExpoTabRouterOptions) => Omit<import("..").Router<TabNavigationState<ParamListBase>, ExpoTabActionType>, "getStateForAction"> & {
-    getStateForAction(state: TabNavigationState<ParamListBase>, action: ExpoTabActionType, options: import("..").RouterConfigOptions): RouterActionHandling.Unhandled | import("..").RouterActionResult<TabNavigationState<ParamListBase>>;
-};
+export declare const ExpoTabRouter: (options: ExpoTabRouterOptions) => import("..").ExtendedRouter<TabNavigationState<ParamListBase>, ExpoTabActionType>;

package/build/views/Toast.js

@@ -71,7 +71,7 @@ function useFadeIn() {
         _reactnative().Animated.timing(value, {
             toValue: 1,
             duration: 200,
-            useNativeDriver: true
+            useNativeDriver: _reactnative().Platform.OS !== 'web'
         }).start();
     }, []);
     return value;

package/build/views/Toast.js.map

@@ -1 +1 @@
-{"version":3,"sources":["views/Toast.tsx"],"sourcesContent":[null],"names":["CODE_FONT","Toast","ToastWrapper","Platform","select","default","ios","android","useFadeIn","value","React","useState","Animated","Value","useEffect","timing","toValue","duration","useNativeDriver","start","children","inTabBar","use","BottomTabBarHeightContext","Wrapper","View","SafeAreaView","collapsable","style","flex","filename","warning","filenamePretty","useMemo","undefined","replace","styles","container","toast","position","web","opacity","ActivityIndicator","color","Image","source","require","icon","marginLeft","Text","text","StyleSheet","create","backgroundColor","width","height","resizeMode","alignItems","borderWidth","borderColor","flexDirection","bottom","left","paddingVertical","paddingHorizontal","borderRadius","fontSize","fontFamily","code"],"mappings":"AAAA;;;;;;;;;;;;;;;;;QAQaA;eAAAA;;QA8BGC;eAAAA;;QAXAC;eAAAA;;;;;;;;;;;gEAzB8B;;;;;;;yBACuC;;;;;;;yBACxD;;;;;;4BAEa;;;;;;AAEnC,MAAMF,YAAYG,uBAAQ,CAACC,MAAM,CAAC;IACvCC,SAAS;IACTC,KAAK;IACLC,SAAS;AACX;AAEA,SAASC;IACP,sDAAsD;IACtD,MAAM,CAACC,MAAM,GAAGC,gBAAK,CAACC,QAAQ,CAAC,IAAM,IAAIC,CAAAA,cAAO,UAAC,CAACC,KAAK,CAAC;IACxDH,gBAAK,CAACI,SAAS,CAAC;QACdF,uBAAQ,CAACG,MAAM,CAACN,OAAO;YACrBO,SAAS;YACTC,UAAU;YACVC,iBAAiB;QACnB,GAAGC,KAAK;IACV,GAAG,EAAE;IACL,OAAOV;AACT;AAEO,SAASP,aAAa,EAAEkB,QAAQ,EAA2B;IAChE,MAAMC,WAAWX,gBAAK,CAACY,GAAG,CAACC,qCAAyB;IACpD,MAAMC,UAAUH,WAAWI,mBAAI,GAAGC,0CAAY;IAE9C,qBACE,uBAACF;QAAQG,aAAa;QAAOC,OAAO;YAAEC,MAAM;QAAE;kBAC3CT;;AAGP;AAEO,SAASnB,MAAM,EACpBmB,QAAQ,EACRU,QAAQ,EACRC,OAAO,EAIP;IACA,MAAMC,iBAAiBtB,gBAAK,CAACuB,OAAO,CAAC;QACnC,IAAI,CAACH,UAAU,OAAOI;QACtB,OAAO,QAAQJ,SAASK,OAAO,CAAC,OAAO;IACzC,GAAG;QAACL;KAAS;IACb,MAAMrB,QAAQD;IACd,qBACE,uBAACiB,mBAAI;QAACG,OAAOQ,OAAOC,SAAS;kBAC3B,cAAA,wBAACzB,uBAAQ,CAACa,IAAI;YACZG,OAAO;gBACLQ,OAAOE,KAAK;gBACZ;oBACEC,UAAUpC,uBAAQ,CAACC,MAAM,CAAC;wBACxB,4DAA4D;wBAC5DoC,KAAK;wBACLnC,SAAS;oBACX;oBACAoC,SAAShC;gBACX;aACD;;gBACA,CAACsB,yBAAW,uBAACW,gCAAiB;oBAACC,OAAM;;gBACrCZ,yBAAW,uBAACa,oBAAK;oBAACC,QAAQC,QAAQ;oBAAiClB,OAAOQ,OAAOW,IAAI;;8BACtF,wBAACtB,mBAAI;oBAACG,OAAO;wBAAEoB,YAAY;oBAAE;;sCAC3B,uBAACC,mBAAI;4BAACrB,OAAOQ,OAAOc,IAAI;sCAAG9B;;wBAC1BY,gCAAkB,uBAACiB,mBAAI;4BAACrB,OAAOQ,OAAON,QAAQ;sCAAGE;;;;;;;AAK5D;AAEA,MAAMI,SAASe,yBAAU,CAACC,MAAM,CAAC;IAC/Bf,WAAW;QACTgB,iBAAiB;QACjBxB,MAAM;IACR;IACAkB,MAAM;QAAEO,OAAO;QAAIC,QAAQ;QAAIC,YAAY;IAAU;IACrDlB,OAAO;QACLmB,YAAY;QACZC,aAAa;QACbC,aAAa;QACbC,eAAe;QACfC,QAAQ;QACRC,MAAM;QACNC,iBAAiB;QACjBC,mBAAmB;QACnBC,cAAc;QACdZ,iBAAiB;IACnB;IACAH,MAAM;QAAEP,OAAO;QAASuB,UAAU;IAAG;IACrCpC,UAAU;QACRqC,YAAYnE;QACZyC,SAAS;QACTE,OAAO;QACPuB,UAAU;IACZ;IACAE,MAAM;QAAED,YAAYnE;IAAU;AAChC"}
+{"version":3,"sources":["views/Toast.tsx"],"sourcesContent":[null],"names":["CODE_FONT","Toast","ToastWrapper","Platform","select","default","ios","android","useFadeIn","value","React","useState","Animated","Value","useEffect","timing","toValue","duration","useNativeDriver","OS","start","children","inTabBar","use","BottomTabBarHeightContext","Wrapper","View","SafeAreaView","collapsable","style","flex","filename","warning","filenamePretty","useMemo","undefined","replace","styles","container","toast","position","web","opacity","ActivityIndicator","color","Image","source","require","icon","marginLeft","Text","text","StyleSheet","create","backgroundColor","width","height","resizeMode","alignItems","borderWidth","borderColor","flexDirection","bottom","left","paddingVertical","paddingHorizontal","borderRadius","fontSize","fontFamily","code"],"mappings":"AAAA;;;;;;;;;;;;;;;;;QAQaA;eAAAA;;QA8BGC;eAAAA;;QAXAC;eAAAA;;;;;;;;;;;gEAzB8B;;;;;;;yBACuC;;;;;;;yBACxD;;;;;;4BAEa;;;;;;AAEnC,MAAMF,YAAYG,uBAAQ,CAACC,MAAM,CAAC;IACvCC,SAAS;IACTC,KAAK;IACLC,SAAS;AACX;AAEA,SAASC;IACP,sDAAsD;IACtD,MAAM,CAACC,MAAM,GAAGC,gBAAK,CAACC,QAAQ,CAAC,IAAM,IAAIC,CAAAA,cAAO,UAAC,CAACC,KAAK,CAAC;IACxDH,gBAAK,CAACI,SAAS,CAAC;QACdF,uBAAQ,CAACG,MAAM,CAACN,OAAO;YACrBO,SAAS;YACTC,UAAU;YACVC,iBAAiBf,uBAAQ,CAACgB,EAAE,KAAK;QACnC,GAAGC,KAAK;IACV,GAAG,EAAE;IACL,OAAOX;AACT;AAEO,SAASP,aAAa,EAAEmB,QAAQ,EAA2B;IAChE,MAAMC,WAAWZ,gBAAK,CAACa,GAAG,CAACC,qCAAyB;IACpD,MAAMC,UAAUH,WAAWI,mBAAI,GAAGC,0CAAY;IAE9C,qBACE,uBAACF;QAAQG,aAAa;QAAOC,OAAO;YAAEC,MAAM;QAAE;kBAC3CT;;AAGP;AAEO,SAASpB,MAAM,EACpBoB,QAAQ,EACRU,QAAQ,EACRC,OAAO,EAIP;IACA,MAAMC,iBAAiBvB,gBAAK,CAACwB,OAAO,CAAC;QACnC,IAAI,CAACH,UAAU,OAAOI;QACtB,OAAO,QAAQJ,SAASK,OAAO,CAAC,OAAO;IACzC,GAAG;QAACL;KAAS;IACb,MAAMtB,QAAQD;IACd,qBACE,uBAACkB,mBAAI;QAACG,OAAOQ,OAAOC,SAAS;kBAC3B,cAAA,wBAAC1B,uBAAQ,CAACc,IAAI;YACZG,OAAO;gBACLQ,OAAOE,KAAK;gBACZ;oBACEC,UAAUrC,uBAAQ,CAACC,MAAM,CAAC;wBACxB,4DAA4D;wBAC5DqC,KAAK;wBACLpC,SAAS;oBACX;oBACAqC,SAASjC;gBACX;aACD;;gBACA,CAACuB,yBAAW,uBAACW,gCAAiB;oBAACC,OAAM;;gBACrCZ,yBAAW,uBAACa,oBAAK;oBAACC,QAAQC,QAAQ;oBAAiClB,OAAOQ,OAAOW,IAAI;;8BACtF,wBAACtB,mBAAI;oBAACG,OAAO;wBAAEoB,YAAY;oBAAE;;sCAC3B,uBAACC,mBAAI;4BAACrB,OAAOQ,OAAOc,IAAI;sCAAG9B;;wBAC1BY,gCAAkB,uBAACiB,mBAAI;4BAACrB,OAAOQ,OAAON,QAAQ;sCAAGE;;;;;;;AAK5D;AAEA,MAAMI,SAASe,yBAAU,CAACC,MAAM,CAAC;IAC/Bf,WAAW;QACTgB,iBAAiB;QACjBxB,MAAM;IACR;IACAkB,MAAM;QAAEO,OAAO;QAAIC,QAAQ;QAAIC,YAAY;IAAU;IACrDlB,OAAO;QACLmB,YAAY;QACZC,aAAa;QACbC,aAAa;QACbC,eAAe;QACfC,QAAQ;QACRC,MAAM;QACNC,iBAAiB;QACjBC,mBAAmB;QACnBC,cAAc;QACdZ,iBAAiB;IACnB;IACAH,MAAM;QAAEP,OAAO;QAASuB,UAAU;IAAG;IACrCpC,UAAU;QACRqC,YAAYpE;QACZ0C,SAAS;QACTE,OAAO;QACPuB,UAAU;IACZ;IACAE,MAAM;QAAED,YAAYpE;IAAU;AAChC"}

package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.22/expo.modules.router-58.0.22.module → 58.0.24/expo.modules.router-58.0.24.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.router",
     "module": "expo.modules.router",
-    "version": "58.0.22",
+    "version": "58.0.24",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,8 +24,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.router-58.0.22.aar",
-          "url": "expo.modules.router-58.0.22.aar",
+          "name": "expo.modules.router-58.0.24.aar",
+          "url": "expo.modules.router-58.0.24.aar",
           "size": 16133,
           "sha512": "32ccb33ae7df2d0abc96fb77d87c776773a15d8de0818d83bbca865581f60f85a0c280a75de2f770590ccabadb78874cec32689a50a0bc29b6a9025ed6c592b1",
           "sha256": "5a620cdcb41c5bc3c82e954ffd02de6b85954cd41bde5b5694ac9d5f5f25aa8f",
@@ -74,8 +74,8 @@
       ],
       "files": [
         {
-          "name": "expo.modules.router-58.0.22.aar",
-          "url": "expo.modules.router-58.0.22.aar",
+          "name": "expo.modules.router-58.0.24.aar",
+          "url": "expo.modules.router-58.0.24.aar",
           "size": 16133,
           "sha512": "32ccb33ae7df2d0abc96fb77d87c776773a15d8de0818d83bbca865581f60f85a0c280a75de2f770590ccabadb78874cec32689a50a0bc29b6a9025ed6c592b1",
           "sha256": "5a620cdcb41c5bc3c82e954ffd02de6b85954cd41bde5b5694ac9d5f5f25aa8f",
@@ -94,8 +94,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.router-58.0.22-sources.jar",
-          "url": "expo.modules.router-58.0.22-sources.jar",
+          "name": "expo.modules.router-58.0.24-sources.jar",
+          "url": "expo.modules.router-58.0.24-sources.jar",
           "size": 1986,
           "sha512": "c1d7dd32034c271b8e8d511c2e8ea7705b8378c4e2859d4bf810cd75ea33bbd4c212c9bbb5f0d27ae90f8f599fbb8f865b37001791bb539e94b90413396e6139",
           "sha256": "3027e02be198959073884cd5afb9b46f39f0d7396a590f6840bb63ef37010adc",

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.24/expo.modules.router-58.0.24.module.md5

@@ -0,0 +1 @@
+c8e8da4cf569dd51671ae49143b3391e

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.24/expo.modules.router-58.0.24.module.sha1

@@ -0,0 +1 @@
+e612c7b4c0081ebcfec7ba9fddacc3ed1015548e

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.24/expo.modules.router-58.0.24.module.sha256

@@ -0,0 +1 @@
+f56c3ef0717f6812d1bc946c90377e9888820864d7c52a16d601c9974c719b22

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.24/expo.modules.router-58.0.24.module.sha512

@@ -0,0 +1 @@
+0017362b7557d83c277448c74f9bcd1b05c990633d534803fc9d7e7cb3fcd630c0a978157100a1482c47798420af653056ad72edbdce1a5aec2fdaf25706a6fc

package/local-maven-repo/expo/modules/router/expo.modules.router/{58.0.22/expo.modules.router-58.0.22.pom → 58.0.24/expo.modules.router-58.0.24.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>expo.modules.router</groupId>
   <artifactId>expo.modules.router</artifactId>
-  <version>58.0.22</version>
+  <version>58.0.24</version>
   <packaging>aar</packaging>
   <name>expo.modules.router</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.24/expo.modules.router-58.0.24.pom.md5

@@ -0,0 +1 @@
+b9c462b180d21343327d681b2ff975ab

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.24/expo.modules.router-58.0.24.pom.sha1

@@ -0,0 +1 @@
+56bb121e6b54089edd67397df5217ad3e83edc5e

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.24/expo.modules.router-58.0.24.pom.sha256

@@ -0,0 +1 @@
+7167a9d26bf6908c7e1bce80f0cea00da947542a3793fbccf63e833c021c7f67

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.24/expo.modules.router-58.0.24.pom.sha512

@@ -0,0 +1 @@
+a4e9af609cae6c5eb58bb27380110b58cd9f0aba81c9038a5dddf85e6e9635806fbcc1ef765c31b0156749e039b1645cabc0e5f5c386deac06b27f60e03e1033

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "58.0.22",
+  "version": "58.0.24",
   "description": "Expo Router is a file-based router for React Native and web applications.",
   "keywords": [
     "expo",
@@ -278,7 +278,7 @@
   "dependencies": {
     "@expo/log-box": "^58.0.12",
     "@expo/metro-runtime": "^58.0.14",
-    "@expo/schema-utils": "^58.0.1",
+    "@expo/schema-utils": "^58.0.2",
     "@radix-ui/react-slot": "^1.2.0",
     "@radix-ui/react-tabs": "^1.1.12",
     "@react-native-masked-view/masked-view": "^0.3.2",
@@ -296,7 +296,7 @@
     "standard-navigation": "^0.0.5"
   },
   "devDependencies": {
-    "@expo/ui": "^58.0.20",
+    "@expo/ui": "^58.0.21",
     "@jest/globals": "^30.0.0",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.9.1",
@@ -323,7 +323,7 @@
   "peerDependencies": {
     "@expo/log-box": "^58.0.12",
     "@expo/metro-runtime": "^58.0.14",
-    "@expo/ui": "^58.0.20",
+    "@expo/ui": "^58.0.21",
     "@testing-library/react-native": ">= 14.0.0",
     "expo": "*",
     "expo-constants": "^58.0.12",

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.22/expo.modules.router-58.0.22.module.md5

@@ -1 +0,0 @@
-71370213ae5ed86cd62db95ed74c21db

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.22/expo.modules.router-58.0.22.module.sha1

@@ -1 +0,0 @@
-f9d27449e2fcbae8bc04a601397eee13503db7f5

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.22/expo.modules.router-58.0.22.module.sha256

@@ -1 +0,0 @@
-544478024c935e6af0163953150c71bfb5c881aa9fc07195859d92c1abdcb758

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.22/expo.modules.router-58.0.22.module.sha512

@@ -1 +0,0 @@
-1768b119d1b1ee9b0b90a4ceb735d1210f1ef565a6c00cc062f562fa4e822325d2ce0f62336a6dedff48064625ccc4c442acf19e0ef591834fa6759065a20d07

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.22/expo.modules.router-58.0.22.pom.md5

@@ -1 +0,0 @@
-5e845b1b2fdc3da8c8bdd7811be538f0

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.22/expo.modules.router-58.0.22.pom.sha1

@@ -1 +0,0 @@
-312a70656846f30d40a31bf66e8adc1ad0adb435

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.22/expo.modules.router-58.0.22.pom.sha256

@@ -1 +0,0 @@
-d8983f92db58531d556b507dc71b68b2e66a826d54ff7f3fa5a15fb1eeb5820f

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.22/expo.modules.router-58.0.22.pom.sha512

@@ -1 +0,0 @@
-4b5fcfbb613810cf54fd0f6e38e46140fdf1074888a4f944153f1edee24e25a99a76b422136e33206ca154d4989b761fd5929b11d71bd579d7da127bef8575c1