expo-router 55.0.0-preview.9 → 55.0.0

package/android/build.gradle

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

package/build/fork/native-stack/composition-options/CompositionOptionsContext.d.ts

@@ -0,0 +1,38 @@
+import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
+import type { CompositionContextValue, CompositionRegistry } from './types';
+/** @internal */
+export declare const CompositionContext: import("react").Context<CompositionContextValue | null>;
+type RegistryAction = {
+    type: 'set';
+    routeKey: string;
+    options: Partial<NativeStackNavigationOptions>;
+} | {
+    type: 'unset';
+    routeKey: string;
+    options: Partial<NativeStackNavigationOptions>;
+};
+/** @internal */
+export declare function registryReducer(state: CompositionRegistry, action: RegistryAction): CompositionRegistry;
+/**
+ * Provides the composition registry to descendant composition components.
+ *
+ * Uses useReducer with immutable object updates for React Compiler compatibility.
+ * Each set/unset call produces a new object reference, which the compiler can
+ * track as a reactive dependency.
+ */
+export declare function useCompositionRegistry(): {
+    registry: CompositionRegistry;
+    contextValue: {
+        set: (routeKey: string, options: Partial<NativeStackNavigationOptions>) => void;
+        unset: (routeKey: string, options: Partial<NativeStackNavigationOptions>) => void;
+    };
+};
+/**
+ * Hook used by composition components to register their options in the composition registry.
+ *
+ * Registers options on mount/update via useSafeLayoutEffect, and unregisters on unmount.
+ * Callers should memoize the options object to avoid unnecessary re-registrations.
+ */
+export declare function useCompositionOption(options: Partial<NativeStackNavigationOptions>): void;
+export {};
+//# sourceMappingURL=CompositionOptionsContext.d.ts.map

package/build/fork/native-stack/composition-options/CompositionOptionsContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CompositionOptionsContext.d.ts","sourceRoot":"","sources":["../../../../src/fork/native-stack/composition-options/CompositionOptionsContext.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAGnF,OAAO,KAAK,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAG5E,gBAAgB;AAChB,eAAO,MAAM,kBAAkB,yDAAsD,CAAC;AAEtF,KAAK,cAAc,GACf;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAChD,GACD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC,4BAA4B,CAAC,CAAA;CAAE,CAAC;AAExF,gBAAgB;AAChB,wBAAgB,eAAe,CAC7B,KAAK,EAAE,mBAAmB,EAC1B,MAAM,EAAE,cAAc,GACrB,mBAAmB,CAuBrB;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB;;;wBAGD,MAAM,WAAW,OAAO,CAAC,4BAA4B,CAAC;0BAIpD,MAAM,WAAW,OAAO,CAAC,4BAA4B,CAAC;;EAS5F;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,4BAA4B,CAAC,QAiBlF"}

package/build/fork/native-stack/composition-options/CompositionOptionsContext.js

@@ -0,0 +1,75 @@
+"use strict";
+'use client';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CompositionContext = void 0;
+exports.registryReducer = registryReducer;
+exports.useCompositionRegistry = useCompositionRegistry;
+exports.useCompositionOption = useCompositionOption;
+const native_1 = require("@react-navigation/native");
+const react_1 = require("react");
+const useSafeLayoutEffect_1 = require("../../../views/useSafeLayoutEffect");
+/** @internal */
+exports.CompositionContext = (0, react_1.createContext)(null);
+/** @internal */
+function registryReducer(state, action) {
+    if (action.type === 'set') {
+        const { routeKey, options } = action;
+        if (state[routeKey]?.includes(options)) {
+            return state;
+        }
+        return { ...state, [routeKey]: [...(state[routeKey] ?? []), options] };
+    }
+    if (action.type === 'unset') {
+        const { routeKey, options } = action;
+        const existing = state[routeKey];
+        const filtered = existing?.filter((o) => o !== options);
+        if (!existing || filtered?.length === existing.length) {
+            return state;
+        }
+        if (filtered.length === 0) {
+            const { [routeKey]: _, ...newState } = state;
+            return newState;
+        }
+        return { ...state, [routeKey]: filtered };
+    }
+    return state;
+}
+/**
+ * Provides the composition registry to descendant composition components.
+ *
+ * Uses useReducer with immutable object updates for React Compiler compatibility.
+ * Each set/unset call produces a new object reference, which the compiler can
+ * track as a reactive dependency.
+ */
+function useCompositionRegistry() {
+    const [registry, dispatch] = (0, react_1.useReducer)(registryReducer, {});
+    const set = (0, react_1.useCallback)((routeKey, options) => {
+        dispatch({ type: 'set', routeKey, options });
+    }, []);
+    const unset = (0, react_1.useCallback)((routeKey, options) => {
+        dispatch({ type: 'unset', routeKey, options });
+    }, []);
+    const contextValue = (0, react_1.useMemo)(() => ({ set, unset }), [set, unset]);
+    return { registry, contextValue };
+}
+/**
+ * Hook used by composition components to register their options in the composition registry.
+ *
+ * Registers options on mount/update via useSafeLayoutEffect, and unregisters on unmount.
+ * Callers should memoize the options object to avoid unnecessary re-registrations.
+ */
+function useCompositionOption(options) {
+    const context = (0, react_1.use)(exports.CompositionContext);
+    if (!context) {
+        throw new Error('useCompositionOption must be used within a RouterCompositionOptionsProvider. This is likely a bug in Expo Router.');
+    }
+    const route = (0, native_1.useRoute)();
+    const { set, unset } = context;
+    (0, useSafeLayoutEffect_1.useSafeLayoutEffect)(() => {
+        set(route.key, options);
+        return () => {
+            unset(route.key, options);
+        };
+    }, [route.key, set, unset, options]);
+}
+//# sourceMappingURL=CompositionOptionsContext.js.map

