react-native-screen-transitions 4.0.0-alpha.6 → 4.0.0-alpha.8

package/src/components/overlay/helpers/run-overlay-slot-interpolator.ts

@@ -0,0 +1,48 @@
+import type { ScreenInterpolatorFrame } from "../../../providers/screen/animation/helpers/pipeline";
+import { createInterpolatorScope } from "../../../providers/screen/styles/helpers/create-interpolator-scope";
+import { normalizeSlots } from "../../../providers/screen/styles/helpers/normalize-slots";
+import { selectInterpolatorFrame } from "../../../providers/screen/styles/helpers/select-interpolator-frame";
+import type {
+	NormalizedTransitionSlotStyle,
+	ScreenStyleInterpolator,
+	ScreenTransitionAccessor,
+} from "../../../types/animation.types";
+import { logger } from "../../../utils/logger";
+
+export const runOverlaySlotInterpolator = ({
+	frame,
+	interpolator,
+	transition,
+}: {
+	frame: ScreenInterpolatorFrame;
+	interpolator: ScreenStyleInterpolator | undefined;
+	transition: ScreenTransitionAccessor;
+}): NormalizedTransitionSlotStyle | undefined => {
+	"worklet";
+
+	if (!interpolator) {
+		return undefined;
+	}
+
+	try {
+		const raw = interpolator(
+			createInterpolatorScope({
+				frame,
+				selectedFrame: selectInterpolatorFrame(frame, false),
+				transition,
+			}),
+		);
+
+		if (!raw?.overlay) {
+			return undefined;
+		}
+
+		return normalizeSlots({ overlay: raw.overlay }).overlay;
+	} catch (_) {
+		if (__DEV__) {
+			logger.warn("screenStyleInterpolator must be a worklet");
+		}
+
+		return undefined;
+	}
+};

package/src/components/overlay/hooks/use-overlay-slot.ts

@@ -0,0 +1,121 @@
+import { useMemo } from "react";
+import { useWindowDimensions } from "react-native";
+import {
+	type SharedValue,
+	useAnimatedProps,
+	useAnimatedStyle,
+	useDerivedValue,
+} from "react-native-reanimated";
+import { NO_PROPS, NO_STYLES } from "../../../constants";
+import type { ScreenAnimationContextValue } from "../../../providers/screen/animation/animation.provider";
+import { useBuildTransitionAccessor } from "../../../providers/screen/animation/helpers/accessors/use-build-transition-accessor";
+import { collectInterpolatorSharedValues } from "../../../providers/screen/styles/helpers/collect-interpolator-shared-values";
+import type {
+	NormalizedTransitionSlotStyle,
+	ScreenStyleInterpolator,
+} from "../../../types/animation.types";
+import { getVisibilityBlockOffset } from "../../../utils/visibility-block-offset";
+import {
+	createOverlayInterpolatorFrame,
+	shouldUseOverlayGestureDriver,
+} from "../helpers/create-overlay-interpolator-frame";
+import { runOverlaySlotInterpolator } from "../helpers/run-overlay-slot-interpolator";
+
+export const useOverlaySlot = ({
+	overlayAnimationStore,
+	overlayInterpolator,
+	driverAnimationStore,
+	previousOverlayAnimationStore,
+	driverInterpolator,
+	interpolatorReady,
+	isIncoming,
+}: {
+	overlayAnimationStore: ScreenAnimationContextValue;
+	overlayInterpolator: ScreenStyleInterpolator | undefined;
+	driverAnimationStore: ScreenAnimationContextValue;
+	previousOverlayAnimationStore?: ScreenAnimationContextValue;
+	driverInterpolator: ScreenStyleInterpolator | undefined;
+	interpolatorReady: SharedValue<number>;
+	isIncoming: boolean;
+}) => {
+	const { height } = useWindowDimensions();
+	const overlayTransition = useBuildTransitionAccessor(overlayAnimationStore);
+	const driverTransition = useBuildTransitionAccessor(driverAnimationStore);
+
+	const interpolatorSharedValues = useMemo(
+		() =>
+			collectInterpolatorSharedValues([
+				overlayInterpolator,
+				driverInterpolator,
+			]),
+		[overlayInterpolator, driverInterpolator],
+	);
+
+	const overlaySlot = useDerivedValue<
+		NormalizedTransitionSlotStyle | undefined
+	>(() => {
+		"worklet";
+		overlayAnimationStore.screenInterpolatorPropsRevision.get();
+		driverAnimationStore.screenInterpolatorPropsRevision.get();
+		previousOverlayAnimationStore?.screenInterpolatorPropsRevision.get();
+
+		for (let index = 0; index < interpolatorSharedValues.length; index++) {
+			interpolatorSharedValues[index]?.get();
+		}
+
+		const overlayFrame = overlayAnimationStore.screenInterpolatorProps.get();
+		const driverFrame = driverAnimationStore.screenInterpolatorProps.get();
+		const overlayOwnsGesture = shouldUseOverlayGestureDriver(
+			overlayFrame,
+			driverFrame,
+		);
+		const frame = createOverlayInterpolatorFrame({
+			overlayFrame,
+			driverFrame: overlayOwnsGesture ? overlayFrame : driverFrame,
+			previousOverlayFrame:
+				previousOverlayAnimationStore?.screenInterpolatorProps.get(),
+		});
+
+		return runOverlaySlotInterpolator({
+			frame,
+			interpolator: overlayOwnsGesture
+				? overlayInterpolator
+				: driverInterpolator,
+			transition: overlayOwnsGesture ? overlayTransition : driverTransition,
+		});
+	});
+
+	const animatedStyle = useAnimatedStyle(() => {
+		"worklet";
+		const slot = overlaySlot.get();
+		if (!slot) {
+			return NO_STYLES;
+		}
+
+		if (isIncoming && !interpolatorReady.get()) {
+			return {
+				transform: [{ translateY: getVisibilityBlockOffset(height) }],
+			};
+		}
+
+		return slot.style ?? NO_STYLES;
+	});
+
+	const animatedProps = useAnimatedProps(() => {
+		"worklet";
+		const slotProps = overlaySlot.get()?.props;
+		if (!slotProps) {
+			return NO_PROPS;
+		}
+
+		const {
+			pointerEvents: _pointerEvents,
+			teleport: _teleport,
+			...props
+		} = slotProps;
+
+		return props;
+	});
+
+	return { animatedProps, animatedStyle };
+};

