11diff --git a/lib/module/views/NativeStackView.native.js b/lib/module/views/NativeStackView.native.js
2+ index 6882090..011ad0e 100644
23--- a/lib/module/views/NativeStackView.native.js
34+++ b/lib/module/views/NativeStackView.native.js
4- @@ -3,3 +3,3 @@
5- import { getDefaultHeaderHeight, getHeaderTitle, HeaderBackContext, HeaderHeightContext, HeaderShownContext, SafeAreaProviderCompat, useFrameSize } from '@react-navigation/elements';
6- - import { NavigationProvider, StackActions, usePreventRemoveContext, useTheme } from '@react-navigation/native';
7- + import { NavigationContext, NavigationRouteContext, StackActions, usePreventRemoveContext, useTheme } from '@react-navigation/native';
8- import * as React from 'react';
9- @@ -19,4 +19,14 @@
5+ @@ -17,8 +17,12 @@ const ANDROID_DEFAULT_HEADER_HEIGHT = 56;
6+ function isFabric() {
7+ return 'nativeFabricUIManager' in global;
108 }
119+ function SceneNavigationProvider({ presentationEnvelope, ...props }) {
12- + return presentationEnvelope ? props.children : /*#__PURE__*/_jsx(NavigationContext.Provider, {
13- + value: props.navigation,
14- + children: /*#__PURE__*/_jsx(NavigationRouteContext.Provider, {
15- + value: props.route,
16- + children: props.children
17- + })
18- + });
10+ + return presentationEnvelope ? props.children : /*#__PURE__*/_jsx(NavigationProvider, props);
1911+ }
2012 const useNativeDriver = Platform.OS !== 'web';
2113 const SceneView = /*#__PURE__*/React.memo(function SceneView({
2214+ presentationEnvelope,
2315 index,
24- @@ -307,3 +317,4 @@
16+ focused,
17+ shouldFreeze,
18+ @@ -305,7 +309,8 @@ const SceneView = /*#__PURE__*/React.memo(function SceneView({
19+ }
20+ }
2521 });
2622- return /*#__PURE__*/_jsx(NavigationProvider, {
2723+ return /*#__PURE__*/_jsx(SceneNavigationProvider, {
2824+ presentationEnvelope,
2925 route: route,
30- @@ -429,2 +440,3 @@
26+ navigation: navigation,
27+ children: /*#__PURE__*/_jsx(ScreenStackItem, {
28+ @@ -427,6 +432,7 @@ const SceneView = /*#__PURE__*/React.memo(function SceneView({
29+ });
30+ });
3131 export function NativeStackView({
3232+ presentationEnvelope,
3333 state,
34- @@ -446,2 +458,13 @@
34+ navigation,
35+ descriptors,
36+ @@ -444,6 +450,17 @@ export function NativeStackView({
37+ return /*#__PURE__*/_jsx(SafeAreaProviderCompat, {
38+ children: /*#__PURE__*/_jsx(ScreenStack, {
3539 style: styles.container,
3640+ onFinishTransitioning: () => {
3741+ // Surface UIKit's transition-completion callback to every route of
@@ -45,10 +49,16 @@ diff --git a/lib/module/views/NativeStackView.native.js b/lib/module/views/Nativ
4549+ });
4650+ },
4751 children: state.routes.concat(state.preloadedRoutes).map((route, index) => {
48- @@ -462,2 +485,3 @@
52+ const descriptor = descriptors[route.key] ?? preloadedDescriptors[route.key];
53+ const isFocused = state.index === index;
54+ @@ -460,6 +477,7 @@ export function NativeStackView({
55+ // due to component being unmounted. To avoid this, we don't freeze the previous screen there
56+ const shouldFreeze = isFabric() ? !isPreloaded && !isFocused && !isBelowFocused && !isModalOnIos : !isPreloaded && !isFocused && !isModalOnIos;
4957 return /*#__PURE__*/_jsx(SceneView, {
5058+ presentationEnvelope,
5159 index: index,
60+ focused: isFocused,
61+ shouldFreeze: shouldFreeze,
5262diff --git a/lib/module/views/useHeaderConfigProps.js b/lib/module/views/useHeaderConfigProps.js
5363index 08055b2..8718847 100644
5464--- a/lib/module/views/useHeaderConfigProps.js
@@ -249,57 +259,71 @@ index 5d63f41..e9c53ee 100644
249259 * A React Element to display as the item.
250260 */
251261diff --git a/src/views/NativeStackView.native.tsx b/src/views/NativeStackView.native.tsx
262+ index aa13bc7..ab4a9d1 100644
252263--- a/src/views/NativeStackView.native.tsx
253264+++ b/src/views/NativeStackView.native.tsx
254- @@ -10,3 +10,4 @@
255- import {
256- - NavigationProvider,
257- + NavigationContext,
258- + NavigationRouteContext,
259- type ParamListBase,
260- @@ -54,3 +55,16 @@
265+ @@ -52,7 +52,14 @@ function isFabric() {
266+ return 'nativeFabricUIManager' in global;
267+ }
261268
262269+ // A presentation envelope contains descriptors from its owning navigator.
263270+ // Its synthetic route must not override those descriptors' focus state.
264- + function SceneNavigationProvider({ presentationEnvelope, ...props }: { presentationEnvelope?: boolean; route: NativeStackDescriptor["route"]; navigation: NativeStackDescriptor["navigation"]; children: React.ReactNode }) {
265- + return presentationEnvelope ? props.children : (
266- + <NavigationContext.Provider value={props.navigation}>
267- + <NavigationRouteContext.Provider value={props.route}>
268- + {props.children}
269- + </NavigationRouteContext.Provider>
270- + </NavigationContext.Provider>
271- + );
271+ + function SceneNavigationProvider({ presentationEnvelope, ...props }: React.ComponentProps<typeof NavigationProvider> & { presentationEnvelope?: boolean }) {
272+ + return presentationEnvelope ? props.children : <NavigationProvider {...props} />;
272273+ }
273274+
274275 type SceneViewProps = {
275276+ presentationEnvelope?: boolean;
276277 index: number;
277- @@ -73,2 +87,3 @@
278+ focused: boolean;
279+ shouldFreeze: boolean;
280+ @@ -71,6 +78,7 @@ type SceneViewProps = {
281+ const useNativeDriver = Platform.OS !== 'web';
282+
278283 const SceneView = React.memo(function SceneView({
279284+ presentationEnvelope,
280285 index,
281- @@ -436,3 +451,3 @@
286+ focused,
287+ shouldFreeze,
288+ @@ -434,7 +442,7 @@ const SceneView = React.memo(function SceneView({
289+ );
290+
282291 return (
283292- <NavigationProvider route={route} navigation={navigation}>
284293+ <SceneNavigationProvider presentationEnvelope={presentationEnvelope} route={route} navigation={navigation}>
285294 <ScreenStackItem
286- @@ -573,3 +588,3 @@
295+ screenId={route.key}
296+ activityState={isPreloaded ? 0 : 2}
297+ @@ -571,11 +579,12 @@ const SceneView = React.memo(function SceneView({
298+ </HeaderHeightContext.Provider>
299+ </AnimatedHeaderHeightContext.Provider>
287300 </ScreenStackItem>
288301- </NavigationProvider>
289302+ </SceneNavigationProvider>
290303 );
291- @@ -578,2 +593,3 @@
304+ });
305+
292306 type Props = {
293307+ presentationEnvelope?: boolean;
294308 state: StackNavigationState<ParamListBase>;
295- @@ -588,2 +604,3 @@
309+ navigation: NativeStackNavigationHelpers;
310+ descriptors: NativeStackDescriptorMap;
311+ @@ -586,6 +595,7 @@ type Props = {
312+ };
313+
296314 export function NativeStackView({
297315+ presentationEnvelope,
298316 state,
299- @@ -635,2 +652,3 @@
317+ navigation,
318+ descriptors,
319+ @@ -633,6 +643,7 @@ export function NativeStackView({
320+
321+ return (
300322 <SceneView
301323+ presentationEnvelope={presentationEnvelope}
302324 key={route.key}
325+ index={index}
326+ focused={isFocused}
303327diff --git a/src/views/NativeStackView.tsx b/src/views/NativeStackView.tsx
304328index c50a3fa..6305ed5 100644
305329--- a/src/views/NativeStackView.tsx
0 commit comments