package/build/fork/native-stack/composition-options/CompositionOptionsContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CompositionOptionsContext.js","sourceRoot":"","sources":["../../../../src/fork/native-stack/composition-options/CompositionOptionsContext.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;;AAqBb,0CA0BC;AASD,wDAgBC;AAQD,oDAiBC;AA/FD,qDAAoD;AAEpD,iCAA6E;AAG7E,4EAAyE;AAEzE,gBAAgB;AACH,QAAA,kBAAkB,GAAG,IAAA,qBAAa,EAAiC,IAAI,CAAC,CAAC;AAUtF,gBAAgB;AAChB,SAAgB,eAAe,CAC7B,KAA0B,EAC1B,MAAsB;IAEtB,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QAC1B,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QACrC,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACvC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC;IACzE,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5B,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;QACjC,MAAM,QAAQ,GAAG,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,QAAQ,IAAI,QAAQ,EAAE,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC;YACtD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,GAAG,QAAQ,EAAE,GAAG,KAAK,CAAC;YAC7C,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC5C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,sBAAsB;IACpC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,IAAA,kBAAU,EAAC,eAAe,EAAE,EAAyB,CAAC,CAAC;IAEpF,MAAM,GAAG,GAAG,IAAA,mBAAW,EAAC,CAAC,QAAgB,EAAE,OAA8C,EAAE,EAAE;QAC3F,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,CAAC,QAAgB,EAAE,OAA8C,EAAE,EAAE;QAC7F,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IACjD,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,YAAY,GAAG,IAAA,eAAO,EAC1B,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAmC,EACxD,CAAC,GAAG,EAAE,KAAK,CAAC,CACb,CAAC;IACF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;AACpC,CAAC;AAED;;;;;GAKG;AACH,SAAgB,oBAAoB,CAAC,OAA8C;IACjF,MAAM,OAAO,GAAG,IAAA,WAAG,EAAC,0BAAkB,CAAC,CAAC;IACxC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,mHAAmH,CACpH,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,iBAAQ,GAAE,CAAC;IACzB,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAE/B,IAAA,yCAAmB,EAAC,GAAG,EAAE;QACvB,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACxB,OAAO,GAAG,EAAE;YACV,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;AACvC,CAAC","sourcesContent":["'use client';\n\nimport { useRoute } from '@react-navigation/native';\nimport type { NativeStackNavigationOptions } from '@react-navigation/native-stack';\nimport { createContext, use, useCallback, useMemo, useReducer } from 'react';\n\nimport type { CompositionContextValue, CompositionRegistry } from './types';\nimport { useSafeLayoutEffect } from '../../../views/useSafeLayoutEffect';\n\n/** @internal */\nexport const CompositionContext = createContext<CompositionContextValue | null>(null);\n\ntype RegistryAction =\n  | {\n      type: 'set';\n      routeKey: string;\n      options: Partial<NativeStackNavigationOptions>;\n    }\n  | { type: 'unset'; routeKey: string; options: Partial<NativeStackNavigationOptions> };\n\n/** @internal */\nexport function registryReducer(\n  state: CompositionRegistry,\n  action: RegistryAction\n): CompositionRegistry {\n  if (action.type === 'set') {\n    const { routeKey, options } = action;\n    if (state[routeKey]?.includes(options)) {\n      return state;\n    }\n    return { ...state, [routeKey]: [...(state[routeKey] ?? []), options] };\n  }\n\n  if (action.type === 'unset') {\n    const { routeKey, options } = action;\n    const existing = state[routeKey];\n    const filtered = existing?.filter((o) => o !== options);\n    if (!existing || filtered?.length === existing.length) {\n      return state;\n    }\n    if (filtered.length === 0) {\n      const { [routeKey]: _, ...newState } = state;\n      return newState;\n    }\n    return { ...state, [routeKey]: filtered };\n  }\n  return state;\n}\n\n/**\n * Provides the composition registry to descendant composition components.\n *\n * Uses useReducer with immutable object updates for React Compiler compatibility.\n * Each set/unset call produces a new object reference, which the compiler can\n * track as a reactive dependency.\n */\nexport function useCompositionRegistry() {\n  const [registry, dispatch] = useReducer(registryReducer, {} as CompositionRegistry);\n\n  const set = useCallback((routeKey: string, options: Partial<NativeStackNavigationOptions>) => {\n    dispatch({ type: 'set', routeKey, options });\n  }, []);\n\n  const unset = useCallback((routeKey: string, options: Partial<NativeStackNavigationOptions>) => {\n    dispatch({ type: 'unset', routeKey, options });\n  }, []);\n\n  const contextValue = useMemo(\n    () => ({ set, unset }) satisfies CompositionContextValue,\n    [set, unset]\n  );\n  return { registry, contextValue };\n}\n\n/**\n * Hook used by composition components to register their options in the composition registry.\n *\n * Registers options on mount/update via useSafeLayoutEffect, and unregisters on unmount.\n * Callers should memoize the options object to avoid unnecessary re-registrations.\n */\nexport function useCompositionOption(options: Partial<NativeStackNavigationOptions>) {\n  const context = use(CompositionContext);\n  if (!context) {\n    throw new Error(\n      'useCompositionOption must be used within a RouterCompositionOptionsProvider. This is likely a bug in Expo Router.'\n    );\n  }\n\n  const route = useRoute();\n  const { set, unset } = context;\n\n  useSafeLayoutEffect(() => {\n    set(route.key, options);\n    return () => {\n      unset(route.key, options);\n    };\n  }, [route.key, set, unset, options]);\n}\n"]}

package/build/fork/native-stack/composition-options/index.d.ts

@@ -0,0 +1,4 @@
+export { mergeOptions } from './mergeOptions';
+export { CompositionContext, useCompositionRegistry, useCompositionOption, } from './CompositionOptionsContext';
+export type { CompositionRegistry, CompositionContextValue } from './types';
+//# sourceMappingURL=index.d.ts.map

package/build/fork/native-stack/composition-options/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/fork/native-stack/composition-options/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AACrC,YAAY,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC"}

package/build/fork/native-stack/composition-options/index.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useCompositionOption = exports.useCompositionRegistry = exports.CompositionContext = exports.mergeOptions = void 0;
+var mergeOptions_1 = require("./mergeOptions");
+Object.defineProperty(exports, "mergeOptions", { enumerable: true, get: function () { return mergeOptions_1.mergeOptions; } });
+var CompositionOptionsContext_1 = require("./CompositionOptionsContext");
+Object.defineProperty(exports, "CompositionContext", { enumerable: true, get: function () { return CompositionOptionsContext_1.CompositionContext; } });
+Object.defineProperty(exports, "useCompositionRegistry", { enumerable: true, get: function () { return CompositionOptionsContext_1.useCompositionRegistry; } });
+Object.defineProperty(exports, "useCompositionOption", { enumerable: true, get: function () { return CompositionOptionsContext_1.useCompositionOption; } });
+//# sourceMappingURL=index.js.map

package/build/fork/native-stack/composition-options/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/fork/native-stack/composition-options/index.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AACrB,yEAIqC;AAHnC,+HAAA,kBAAkB,OAAA;AAClB,mIAAA,sBAAsB,OAAA;AACtB,iIAAA,oBAAoB,OAAA","sourcesContent":["export { mergeOptions } from './mergeOptions';\nexport {\n  CompositionContext,\n  useCompositionRegistry,\n  useCompositionOption,\n} from './CompositionOptionsContext';\nexport type { CompositionRegistry, CompositionContextValue } from './types';\n"]}

package/build/fork/native-stack/composition-options/mergeOptions.d.ts

@@ -0,0 +1,13 @@
+import type { ParamListBase, StackNavigationState } from '@react-navigation/native';
+import type { NativeStackDescriptorMap } from '../descriptors-context';
+import type { CompositionRegistry } from './types';
+/**
+ * Merges composition component options into navigation descriptors.
+ *
+ * For each descriptor:
+ * 1. If no composition options registered → pass through unchanged
+ * 2. If route is preloaded AND not focused → skip composition (pass through)
+ * 3. Otherwise → merge descriptor.options with composition options (composition wins)
+ */
+export declare function mergeOptions(descriptors: NativeStackDescriptorMap, registry: CompositionRegistry, state: StackNavigationState<ParamListBase>): NativeStackDescriptorMap;
+//# sourceMappingURL=mergeOptions.d.ts.map

package/build/fork/native-stack/composition-options/mergeOptions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeOptions.d.ts","sourceRoot":"","sources":["../../../../src/fork/native-stack/composition-options/mergeOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEpF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,WAAW,EAAE,wBAAwB,EACrC,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,oBAAoB,CAAC,aAAa,CAAC,GACzC,wBAAwB,CAiC1B"}