package/src/components/overlay/variations/float-overlay.tsx

@@ -1,14 +1,10 @@
-import { useMemo } from "react";
-import { snapDescriptorToIndex } from "../../../animation/snap-to";
-import { useStack } from "../../../hooks/navigation/use-stack";
-import { ScreenAnimationProvider } from "../../../providers/screen/animation";
-import type { BaseDescriptor } from "../../../providers/screen/descriptors";
-import { DescriptorsProvider } from "../../../providers/screen/descriptors";
-import { ScreenOptionsProvider } from "../../../providers/screen/options";
-import { ScreenSlotProvider } from "../../../providers/screen/styles";
-import type { OverlayScreenState } from "../../../types/overlay.types";
+import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
+import { useStackCoreStore } from "../../../providers/stack/core.provider";
 
-import { getActiveFloatOverlay } from "../helpers/get-active-overlay";
+import {
+	getFloatOverlayStack,
+	getFloatOverlayTransitions,
+} from "../helpers/get-active-overlay";
 import { OverlayHost } from "./overlay-host";
 
 /**
@@ -16,65 +12,28 @@ import { OverlayHost } from "./overlay-host";
  * Gets routes and descriptors from stack context.
  */
 export function FloatOverlay() {
-	const { scenes, focusedIndex, flags, routes, routeKeys } = useStack();
-
-	const activeOverlay = useMemo(
-		() =>
-			getActiveFloatOverlay(scenes, focusedIndex, flags.TRANSITIONS_ALWAYS_ON),
-		[scenes, focusedIndex, flags.TRANSITIONS_ALWAYS_ON],
+	const scenes = useBlankStackStore((store) => store.scenes);
+	const transitionsAlwaysOn = useStackCoreStore(
+		(store) => store.flags.TRANSITIONS_ALWAYS_ON,
 	);
 
-	const overlayData = useMemo(() => {
-		if (!activeOverlay) return null;
-
-		const { scene, overlayIndex } = activeOverlay;
-		const previous = scenes[overlayIndex - 1]?.descriptor;
-		const current = scene.descriptor;
-		const next = scenes[overlayIndex + 1]?.descriptor;
-		const focusedScene = scenes[focusedIndex] ?? scenes[scenes.length - 1];
-		const focusedDescriptor = focusedScene?.descriptor;
-
-		const overlayScreenState: OverlayScreenState<BaseDescriptor["navigation"]> =
-			{
-				index: routeKeys.indexOf(current.route.key),
-				options: focusedDescriptor?.options ?? {},
-				routes,
-				focusedRoute: focusedScene?.route ?? current.route,
-				focusedIndex,
-				meta: focusedDescriptor?.options?.meta,
-				navigation: current.navigation,
-				snapTo: (index: number) => {
-					snapDescriptorToIndex(current, index);
-				},
-			};
-
-		return {
-			scene,
-			previous,
-			current,
-			next,
-			overlayScreenState,
-		};
-	}, [activeOverlay, scenes, focusedIndex, routeKeys, routes]);
-
-	if (!overlayData) {
+	const overlayStack = getFloatOverlayStack(scenes, transitionsAlwaysOn);
+	if (overlayStack.length === 0) {
 		return null;
 	}
 
-	const { scene, previous, current, next, overlayScreenState } = overlayData;
-
-	return (
-		<DescriptorsProvider current={current} previous={previous} next={next}>
-			<ScreenOptionsProvider>
-				<ScreenAnimationProvider>
-					<ScreenSlotProvider isFloatingOverlay>
-						<OverlayHost
-							scene={scene}
-							overlayScreenState={overlayScreenState}
-						/>
-					</ScreenSlotProvider>
-				</ScreenAnimationProvider>
-			</ScreenOptionsProvider>
-		</DescriptorsProvider>
+	const overlayTransitions = getFloatOverlayTransitions(overlayStack, scenes);
+
+	return overlayTransitions.map(
+		({ scene, activity, driverScene }, layerIndex) => (
+			<OverlayHost
+				key={scene.route.key}
+				scene={scene}
+				driverScene={driverScene}
+				previousOverlayScene={overlayTransitions[layerIndex - 1]?.scene}
+				activity={activity}
+				layerIndex={layerIndex}
+			/>
+		),
 	);
 }

package/src/components/overlay/variations/overlay-host.tsx

@@ -1,52 +1,164 @@
-import { memo, useMemo } from "react";
-import { Animated, StyleSheet, View } from "react-native";
-import { useDerivedValue } from "react-native-reanimated";
-import type { StackScene } from "../../../hooks/navigation/use-stack";
+import { memo, useMemo, useRef } from "react";
+import { StyleSheet, View } from "react-native";
+import Animated, { useDerivedValue } from "react-native-reanimated";
+import { snapDescriptorToIndex } from "../../../animation/snap-to";
 import { NavigationScreenProvider } from "../../../providers/navigation/navigation-host.provider";
-import { useScreenAnimation } from "../../../providers/screen/animation";
-import type { BaseDescriptor } from "../../../providers/screen/descriptors";
+import { useOptionalScreenAnimationStore } from "../../../providers/screen/animation";
+import type { ScreenAnimationContextValue } from "../../../providers/screen/animation/animation.provider";
+import {
+	type ScreenSlotContextValue,
+	useOptionalScreenSlotStore,
+} from "../../../providers/screen/styles/slot.provider";
+import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
+import type { OverlayProps } from "../../../types/overlay.types";
 import type {
-	OverlayProps,
-	OverlayScreenState,
-} from "../../../types/overlay.types";
+	FloatOverlayActivity,
+	FloatOverlayEntry,
+} from "../helpers/get-active-overlay";
+import {
+	type ReadyOverlayResources,
+	retainReadyOverlayResources,
+} from "../helpers/retain-ready-overlay-resources";
+import { useOverlaySlot } from "../hooks/use-overlay-slot";
 
 type OverlayHostProps = {
-	scene: StackScene;
-	overlayScreenState: OverlayScreenState<BaseDescriptor["navigation"]>;
+	scene: FloatOverlayEntry["scene"];
+	driverScene: FloatOverlayEntry["scene"];
+	previousOverlayScene?: FloatOverlayEntry["scene"];
+	activity: FloatOverlayActivity;
+	layerIndex: number;
 };
 
 export const OverlayHost = memo(function OverlayHost({
 	scene,
-	overlayScreenState,
+	driverScene,
+	previousOverlayScene,
+	activity,
+	layerIndex,
 }: OverlayHostProps) {
-	const OverlayComponent = scene.descriptor.options.overlay;
+	const overlayAnimationStore = useOptionalScreenAnimationStore(
+		scene.route.key,
+	);
+	const driverAnimationStore = useOptionalScreenAnimationStore(
+		driverScene.route.key,
+	);
+	const previousOverlayAnimationStore = useOptionalScreenAnimationStore(
+		previousOverlayScene?.route.key ?? scene.route.key,
+	);
+	const driverSlots = useOptionalScreenSlotStore(driverScene.route.key);
+	const overlayComponentRef = useRef(scene.descriptor.options.overlay);
+	const OverlayComponent = overlayComponentRef.current;
+	const readyResourcesRef = useRef<ReadyOverlayResources | null>(null);
+	readyResourcesRef.current = retainReadyOverlayResources(
+		readyResourcesRef.current,
+		overlayAnimationStore,
+		driverScene,
+		driverAnimationStore,
+		driverSlots,
+	);
+	const readyResources = readyResourcesRef.current;
+
+	if (!OverlayComponent || !readyResources) {
+		return null;
+	}
+
+	return (
+		<ReadyOverlayHost
+			scene={scene}
+			driverScene={readyResources.driverScene}
+			activity={activity}
+			layerIndex={layerIndex}
+			overlayAnimationStore={readyResources.overlayAnimationStore}
+			driverAnimationStore={readyResources.driverAnimationStore}
+			previousOverlayAnimationStore={
+				previousOverlayScene ? previousOverlayAnimationStore : undefined
+			}
+			driverSlots={readyResources.driverSlots}
+			OverlayComponent={OverlayComponent}
+		/>
+	);
+});
+
+type ReadyOverlayHostProps = OverlayHostProps & {
+	overlayAnimationStore: ScreenAnimationContextValue;
+	driverAnimationStore: ScreenAnimationContextValue;
+	previousOverlayAnimationStore?: ScreenAnimationContextValue | null;
+	driverSlots: ScreenSlotContextValue;
+	OverlayComponent: NonNullable<
+		FloatOverlayEntry["scene"]["descriptor"]["options"]["overlay"]
+	>;
+};
 
-	const screenAnimation = useScreenAnimation();
+function ReadyOverlayHost({
+	scene,
+	driverScene,
+	activity,
+	layerIndex,
+	overlayAnimationStore,
+	driverAnimationStore,
+	previousOverlayAnimationStore,
+	driverSlots,
+	OverlayComponent,
+}: ReadyOverlayHostProps) {
+	const { scenes, focusedIndex, routeKeys, routes } = useBlankStackStore();
+	const descriptor = scene.descriptor;
+	const focusedScene = scenes[focusedIndex] ?? scenes[scenes.length - 1];
+	const focusedDescriptor = focusedScene?.descriptor;
+	const { animatedProps, animatedStyle } = useOverlaySlot({
+		overlayAnimationStore,
+		overlayInterpolator: scene.descriptor.options.screenStyleInterpolator,
+		driverAnimationStore,
+		previousOverlayAnimationStore: previousOverlayAnimationStore ?? undefined,
+		driverInterpolator: driverScene.descriptor.options.screenStyleInterpolator,
+		interpolatorReady: driverSlots.interpolatorReady,
+		isIncoming: scene.route.key === driverScene.route.key,
+	});
 	const relativeProgress = useDerivedValue(() => {
 		"worklet";
-		return screenAnimation.get().stackProgress;
+		overlayAnimationStore.screenInterpolatorPropsRevision.get();
+		return overlayAnimationStore.screenInterpolatorProps.get().stackProgress;
 	});
 
-	const overlayProps: OverlayProps<BaseDescriptor["navigation"]> = useMemo(
+	const overlayProps: OverlayProps = useMemo(
 		() => ({
-			...overlayScreenState,
+			route: scene.route,
+			index: routeKeys.indexOf(scene.route.key),
+			options: focusedDescriptor?.options ?? {},
+			routes,
+			focusedRoute: focusedScene?.route ?? scene.route,
+			focusedIndex,
+			meta: focusedDescriptor?.options?.meta,
+			navigation: scene.descriptor.navigation,
+			snapTo: (index: number) => {
+				snapDescriptorToIndex(scene.descriptor, index);
+			},
 			progress: relativeProgress,
 		}),
-		[relativeProgress, overlayScreenState],
+		[
+			scene,
+			focusedDescriptor?.options,
+			focusedIndex,
+			focusedScene?.route,
+			relativeProgress,
+			routeKeys,
+			routes,
+		],
 	);
-
-	if (!OverlayComponent) {
-		return null;
-	}
-
 	return (
 		<Animated.View
-			pointerEvents="box-none"
-			style={[styles.container, styles.floating, StyleSheet.absoluteFill]}
+			animatedProps={animatedProps}
+			pointerEvents={activity === "active" ? "box-none" : "none"}
+			style={[
+				styles.container,
+				styles.floating,
+				StyleSheet.absoluteFill,
+				{ zIndex: 1000 + layerIndex },
+				animatedStyle,
+			]}
 		>
 			<NavigationScreenProvider
-				navigation={scene.descriptor.navigation}
-				route={scene.route}
+				navigation={descriptor.navigation}
+				route={descriptor.route}
 			>
 				<View
 					pointerEvents="box-none"
@@ -57,7 +169,7 @@ export const OverlayHost = memo(function OverlayHost({
 			</NavigationScreenProvider>
 		</Animated.View>
 	);
-});
+}
 
 const styles = StyleSheet.create({
 	overlay: {

package/src/components/screen-container/hooks/use-backdrop-pointer-events.ts

@@ -3,9 +3,7 @@ import { useAnimatedReaction } from "react-native-reanimated";
 import { scheduleOnRN } from "react-native-worklets";
 import { useDescriptorsStore } from "../../../providers/screen/descriptors";
 import { useScreenOptionsStore } from "../../../providers/screen/options";
-import { useStackCoreStore } from "../../../providers/stack/core.provider";
 import type { BackdropBehavior } from "../../../types/screen.types";
-import { StackType } from "../../../types/stack.types";
 
 interface BackdropPointerEventsResult {
 	pointerEvents: "box-none" | undefined;
@@ -18,15 +16,13 @@ interface BackdropPointerEventsResult {
  *
  * - Runtime interpolator `backdropBehavior` takes precedence
  * - Explicit descriptor `backdropBehavior` option is next
- * - Component stacks default to 'passthrough' (box-none)
- * - Other stacks default to 'block' (undefined = normal touch handling)
+ * - Otherwise defaults to 'block' (undefined = normal touch handling)
  */
 export function useBackdropPointerEvents(): BackdropPointerEventsResult {
 	const screenOptions = useScreenOptionsStore();
 	const descriptorBackdropBehavior = useDescriptorsStore(
 		(store) => store.options.backdropBehavior,
 	);
-	const stackType = useStackCoreStore((store) => store.flags.STACK_TYPE);
 	const [runtimeBackdropBehavior, setRuntimeBackdropBehavior] = useState<
 		BackdropBehavior | undefined
 	>(undefined);
@@ -42,11 +38,8 @@ export function useBackdropPointerEvents(): BackdropPointerEventsResult {
 		[screenOptions],
 	);
 
-	const isComponentStack = stackType === StackType.COMPONENT;
 	const backdropBehavior: BackdropBehavior =
-		runtimeBackdropBehavior ??
-		descriptorBackdropBehavior ??
-		(isComponentStack ? "passthrough" : "block");
+		runtimeBackdropBehavior ?? descriptorBackdropBehavior ?? "block";
 
 	const pointerEvents =
 		backdropBehavior === "passthrough" ? "box-none" : undefined;

package/src/components/screen-container/layers/backdrop.tsx

@@ -1,7 +1,7 @@
 import { type ComponentType, memo, useCallback, useMemo } from "react";
 import { Pressable, StyleSheet } from "react-native";
 import Animated from "react-native-reanimated";
-import { scheduleOnUI } from "react-native-worklets";
+import { scheduleOnRN, scheduleOnUI } from "react-native-worklets";
 import { DefaultSnapSpec } from "../../../configs/specs";
 import { useNavigationHelpers } from "../../../hooks/navigation/use-navigation-helpers";
 import { useDescriptorsStore } from "../../../providers/screen/descriptors";
@@ -24,7 +24,7 @@ export const BackdropLayer = memo(function BackdropLayer({
 	backdropBehavior: BackdropBehavior;
 	isBackdropActive: boolean;
 }) {
-	const { dismissScreen } = useNavigationHelpers();
+	const { requestDismiss } = useNavigationHelpers();
 
 	const routeKey = useDescriptorsStore(
 		(store) => store.derivations.currentScreenKey,
@@ -35,9 +35,10 @@ export const BackdropLayer = memo(function BackdropLayer({
 	const rawSnapPoints = useDescriptorsStore(
 		(store) => store.options.snapPoints,
 	);
-	const canDismiss = useDescriptorsStore(
+	const isGestureDismissEnabled = useDescriptorsStore(
 		(store) => store.options.gestureEnabled !== false,
 	);
+	const canDismiss = isGestureDismissEnabled;
 	const transitionSpec = useDescriptorsStore(
 		(store) => store.options.transitionSpec,
 	);
@@ -57,14 +58,14 @@ export const BackdropLayer = memo(function BackdropLayer({
 
 	const handleBackdropPress = useCallback(() => {
 		if (backdropBehavior === "dismiss") {
-			dismissScreen();
+			requestDismiss();
 			return;
 		}
 
 		if (backdropBehavior === "collapse") {
 			// No snap points → fallback to dismiss
 			if (!rawSnapPoints || rawSnapPoints.length === 0) {
-				dismissScreen();
+				requestDismiss();
 				return;
 			}
 
@@ -109,8 +110,11 @@ export const BackdropLayer = memo(function BackdropLayer({
 					animations,
 					targetProgress,
 					animationProgress,
-					onAnimationFinish: shouldDismiss ? dismissScreen : undefined,
 				});
+
+				if (shouldDismiss) {
+					scheduleOnRN(requestDismiss);
+				}
 			});
 		}
 	}, [
@@ -122,7 +126,7 @@ export const BackdropLayer = memo(function BackdropLayer({
 		rawSnapPoints,
 		canDismiss,
 		transitionSpec,
-		dismissScreen,
+		requestDismiss,
 		routeKey,
 	]);
 

package/src/components/screen-container/layers/content.tsx

@@ -1,17 +1,15 @@
-/** biome-ignore-all lint/style/noNonNullAssertion: <Screen gesture is under the gesture context, so this will always exist.> */
 import { type ComponentType, memo, useMemo } from "react";
 import { StyleSheet, View } from "react-native";
 import { GestureDetector } from "react-native-gesture-handler";
 import Animated from "react-native-reanimated";
 import { useDescriptorsStore } from "../../../providers/screen/descriptors";
-import { useGestureStore } from "../../../providers/screen/gestures";
+import { useScreenGestureStore } from "../../../providers/screen/gestures";
 import { useSlotProps, useSlotStyles } from "../../../providers/screen/styles";
 import type { ScreenContentComponentProps } from "../../../types";
 import { ScreenFallbackHost } from "../../boundary/portal/components/boundary-portal/components/host";
 import { useContentLayout } from "../hooks/use-content-layout";
 import { MaybeMaskedNavigationContainer } from "./maybe-masked-navigation-container";
 import { usesLayerRenderProps } from "./render-component";
-import { SurfaceContainer } from "./surface-container";
 
 type Props = {
 	children: React.ReactNode;
@@ -21,7 +19,7 @@ type Props = {
 
 export const ContentLayer = memo(
 	({ children, pointerEvents, isBackdropActive }: Props) => {
-		const gestureContext = useGestureStore();
+		const gestureContext = useScreenGestureStore();
 		const ContentComponent = useDescriptorsStore(
 			(store) => store.options.contentComponent,
 		);
@@ -57,21 +55,19 @@ export const ContentLayer = memo(
 				pointerEvents={contentPointerEvents}
 				enabled={isNavigationMaskEnabled}
 			>
-				<SurfaceContainer pointerEvents={contentPointerEvents}>
-					{hasAutoSnapPoint ? (
-						<View collapsable={false} onLayout={handleContentLayout}>
-							{children}
-						</View>
-					) : (
-						children
-					)}
-					<ScreenFallbackHost />
-				</SurfaceContainer>
+				{hasAutoSnapPoint ? (
+					<View collapsable={false} onLayout={handleContentLayout}>
+						{children}
+					</View>
+				) : (
+					children
+				)}
+				<ScreenFallbackHost />
 			</MaybeMaskedNavigationContainer>
 		);
 
 		return (
-			<GestureDetector gesture={gestureContext!.detectorGesture}>
+			<GestureDetector gesture={gestureContext.detectorGesture}>
 				{AnimatedContentComponent ? (
 					<AnimatedContentComponent
 						style={contentStyles}