package/build/fork/native-stack/composition-options/mergeOptions.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeOptions = mergeOptions;
+/**
+ * Merges composition component options into navigation descriptors.
+ *
+ * For each descriptor:
+ * 1. If no composition options registered → pass through unchanged
+ * 2. If route is preloaded AND not focused → skip composition (pass through)
+ * 3. Otherwise → merge descriptor.options with composition options (composition wins)
+ */
+function mergeOptions(descriptors, registry, state) {
+    const result = {};
+    const focusedKey = state.routes[state.index]?.key;
+    for (const key in descriptors) {
+        const descriptor = descriptors[key];
+        const routeOptions = registry[key];
+        // No composition options or empty array → pass through
+        if (!routeOptions || routeOptions.length === 0) {
+            result[key] = descriptor;
+            continue;
+        }
+        // Check if route is preloaded and not focused → skip composition
+        const isPreloaded = state.preloadedRoutes?.some((r) => r.key === key) ?? false;
+        if (isPreloaded && key !== focusedKey) {
+            result[key] = descriptor;
+            continue;
+        }
+        // Merge: descriptor options as base, composition options override
+        const mergedOptions = Object.assign({}, descriptor.options, ...routeOptions);
+        const merged = {
+            ...descriptor,
+            options: mergedOptions,
+        };
+        result[key] = merged;
+    }
+    return result;
+}
+//# sourceMappingURL=mergeOptions.js.map

package/build/fork/native-stack/composition-options/mergeOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeOptions.js","sourceRoot":"","sources":["../../../../src/fork/native-stack/composition-options/mergeOptions.ts"],"names":[],"mappings":";;AAaA,oCAqCC;AA7CD;;;;;;;GAOG;AACH,SAAgB,YAAY,CAC1B,WAAqC,EACrC,QAA6B,EAC7B,KAA0C;IAE1C,MAAM,MAAM,GAA6B,EAAE,CAAC;IAC5C,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC;IAElD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAEnC,uDAAuD;QACvD,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/C,MAAM,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;YACzB,SAAS;QACX,CAAC;QAED,iEAAiE;QACjE,MAAM,WAAW,GAAG,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,IAAI,KAAK,CAAC;QAC/E,IAAI,WAAW,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;YACtC,MAAM,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;YACzB,SAAS;QACX,CAAC;QAED,kEAAkE;QAClE,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,EAAE,GAAG,YAAY,CAAC,CAAC;QAE7E,MAAM,MAAM,GAAG;YACb,GAAG,UAAU;YACb,OAAO,EAAE,aAAa;SACvB,CAAC;QAEF,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { ParamListBase, StackNavigationState } from '@react-navigation/native';\n\nimport type { NativeStackDescriptorMap } from '../descriptors-context';\nimport type { CompositionRegistry } from './types';\n\n/**\n * Merges composition component options into navigation descriptors.\n *\n * For each descriptor:\n * 1. If no composition options registered → pass through unchanged\n * 2. If route is preloaded AND not focused → skip composition (pass through)\n * 3. Otherwise → merge descriptor.options with composition options (composition wins)\n */\nexport function mergeOptions(\n  descriptors: NativeStackDescriptorMap,\n  registry: CompositionRegistry,\n  state: StackNavigationState<ParamListBase>\n): NativeStackDescriptorMap {\n  const result: NativeStackDescriptorMap = {};\n  const focusedKey = state.routes[state.index]?.key;\n\n  for (const key in descriptors) {\n    const descriptor = descriptors[key];\n    const routeOptions = registry[key];\n\n    // No composition options or empty array → pass through\n    if (!routeOptions || routeOptions.length === 0) {\n      result[key] = descriptor;\n      continue;\n    }\n\n    // Check if route is preloaded and not focused → skip composition\n    const isPreloaded = state.preloadedRoutes?.some((r) => r.key === key) ?? false;\n    if (isPreloaded && key !== focusedKey) {\n      result[key] = descriptor;\n      continue;\n    }\n\n    // Merge: descriptor options as base, composition options override\n    const mergedOptions = Object.assign({}, descriptor.options, ...routeOptions);\n\n    const merged = {\n      ...descriptor,\n      options: mergedOptions,\n    };\n\n    result[key] = merged;\n  }\n\n  return result;\n}\n"]}

package/build/fork/native-stack/composition-options/types.d.ts

@@ -0,0 +1,25 @@
+import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';
+/**
+ * Registry mapping route keys to composition component options.
+ *
+ * Structure: Record<routeKey, options[]>
+ *
+ * Each composition component (Title, BackButton, Header, Toolbar) registers
+ * its memoized options object. Array order reflects registration order,
+ * so later registrations override earlier ones during merge.
+ *
+ * @internal
+ */
+export type CompositionRegistry = Record<string, Partial<NativeStackNavigationOptions>[]>;
+/** @internal */
+export interface CompositionContextValue {
+    /**
+     * Register or update options for a composition component.
+     */
+    set(routeKey: string, options: Partial<NativeStackNavigationOptions>): void;
+    /**
+     * Remove a composition component's options by reference (should be called on unmount).
+     */
+    unset(routeKey: string, options: Partial<NativeStackNavigationOptions>): void;
+}
+//# sourceMappingURL=types.d.ts.map

package/build/fork/native-stack/composition-options/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/fork/native-stack/composition-options/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAEnF;;;;;;;;;;GAUG;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,4BAA4B,CAAC,EAAE,CAAC,CAAC;AAE1F,gBAAgB;AAChB,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,4BAA4B,CAAC,GAAG,IAAI,CAAC;IAE5E;;OAEG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,4BAA4B,CAAC,GAAG,IAAI,CAAC;CAC/E"}

package/build/fork/native-stack/composition-options/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/build/fork/native-stack/composition-options/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/fork/native-stack/composition-options/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { NativeStackNavigationOptions } from '@react-navigation/native-stack';\n\n/**\n * Registry mapping route keys to composition component options.\n *\n * Structure: Record<routeKey, options[]>\n *\n * Each composition component (Title, BackButton, Header, Toolbar) registers\n * its memoized options object. Array order reflects registration order,\n * so later registrations override earlier ones during merge.\n *\n * @internal\n */\nexport type CompositionRegistry = Record<string, Partial<NativeStackNavigationOptions>[]>;\n\n/** @internal */\nexport interface CompositionContextValue {\n  /**\n   * Register or update options for a composition component.\n   */\n  set(routeKey: string, options: Partial<NativeStackNavigationOptions>): void;\n\n  /**\n   * Remove a composition component's options by reference (should be called on unmount).\n   */\n  unset(routeKey: string, options: Partial<NativeStackNavigationOptions>): void;\n}\n"]}

package/build/fork/native-stack/createNativeStackNavigator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createNativeStackNavigator.d.ts","sourceRoot":"","sources":["../../../src/fork/native-stack/createNativeStackNavigator.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAGlB,KAAK,oBAAoB,EAGzB,KAAK,YAAY,EACjB,KAAK,cAAc,EAEpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,4BAA4B,EACjC,KAAK,yBAAyB,EAE9B,KAAK,yBAAyB,EAC/B,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAc/B,iBAAS,oBAAoB,CAAC,EAC5B,EAAE,EACF,gBAAgB,EAChB,QAAQ,EACR,MAAM,EACN,eAAe,EACf,aAAa,EACb,YAAY,EACZ,eAAe,EACf,GAAG,IAAI,EACR,EAAE,yBAAyB,qBAgH3B;AAED,wBAAgB,0BAA0B,CACxC,KAAK,CAAC,SAAS,SAAS,aAAa,EACrC,KAAK,CAAC,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,EACxD,KAAK,CAAC,OAAO,SAAS,oBAAoB,GAAG;IAC3C,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACvC,aAAa,EAAE,4BAA4B,CAAC;IAC5C,QAAQ,EAAE,6BAA6B,CAAC;IACxC,cAAc,EAAE;SACb,SAAS,IAAI,MAAM,SAAS,GAAG,yBAAyB,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC;KAC7F,CAAC;IACF,SAAS,EAAE,OAAO,oBAAoB,CAAC;CACxC,EACD,KAAK,CAAC,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,EAClE,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAElD"}
+{"version":3,"file":"createNativeStackNavigator.d.ts","sourceRoot":"","sources":["../../../src/fork/native-stack/createNativeStackNavigator.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAGlB,KAAK,oBAAoB,EAGzB,KAAK,YAAY,EACjB,KAAK,cAAc,EAEpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,4BAA4B,EACjC,KAAK,yBAAyB,EAE9B,KAAK,yBAAyB,EAC/B,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAe/B,iBAAS,oBAAoB,CAAC,EAC5B,EAAE,EACF,gBAAgB,EAChB,QAAQ,EACR,MAAM,EACN,eAAe,EACf,aAAa,EACb,YAAY,EACZ,eAAe,EACf,GAAG,IAAI,EACR,EAAE,yBAAyB,qBAwH3B;AAED,wBAAgB,0BAA0B,CACxC,KAAK,CAAC,SAAS,SAAS,aAAa,EACrC,KAAK,CAAC,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,EACxD,KAAK,CAAC,OAAO,SAAS,oBAAoB,GAAG;IAC3C,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACvC,aAAa,EAAE,4BAA4B,CAAC;IAC5C,QAAQ,EAAE,6BAA6B,CAAC;IACxC,cAAc,EAAE;SACb,SAAS,IAAI,MAAM,SAAS,GAAG,yBAAyB,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC;KAC7F,CAAC;IACF,SAAS,EAAE,OAAO,oBAAoB,CAAC;CACxC,EACD,KAAK,CAAC,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,EAClE,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAElD"}

package/build/fork/native-stack/createNativeStackNavigator.js

@@ -38,6 +38,7 @@ const native_1 = require("@react-navigation/native");
 const native_stack_1 = require("@react-navigation/native-stack");
 const expo_glass_effect_1 = require("expo-glass-effect");
 const React = __importStar(require("react"));
+const composition_options_1 = require("./composition-options");
 const descriptors_context_1 = require("./descriptors-context");
 const usePreviewTransition_1 = require("./usePreviewTransition");
 const navigationParams_1 = require("../../navigationParams");
@@ -112,20 +113,24 @@ function NativeStackNavigator({ id, initialRouteName, children, layout, screenLi
         }
         return needsNewMap ? result : computedDescriptors;
     }, [computedDescriptors]);
+    const { registry, contextValue } = (0, composition_options_1.useCompositionRegistry)();
+    const mergedDescriptors = React.useMemo(() => (0, composition_options_1.mergeOptions)(finalDescriptors, registry, computedState), [finalDescriptors, computedState, registry]);
     // END FORK
     return (
     // START FORK
     <descriptors_context_1.DescriptorsContext value={descriptors}>
       {/* END FORK */}
       <NavigationContent>
-        <native_stack_1.NativeStackView {...rest} 
+        <composition_options_1.CompositionContext value={contextValue}>
+          <native_stack_1.NativeStackView {...rest} 
     // START FORK
-    state={computedState} navigation={navigationWrapper} descriptors={finalDescriptors} 
+    state={computedState} navigation={navigationWrapper} descriptors={mergedDescriptors} 
     // state={state}
     // navigation={navigation}
     // descriptors={descriptors}
     // END FORK
     describe={describe}/>
+        </composition_options_1.CompositionContext>
       </NavigationContent>
       {/* START FORK */}
     </descriptors_context_1.DescriptorsContext>

package/build/fork/native-stack/createNativeStackNavigator.js.map

@@ -1 +1 @@
-{"version":3,"file":"createNativeStackNavigator.js","sourceRoot":"","sources":["../../../src/fork/native-stack/createNativeStackNavigator.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgKA,gEAiBC;AAjLD,qDAakC;AAClC,iEAMwC;AACxC,yDAA2D;AAC3D,6CAA+B;AAE/B,+DAA2D;AAC3D,iEAA8D;AAC9D,6DAGgC;AAEhC,MAAM,KAAK,GAAG,IAAA,0CAAsB,GAAE,CAAC;AAKvC,SAAS,oBAAoB,CAAC,EAC5B,EAAE,EACF,gBAAgB,EAChB,QAAQ,EACR,MAAM,EACN,eAAe,EACf,aAAa,EACb,YAAY,EACZ,eAAe,EACf,GAAG,IAAI,EACmB;IAC1B,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,IAAA,6BAAoB,EAM1F,oBAAW,EAAE;QACb,EAAE;QACF,gBAAgB;QAChB,QAAQ;QACR,MAAM;QACN,eAAe;QACf,aAAa;QACb,YAAY;QACZ,eAAe;KAChB,CAAC,CAAC;IAEH,KAAK,CAAC,SAAS,CACb,GAAG,EAAE;IACH,+DAA+D;IAC/D,UAAU,EAAE,WAAW,EAAE,CAAC,UAAU,EAAE,CAAC,CAAM,EAAE,EAAE;QAC/C,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC;QAEzC,gFAAgF;QAChF,gEAAgE;QAChE,qBAAqB,CAAC,GAAG,EAAE;YACzB,IAAI,KAAK,CAAC,KAAK,GAAG,CAAC,IAAI,SAAS,IAAI,CAAE,CAAgC,CAAC,gBAAgB,EAAE,CAAC;gBACxF,kEAAkE;gBAClE,gDAAgD;gBAChD,aAAa;gBACb,wBAAwB;gBACxB,gCAAgC;gBAChC,uBAAuB;gBACvB,MAAM;gBACN,8EAA8E;gBAC9E,IAAI,CAAC,CAAC,IAAI,EAAE,kBAAkB,KAAK,QAAQ,EAAE,CAAC;oBAC5C,UAAU,CAAC,QAAQ,CAAC;wBAClB,GAAG,qBAAY,CAAC,QAAQ,EAAE;wBAC1B,MAAM,EAAE,KAAK,CAAC,GAAG;qBAClB,CAAC,CAAC;gBACL,CAAC;gBACD,WAAW;YACb,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,EACJ,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CACrC,CAAC;IAEF,aAAa;IACb,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,GAAG,IAAA,2CAAoB,EACpF,KAAK,EACL,UAAU,EACV,WAAW,EACX,QAAQ,CACT,CAAC;IAEF,0EAA0E;IAC1E,uFAAuF;IACvF,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC1C,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,MAAM,MAAM,GAA+B,EAAE,CAAC;QAC9C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACnD,MAAM,UAAU,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,OAAO,GAAG,UAAU,CAAC,OAAmD,CAAC;YAC/E,MAAM,sBAAsB,GAAG,OAAO,EAAE,CAAC,mEAAgD,CAAC,CAAC;YAC3F,MAAM,eAAe,GAAG,sBAAsB,KAAK,SAAS,CAAC;YAC7D,MAAM,aAAa,GAAG,KAAK,IAAI,OAAO,EAAE,YAAY,KAAK,WAAW,CAAC;YAErE,IAAI,eAAe,IAAI,aAAa,EAAE,CAAC;gBACrC,WAAW,GAAG,IAAI,CAAC;gBACnB,MAAM,UAAU,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;gBAClC,IAAI,eAAe,EAAE,CAAC;oBACpB,UAAU,CAAC,cAAc,GAAG,sBAAsB,CAAC;gBACrD,CAAC;gBACD,IAAI,aAAa,EAAE,CAAC;oBAClB,UAAU,CAAC,iBAAiB,KAAK,IAAI,CAAC;oBACtC,UAAU,CAAC,YAAY,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC;oBAC/D,UAAU,CAAC,mBAAmB,KAAK,KAAK,CAAC;oBACzC,UAAU,CAAC,6BAA6B,KAAK,KAAK,CAAC;gBACrD,CAAC;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;YAC3B,CAAC;QACH,CAAC;QACD,OAAO,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC;IACpD,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAC1B,WAAW;IAEX,OAAO;IACL,aAAa;IACb,CAAC,wCAAkB,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CACrC;MAAA,CAAC,cAAc,CACf;MAAA,CAAC,iBAAiB,CAChB;QAAA,CAAC,8BAAe,CACd,IAAI,IAAI,CAAC;IACT,aAAa;IACb,KAAK,CAAC,CAAC,aAAa,CAAC,CACrB,UAAU,CAAC,CAAC,iBAAiB,CAAC,CAC9B,WAAW,CAAC,CAAC,gBAAgB,CAAC;IAC9B,gBAAgB;IAChB,0BAA0B;IAC1B,4BAA4B;IAC5B,WAAW;IACX,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAEvB;MAAA,EAAE,iBAAiB,CACnB;MAAA,CAAC,gBAAgB,CACnB;IAAA,EAAE,wCAAkB,CAAC;IACrB,WAAW;KACZ,CAAC;AACJ,CAAC;AAED,SAAgB,0BAA0B,CAexC,MAAe;IACf,OAAO,IAAA,+BAAsB,EAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAC9D,CAAC","sourcesContent":["import {\n  createNavigatorFactory,\n  type EventArg,\n  type NavigatorTypeBagBase,\n  type ParamListBase,\n  type StackActionHelpers,\n  StackActions,\n  type StackNavigationState,\n  StackRouter,\n  type StackRouterOptions,\n  type StaticConfig,\n  type TypedNavigator,\n  useNavigationBuilder,\n} from '@react-navigation/native';\nimport {\n  type NativeStackNavigationEventMap,\n  type NativeStackNavigationOptions,\n  type NativeStackNavigationProp,\n  NativeStackView,\n  type NativeStackNavigatorProps,\n} from '@react-navigation/native-stack';\nimport { isLiquidGlassAvailable } from 'expo-glass-effect';\nimport * as React from 'react';\n\nimport { DescriptorsContext } from './descriptors-context';\nimport { usePreviewTransition } from './usePreviewTransition';\nimport {\n  INTERNAL_EXPO_ROUTER_GESTURE_ENABLED_OPTION_NAME,\n  type InternalNavigationOptions,\n} from '../../navigationParams';\n\nconst GLASS = isLiquidGlassAvailable();\n\ntype NativeStackNavigationOptionsWithInternal = NativeStackNavigationOptions &\n  InternalNavigationOptions;\n\nfunction NativeStackNavigator({\n  id,\n  initialRouteName,\n  children,\n  layout,\n  screenListeners,\n  screenOptions,\n  screenLayout,\n  UNSTABLE_router,\n  ...rest\n}: NativeStackNavigatorProps) {\n  const { state, describe, descriptors, navigation, NavigationContent } = useNavigationBuilder<\n    StackNavigationState<ParamListBase>,\n    StackRouterOptions,\n    StackActionHelpers<ParamListBase>,\n    NativeStackNavigationOptionsWithInternal,\n    NativeStackNavigationEventMap\n  >(StackRouter, {\n    id,\n    initialRouteName,\n    children,\n    layout,\n    screenListeners,\n    screenOptions,\n    screenLayout,\n    UNSTABLE_router,\n  });\n\n  React.useEffect(\n    () =>\n      // @ts-expect-error: there may not be a tab navigator in parent\n      navigation?.addListener?.('tabPress', (e: any) => {\n        const isFocused = navigation.isFocused();\n\n        // Run the operation in the next frame so we're sure all listeners have been run\n        // This is necessary to know if preventDefault() has been called\n        requestAnimationFrame(() => {\n          if (state.index > 0 && isFocused && !(e as EventArg<'tabPress', true>).defaultPrevented) {\n            // When user taps on already focused tab and we're inside the tab,\n            // reset the stack to replicate native behaviour\n            // START FORK\n            // navigation.dispatch({\n            //   ...StackActions.popToTop(),\n            //   target: state.key,\n            // });\n            // The popToTop will be automatically triggered on native side for native tabs\n            if (e.data?.__internalTabsType !== 'native') {\n              navigation.dispatch({\n                ...StackActions.popToTop(),\n                target: state.key,\n              });\n            }\n            // END FORK\n          }\n        });\n      }),\n    [navigation, state.index, state.key]\n  );\n\n  // START FORK\n  const { computedState, computedDescriptors, navigationWrapper } = usePreviewTransition(\n    state,\n    navigation,\n    descriptors,\n    describe\n  );\n\n  // Map internal gesture option to React Navigation's gestureEnabled option\n  // This allows Expo Router to override gesture behavior without affecting user settings\n  const finalDescriptors = React.useMemo(() => {\n    let needsNewMap = false;\n    const result: typeof computedDescriptors = {};\n    for (const key of Object.keys(computedDescriptors)) {\n      const descriptor = computedDescriptors[key];\n      const options = descriptor.options as NativeStackNavigationOptionsWithInternal;\n      const internalGestureEnabled = options?.[INTERNAL_EXPO_ROUTER_GESTURE_ENABLED_OPTION_NAME];\n      const needsGestureFix = internalGestureEnabled !== undefined;\n      const needsGlassFix = GLASS && options?.presentation === 'formSheet';\n\n      if (needsGestureFix || needsGlassFix) {\n        needsNewMap = true;\n        const newOptions = { ...options };\n        if (needsGestureFix) {\n          newOptions.gestureEnabled = internalGestureEnabled;\n        }\n        if (needsGlassFix) {\n          newOptions.headerTransparent ??= true;\n          newOptions.contentStyle ??= { backgroundColor: 'transparent' };\n          newOptions.headerShadowVisible ??= false;\n          newOptions.headerLargeTitleShadowVisible ??= false;\n        }\n        result[key] = { ...descriptor, options: newOptions };\n      } else {\n        result[key] = descriptor;\n      }\n    }\n    return needsNewMap ? result : computedDescriptors;\n  }, [computedDescriptors]);\n  // END FORK\n\n  return (\n    // START FORK\n    <DescriptorsContext value={descriptors}>\n      {/* END FORK */}\n      <NavigationContent>\n        <NativeStackView\n          {...rest}\n          // START FORK\n          state={computedState}\n          navigation={navigationWrapper}\n          descriptors={finalDescriptors}\n          // state={state}\n          // navigation={navigation}\n          // descriptors={descriptors}\n          // END FORK\n          describe={describe}\n        />\n      </NavigationContent>\n      {/* START FORK */}\n    </DescriptorsContext>\n    // END FORK\n  );\n}\n\nexport function createNativeStackNavigator<\n  const ParamList extends ParamListBase,\n  const NavigatorID extends string | undefined = undefined,\n  const TypeBag extends NavigatorTypeBagBase = {\n    ParamList: ParamList;\n    NavigatorID: NavigatorID;\n    State: StackNavigationState<ParamList>;\n    ScreenOptions: NativeStackNavigationOptions;\n    EventMap: NativeStackNavigationEventMap;\n    NavigationList: {\n      [RouteName in keyof ParamList]: NativeStackNavigationProp<ParamList, RouteName, NavigatorID>;\n    };\n    Navigator: typeof NativeStackNavigator;\n  },\n  const Config extends StaticConfig<TypeBag> = StaticConfig<TypeBag>,\n>(config?: Config): TypedNavigator<TypeBag, Config> {\n  return createNavigatorFactory(NativeStackNavigator)(config);\n}\n"]}
+{"version":3,"file":"createNativeStackNavigator.js","sourceRoot":"","sources":["../../../src/fork/native-stack/createNativeStackNavigator.tsx"],"names":[],"mappings":"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","sourcesContent":["import {\n  createNavigatorFactory,\n  type EventArg,\n  type NavigatorTypeBagBase,\n  type ParamListBase,\n  type StackActionHelpers,\n  StackActions,\n  type StackNavigationState,\n  StackRouter,\n  type StackRouterOptions,\n  type StaticConfig,\n  type TypedNavigator,\n  useNavigationBuilder,\n} from '@react-navigation/native';\nimport {\n  type NativeStackNavigationEventMap,\n  type NativeStackNavigationOptions,\n  type NativeStackNavigationProp,\n  NativeStackView,\n  type NativeStackNavigatorProps,\n} from '@react-navigation/native-stack';\nimport { isLiquidGlassAvailable } from 'expo-glass-effect';\nimport * as React from 'react';\n\nimport { CompositionContext, mergeOptions, useCompositionRegistry } from './composition-options';\nimport { DescriptorsContext } from './descriptors-context';\nimport { usePreviewTransition } from './usePreviewTransition';\nimport {\n  INTERNAL_EXPO_ROUTER_GESTURE_ENABLED_OPTION_NAME,\n  type InternalNavigationOptions,\n} from '../../navigationParams';\n\nconst GLASS = isLiquidGlassAvailable();\n\ntype NativeStackNavigationOptionsWithInternal = NativeStackNavigationOptions &\n  InternalNavigationOptions;\n\nfunction NativeStackNavigator({\n  id,\n  initialRouteName,\n  children,\n  layout,\n  screenListeners,\n  screenOptions,\n  screenLayout,\n  UNSTABLE_router,\n  ...rest\n}: NativeStackNavigatorProps) {\n  const { state, describe, descriptors, navigation, NavigationContent } = useNavigationBuilder<\n    StackNavigationState<ParamListBase>,\n    StackRouterOptions,\n    StackActionHelpers<ParamListBase>,\n    NativeStackNavigationOptionsWithInternal,\n    NativeStackNavigationEventMap\n  >(StackRouter, {\n    id,\n    initialRouteName,\n    children,\n    layout,\n    screenListeners,\n    screenOptions,\n    screenLayout,\n    UNSTABLE_router,\n  });\n\n  React.useEffect(\n    () =>\n      // @ts-expect-error: there may not be a tab navigator in parent\n      navigation?.addListener?.('tabPress', (e: any) => {\n        const isFocused = navigation.isFocused();\n\n        // Run the operation in the next frame so we're sure all listeners have been run\n        // This is necessary to know if preventDefault() has been called\n        requestAnimationFrame(() => {\n          if (state.index > 0 && isFocused && !(e as EventArg<'tabPress', true>).defaultPrevented) {\n            // When user taps on already focused tab and we're inside the tab,\n            // reset the stack to replicate native behaviour\n            // START FORK\n            // navigation.dispatch({\n            //   ...StackActions.popToTop(),\n            //   target: state.key,\n            // });\n            // The popToTop will be automatically triggered on native side for native tabs\n            if (e.data?.__internalTabsType !== 'native') {\n              navigation.dispatch({\n                ...StackActions.popToTop(),\n                target: state.key,\n              });\n            }\n            // END FORK\n          }\n        });\n      }),\n    [navigation, state.index, state.key]\n  );\n\n  // START FORK\n  const { computedState, computedDescriptors, navigationWrapper } = usePreviewTransition(\n    state,\n    navigation,\n    descriptors,\n    describe\n  );\n\n  // Map internal gesture option to React Navigation's gestureEnabled option\n  // This allows Expo Router to override gesture behavior without affecting user settings\n  const finalDescriptors = React.useMemo(() => {\n    let needsNewMap = false;\n    const result: typeof computedDescriptors = {};\n    for (const key of Object.keys(computedDescriptors)) {\n      const descriptor = computedDescriptors[key];\n      const options = descriptor.options as NativeStackNavigationOptionsWithInternal;\n      const internalGestureEnabled = options?.[INTERNAL_EXPO_ROUTER_GESTURE_ENABLED_OPTION_NAME];\n      const needsGestureFix = internalGestureEnabled !== undefined;\n      const needsGlassFix = GLASS && options?.presentation === 'formSheet';\n\n      if (needsGestureFix || needsGlassFix) {\n        needsNewMap = true;\n        const newOptions = { ...options };\n        if (needsGestureFix) {\n          newOptions.gestureEnabled = internalGestureEnabled;\n        }\n        if (needsGlassFix) {\n          newOptions.headerTransparent ??= true;\n          newOptions.contentStyle ??= { backgroundColor: 'transparent' };\n          newOptions.headerShadowVisible ??= false;\n          newOptions.headerLargeTitleShadowVisible ??= false;\n        }\n        result[key] = { ...descriptor, options: newOptions };\n      } else {\n        result[key] = descriptor;\n      }\n    }\n    return needsNewMap ? result : computedDescriptors;\n  }, [computedDescriptors]);\n  const { registry, contextValue } = useCompositionRegistry();\n\n  const mergedDescriptors = React.useMemo(\n    () => mergeOptions(finalDescriptors, registry, computedState),\n    [finalDescriptors, computedState, registry]\n  );\n  // END FORK\n\n  return (\n    // START FORK\n    <DescriptorsContext value={descriptors}>\n      {/* END FORK */}\n      <NavigationContent>\n        <CompositionContext value={contextValue}>\n          <NativeStackView\n            {...rest}\n            // START FORK\n            state={computedState}\n            navigation={navigationWrapper}\n            descriptors={mergedDescriptors}\n            // state={state}\n            // navigation={navigation}\n            // descriptors={descriptors}\n            // END FORK\n            describe={describe}\n          />\n        </CompositionContext>\n      </NavigationContent>\n      {/* START FORK */}\n    </DescriptorsContext>\n    // END FORK\n  );\n}\n\nexport function createNativeStackNavigator<\n  const ParamList extends ParamListBase,\n  const NavigatorID extends string | undefined = undefined,\n  const TypeBag extends NavigatorTypeBagBase = {\n    ParamList: ParamList;\n    NavigatorID: NavigatorID;\n    State: StackNavigationState<ParamList>;\n    ScreenOptions: NativeStackNavigationOptions;\n    EventMap: NativeStackNavigationEventMap;\n    NavigationList: {\n      [RouteName in keyof ParamList]: NativeStackNavigationProp<ParamList, RouteName, NavigatorID>;\n    };\n    Navigator: typeof NativeStackNavigator;\n  },\n  const Config extends StaticConfig<TypeBag> = StaticConfig<TypeBag>,\n>(config?: Config): TypedNavigator<TypeBag, Config> {\n  return createNavigatorFactory(NativeStackNavigator)(config);\n}\n"]}

package/build/layouts/ExperimentalModalStack.d.ts

@@ -1,7 +1,7 @@
-import type { ComponentProps } from 'react';
+import { type ComponentProps } from 'react';
 import { RouterModal } from '../modal/web/ModalStack';
 import { Screen } from '../views/Screen';
-declare const _default: ((props: ComponentProps<typeof RouterModal>) => import("react").JSX.Element) & {
+declare const _default: (({ children, ...props }: ComponentProps<typeof RouterModal>) => import("react").JSX.Element) & {
     Screen: typeof Screen;
     Protected: import("react").FunctionComponent<import("../views/Protected").ProtectedProps>;
 };

package/build/layouts/ExperimentalModalStack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExperimentalModalStack.d.ts","sourceRoot":"","sources":["../../src/layouts/ExperimentalModalStack.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAG5C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;iCAK/B,cAAc,CAAC,OAAO,WAAW,CAAC;;;;AAD5C,wBAQE"}
+{"version":3,"file":"ExperimentalModalStack.d.ts","sourceRoot":"","sources":["../../src/layouts/ExperimentalModalStack.tsx"],"names":[],"mappings":"AACA,OAAO,EAAW,KAAK,cAAc,EAAE,MAAM,OAAO,CAAC;AAIrD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;kDAGd,cAAc,CAAC,OAAO,WAAW,CAAC;;;;AAD7D,wBAYE"}

package/build/layouts/ExperimentalModalStack.js

@@ -1,13 +1,15 @@
 "use strict";
+'use client';
 Object.defineProperty(exports, "__esModule", { value: true });
+const react_1 = require("react");
 const StackClient_1 = require("./StackClient");
+const stack_utils_1 = require("./stack-utils");
 const ModalStack_1 = require("../modal/web/ModalStack");
 const Protected_1 = require("../views/Protected");
 const Screen_1 = require("../views/Screen");
-// The RouterModal already includes Screen and Protected via withLayoutContext
-// but we need to ensure we forward the stackRouterOverride for singular routes etc.
-exports.default = Object.assign((props) => {
-    return <ModalStack_1.RouterModal {...props} UNSTABLE_router={StackClient_1.stackRouterOverride}/>;
+exports.default = Object.assign(({ children, ...props }) => {
+    const rnChildren = (0, react_1.useMemo)(() => (0, stack_utils_1.mapProtectedScreen)({ guard: true, children }).children, [children]);
+    return <ModalStack_1.RouterModal {...props} UNSTABLE_router={StackClient_1.stackRouterOverride} children={rnChildren}/>;
 }, {
     Screen: Screen_1.Screen,
     Protected: Protected_1.Protected,

package/build/layouts/ExperimentalModalStack.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExperimentalModalStack.js","sourceRoot":"","sources":["../../src/layouts/ExperimentalModalStack.tsx"],"names":[],"mappings":";;AAEA,+CAAoD;AACpD,wDAAsD;AACtD,kDAA+C;AAC/C,4CAAyC;AAEzC,8EAA8E;AAC9E,oFAAoF;AACpF,kBAAe,MAAM,CAAC,MAAM,CAC1B,CAAC,KAAyC,EAAE,EAAE;IAC5C,OAAO,CAAC,wBAAW,CAAC,IAAI,KAAK,CAAC,CAAC,eAAe,CAAC,CAAC,iCAAmB,CAAC,EAAG,CAAC;AAC1E,CAAC,EACD;IACE,MAAM,EAAN,eAAM;IACN,SAAS,EAAT,qBAAS;CACV,CACF,CAAC","sourcesContent":["import type { ComponentProps } from 'react';\n\nimport { stackRouterOverride } from './StackClient';\nimport { RouterModal } from '../modal/web/ModalStack';\nimport { Protected } from '../views/Protected';\nimport { Screen } from '../views/Screen';\n\n// The RouterModal already includes Screen and Protected via withLayoutContext\n// but we need to ensure we forward the stackRouterOverride for singular routes etc.\nexport default Object.assign(\n  (props: ComponentProps<typeof RouterModal>) => {\n    return <RouterModal {...props} UNSTABLE_router={stackRouterOverride} />;\n  },\n  {\n    Screen,\n    Protected,\n  }\n);\n"]}
+{"version":3,"file":"ExperimentalModalStack.js","sourceRoot":"","sources":["../../src/layouts/ExperimentalModalStack.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;AACb,iCAAqD;AAErD,+CAAoD;AACpD,+CAAmD;AACnD,wDAAsD;AACtD,kDAA+C;AAC/C,4CAAyC;AAEzC,kBAAe,MAAM,CAAC,MAAM,CAC1B,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAsC,EAAE,EAAE;IAC7D,MAAM,UAAU,GAAG,IAAA,eAAO,EACxB,GAAG,EAAE,CAAC,IAAA,gCAAkB,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAC5D,CAAC,QAAQ,CAAC,CACX,CAAC;IACF,OAAO,CAAC,wBAAW,CAAC,IAAI,KAAK,CAAC,CAAC,eAAe,CAAC,CAAC,iCAAmB,CAAC,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,EAAG,CAAC;AAChG,CAAC,EACD;IACE,MAAM,EAAN,eAAM;IACN,SAAS,EAAT,qBAAS;CACV,CACF,CAAC","sourcesContent":["'use client';\nimport { useMemo, type ComponentProps } from 'react';\n\nimport { stackRouterOverride } from './StackClient';\nimport { mapProtectedScreen } from './stack-utils';\nimport { RouterModal } from '../modal/web/ModalStack';\nimport { Protected } from '../views/Protected';\nimport { Screen } from '../views/Screen';\n\nexport default Object.assign(\n  ({ children, ...props }: ComponentProps<typeof RouterModal>) => {\n    const rnChildren = useMemo(\n      () => mapProtectedScreen({ guard: true, children }).children,\n      [children]\n    );\n    return <RouterModal {...props} UNSTABLE_router={stackRouterOverride} children={rnChildren} />;\n  },\n  {\n    Screen,\n    Protected,\n  }\n);\n"]}

package/build/layouts/StackClient.d.ts

@@ -2,7 +2,7 @@ import { ParamListBase, StackRouter as RNStackRouter, StackNavigationState, type
 import { NativeStackNavigationEventMap, NativeStackNavigationOptions } from '@react-navigation/native-stack';
 import React, { ComponentProps } from 'react';
 import { type StackScreenProps, StackSearchBar } from './stack-utils';
-import { Protected, type ProtectedProps } from '../views/Protected';
+import { Protected } from '../views/Protected';
 /**
  * We extend NativeStackNavigationOptions with our custom props
  * to allow for several extra props to be used on web, like modalWidth
@@ -160,7 +160,7 @@ declare const Stack: ((props: ComponentProps<typeof RNStack>) => React.JSX.Eleme
         Title: typeof import("./stack-utils").StackScreenTitle;
         BackButton: typeof import("./stack-utils").StackScreenBackButton;
     };
-    Protected: React.FunctionComponent<ProtectedProps>;
+    Protected: React.FunctionComponent<import("../views/Protected").ProtectedProps>;
     Header: typeof import("./stack-utils/StackHeaderComponent").StackHeaderComponent;
     SearchBar: typeof StackSearchBar;
     Toolbar: {

package/build/layouts/StackClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StackClient.d.ts","sourceRoot":"","sources":["../../src/layouts/StackClient.tsx"],"names":[],"mappings":"AACA,OAAO,EAGL,aAAa,EAKb,WAAW,IAAI,aAAa,EAE5B,oBAAoB,EACpB,KAAK,SAAS,EACf,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,6BAA6B,EAC7B,4BAA4B,EAC7B,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EAAE,EAAY,cAAc,EAAW,MAAM,OAAO,CAAC;AAcjE,OAAO,EACL,KAAK,gBAAgB,EAGrB,cAAc,EAIf,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAOpE;;;GAGG;AACH,MAAM,MAAM,8BAA8B,GAAG,4BAA4B,GAAG;IAC1E,aAAa,CAAC,EAAE;QACd;;;WAGG;QACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACxB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACzB;;;WAGG;QACH,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC5B;;;WAGG;QACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC3B;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAEF,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKU,CAAC;AA4CxB;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,cAAc,CAAC,OAAO,OAAO,CAAC,CAAC,iBAAiB,CAAC,CA4U9F,CAAC;AA8FF;;;;GAIG;AACH,QAAA,MAAM,KAAK,WACD,cAAc,CAAC,OAAO,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;CA0DvC,CAAC;AAoCF,eAAe,KAAK,CAAC;AAErB,eAAO,MAAM,WAAW,EAAE,OAAO,aAMhC,CAAC"}
+{"version":3,"file":"StackClient.d.ts","sourceRoot":"","sources":["../../src/layouts/StackClient.tsx"],"names":[],"mappings":"AACA,OAAO,EAGL,aAAa,EAKb,WAAW,IAAI,aAAa,EAE5B,oBAAoB,EACpB,KAAK,SAAS,EACf,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,6BAA6B,EAC7B,4BAA4B,EAC7B,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EAAE,EAAY,cAAc,EAAW,MAAM,OAAO,CAAC;AAcjE,OAAO,EACL,KAAK,gBAAgB,EAGrB,cAAc,EAKf,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAM/C;;;GAGG;AACH,MAAM,MAAM,8BAA8B,GAAG,4BAA4B,GAAG;IAC1E,aAAa,CAAC,EAAE;QACd;;;WAGG;QACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACxB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACzB;;;WAGG;QACH,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC5B;;;WAGG;QACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC3B;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAEF,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKU,CAAC;AA4CxB;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,cAAc,CAAC,OAAO,OAAO,CAAC,CAAC,iBAAiB,CAAC,CA4U9F,CAAC;AA8DF;;;;GAIG;AACH,QAAA,MAAM,KAAK,WACD,cAAc,CAAC,OAAO,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;CA0DvC,CAAC;AAoCF,eAAe,KAAK,CAAC;AAErB,eAAO,MAAM,WAAW,EAAE,OAAO,aAMhC,CAAC"}

package/build/layouts/StackClient.js

@@ -46,7 +46,6 @@ const useScreens_1 = require("../useScreens");
 const stack_utils_1 = require("./stack-utils");
 const children_1 = require("../utils/children");
 const Protected_1 = require("../views/Protected");
-const Screen_1 = require("../views/Screen");
 const NativeStackNavigator = (0, createNativeStackNavigator_1.createNativeStackNavigator)().Navigator;
 const RNStack = (0, withLayoutContext_1.withLayoutContext)(NativeStackNavigator);
 function isStackAction(action) {
@@ -409,39 +408,6 @@ function filterSingular(state, getId) {
         routes,
     };
 }
-function mapProtectedScreen(props) {
-    return {
-        ...props,
-        children: react_1.Children.toArray(props.children)
-            .map((child, index) => {
-            if ((0, children_1.isChildOfType)(child, stack_utils_1.StackScreen)) {
-                const { children, options: childOptions, ...rest } = child.props;
-                const options = typeof childOptions === 'function'
-                    ? (...params) => (0, stack_utils_1.appendScreenStackPropsToOptions)(childOptions(...params), { children })
-                    : (0, stack_utils_1.appendScreenStackPropsToOptions)(childOptions ?? {}, { children });
-                return <Screen_1.Screen key={rest.name} {...rest} options={options}/>;
-            }
-            else if ((0, children_1.isChildOfType)(child, Protected_1.Protected)) {
-                return <Protected_1.Protected key={`${index}-${props.guard}`} {...mapProtectedScreen(child.props)}/>;
-            }
-            else if ((0, children_1.isChildOfType)(child, stack_utils_1.StackHeader)) {
-                // Ignore Stack.Header, because it can be used to set header options for Stack
-                // and we use this function to process children of Stack, as well.
-                return null;
-            }
-            else {
-                if (react_1.default.isValidElement(child)) {
-                    console.warn(`Unknown child element passed to Stack: ${child.type}`);
-                }
-                else {
-                    console.warn(`Unknown child element passed to Stack: ${child}`);
-                }
-            }
-            return null;
-        })
-            .filter(Boolean),
-    };
-}
 /**
  * Renders a native stack navigator.
  *
@@ -480,7 +446,7 @@ const Stack = Object.assign((props) => {
         const condition = isStackAnimationDisabled ? () => true : shouldDisableAnimationBasedOnParams;
         return disableAnimationInScreenOptions(screenOptionsWithCompositionAPIOptions, condition);
     }, [screenOptionsWithCompositionAPIOptions, isStackAnimationDisabled]);
-    const rnChildren = (0, react_1.useMemo)(() => mapProtectedScreen({ guard: true, children: props.children }).children, [props.children]);
+    const rnChildren = (0, react_1.useMemo)(() => (0, stack_utils_1.mapProtectedScreen)({ guard: true, children: props.children }).children, [props.children]);
     return (<RNStack {...props} children={rnChildren} screenOptions={screenOptions} UNSTABLE_router={exports.stackRouterOverride}/>);
 }, {
     Screen: stack_utils_1.StackScreen,