react-native-screen-transitions 4.0.0-alpha.2 → 4.0.0-alpha.3

package/src/components/boundary/portal/components/boundary-content-portal/hooks/use-boundary-content-portal-attachment.ts

@@ -1,52 +1,51 @@
-import {
-	type SharedValue,
-	useAnimatedProps,
-	useSharedValue,
-} from "react-native-reanimated";
+import { useAnimatedProps, useSharedValue } from "react-native-reanimated";
+import { useStack } from "../../../../../../hooks/navigation/use-stack";
 import { useDescriptorsStore } from "../../../../../../providers/screen/descriptors";
 import { useScreenSlots } from "../../../../../../providers/screen/styles";
 import { hasCloseTransitionFinished } from "../../../../../../providers/screen/styles/helpers/transition-visual-state";
 import { AnimationStore } from "../../../../../../stores/animation.store";
+import { getLinkKeyFromTag } from "../../../../../../stores/bounds/helpers/link-pairs.helpers";
+import { getEntry } from "../../../../../../stores/bounds/internals/entries";
 import { pairs } from "../../../../../../stores/bounds/internals/state";
 import { SystemStore } from "../../../../../../stores/system.store";
-import { resolveEnteringHandoffTarget } from "../../../utils/handoff-target";
 import { PORTAL_HOST_NAME_RESET_VALUE } from "../../../utils/naming";
 import { isTeleportEnabled } from "../../../utils/teleport-control";
+import {
+	resolveActiveHandoffReceiver,
+	resolveHandoffAttachmentCandidate,
+	resolvePreviousHandoffReceiver,
+} from "../helpers/active-handoff-receiver";
 import { createBoundaryContentPortalHostName } from "../helpers/host-name";
 
 interface UseBoundaryContentPortalAttachmentParams {
 	boundaryId: string;
 }
 
-type AttachedDestination = {
-	animationProgress: SharedValue<number>;
-	closing: SharedValue<number>;
-	screenKey: string;
-};
-
 export const useBoundaryContentPortalAttachment = ({
 	boundaryId,
 }: UseBoundaryContentPortalAttachmentParams) => {
-	const { slotsMap } = useScreenSlots();
-	const sourcePairKey = useDescriptorsStore((s) => s.derivations.sourcePairKey);
+	const { nextInterpolatorReady, slotsMap } = useScreenSlots();
+
 	const currentScreenKey = useDescriptorsStore(
 		(s) => s.derivations.currentScreenKey,
 	);
-	const nextScreenKey = useDescriptorsStore((s) => s.derivations.nextScreenKey);
-	const destinationScreenKey = nextScreenKey ?? currentScreenKey;
-	const destinationAnimationProgress = SystemStore.getValue(
-		destinationScreenKey,
+	const sourcePairKey = useDescriptorsStore((s) => s.derivations.sourcePairKey);
+
+	const activeReceiverScreenKey = useStack(resolveActiveHandoffReceiver);
+	const previousReceiverScreenKey = useStack(resolvePreviousHandoffReceiver);
+
+	const activeReceiverAnimationProgress = SystemStore.getValue(
+		activeReceiverScreenKey ?? currentScreenKey,
 		"animationProgress",
 	);
-	const destinationClosing = AnimationStore.getValue(
-		destinationScreenKey,
+
+	const activeReceiverClosing = AnimationStore.getValue(
+		activeReceiverScreenKey ?? currentScreenKey,
 		"closing",
 	);
 
-	// `nextScreenKey` can change while the previously attached destination is
-	// still closing. Retain that destination's lifecycle shared values so this
-	// payload follows the screen that actually hosts it, not the newest route.
-	const attachedDestination = useSharedValue<AttachedDestination | null>(null);
+	const attachedReceiverScreenKey = useSharedValue(currentScreenKey);
+	const sourcePairBeforeClose = useSharedValue<string | null>(null);
 
 	const teleportProps = useAnimatedProps(() => {
 		"worklet";
@@ -58,49 +57,75 @@ export const useBoundaryContentPortalAttachment = ({
 			...slotProps
 		} = slot?.props ?? {};
 
-		const animationProgress = destinationAnimationProgress.get();
 		const shouldTeleport = isTeleportEnabled(teleport);
-		const pairsState = pairs.get();
-
-		const enteringTargetScreenKey = shouldTeleport
-			? resolveEnteringHandoffTarget({
-					animationProgress,
-					boundaryId,
-					currentScreenKey,
-					pairsState,
-					sourcePairKey,
-				})
-			: null;
+		const closing = activeReceiverClosing.get();
+		const animationProgress = activeReceiverAnimationProgress.get();
 
-		if (enteringTargetScreenKey) {
-			// A valid entering pair is the only event that replaces the current
-			// attachment and its lifecycle owner.
-			attachedDestination.set({
-				animationProgress: destinationAnimationProgress,
-				closing: destinationClosing,
-				screenKey: enteringTargetScreenKey,
-			});
+		if (!closing) {
+			sourcePairBeforeClose.set(sourcePairKey ?? null);
 		}
 
-		const attached = attachedDestination.get();
-		const hasAttachedCloseFinished =
-			attached !== null &&
-			hasCloseTransitionFinished({
-				animationProgress: attached.animationProgress.get(),
-				closing: attached.closing.get(),
-			});
-
-		// Missing or changing pairs do not imply a return: keep the current host
-		// until its own screen visually closes. At that point, target the source
-		// host explicitly instead of `null` so Teleport restores source dimensions.
-		const targetScreenKey = enteringTargetScreenKey
-			? enteringTargetScreenKey
-			: shouldTeleport
-				? hasAttachedCloseFinished
-					? currentScreenKey
-					: (attached?.screenKey ?? null)
+		const pairChangedDuringClose =
+			!!closing &&
+			!!sourcePairKey &&
+			sourcePairKey !== sourcePairBeforeClose.get();
+
+		const hasActiveCloseFinished = hasCloseTransitionFinished({
+			closing,
+			animationProgress,
+		});
+
+		const pair = sourcePairKey ? pairs.get()[sourcePairKey] : null;
+		const link = pair?.links[getLinkKeyFromTag(boundaryId)];
+
+		const pairDestination =
+			link?.status === "complete" &&
+			(!link.group ||
+				pair?.groups[link.group]?.activeId === getLinkKeyFromTag(boundaryId))
+				? link.destination.screenKey
 				: null;
 
+		const interpolatorReady = nextInterpolatorReady.get();
+		const attachedScreenKey = attachedReceiverScreenKey.get();
+
+		const nextReceiverScreenKey = resolveHandoffAttachmentCandidate({
+			activeReceiverClosing: !!closing,
+			activeReceiverScreenKey,
+			attachedReceiverScreenKey: attachedScreenKey,
+			hasActiveCloseFinished,
+			interpolatorReady: !!interpolatorReady,
+			pairChangedDuringClose,
+			pairDestinationScreenKey: pairDestination,
+			previousReceiverScreenKey,
+		});
+
+		const receiverEntry = nextReceiverScreenKey
+			? getEntry(boundaryId, nextReceiverScreenKey)
+			: null;
+
+		const receiverReady = receiverEntry?.handoff === true;
+
+		const returningFromActiveClose =
+			hasActiveCloseFinished && attachedScreenKey === activeReceiverScreenKey;
+
+		const activatingPairDestination =
+			!!pairDestination &&
+			!!interpolatorReady &&
+			nextReceiverScreenKey === pairDestination;
+
+		const canActivateReceiver =
+			returningFromActiveClose ||
+			activatingPairDestination ||
+			animationProgress > 0;
+
+		if (nextReceiverScreenKey && receiverReady && canActivateReceiver) {
+			attachedReceiverScreenKey.set(nextReceiverScreenKey);
+		}
+
+		const targetScreenKey = shouldTeleport
+			? attachedReceiverScreenKey.get()
+			: null;
+
 		const targetHostName = targetScreenKey
 			? createBoundaryContentPortalHostName(targetScreenKey, boundaryId)
 			: PORTAL_HOST_NAME_RESET_VALUE;

package/src/components/boundary/portal/components/boundary-portal/components/host.tsx

@@ -62,20 +62,18 @@ function HostImpl({ fallback = false, style }: HostImplProps) {
 		};
 	}, [fallback, hostKey, screenKey]);
 
-	const boundaryHosts = measurement.canRenderHosts
-		? activeBoundaryHosts.map((host) => (
-				<View
-					key={host.portalHostName}
-					pointerEvents={PORTAL_POINTER_EVENTS}
-					style={[
-						styles.boundaryHostViewport,
-						{ width: viewportWidth, height: viewportHeight },
-					]}
-				>
-					<PortalBoundaryHost host={host} style={StyleSheet.absoluteFill} />
-				</View>
-			))
-		: null;
+	const boundaryHosts = activeBoundaryHosts.map((host) => (
+		<View
+			key={host.portalHostName}
+			pointerEvents={PORTAL_POINTER_EVENTS}
+			style={[
+				styles.boundaryHostViewport,
+				{ width: viewportWidth, height: viewportHeight },
+			]}
+		>
+			<PortalBoundaryHost host={host} style={StyleSheet.absoluteFill} />
+		</View>
+	));
 
 	return (
 		<Animated.View

package/src/components/boundary/portal/components/boundary-portal/helpers/active-pair.ts

@@ -0,0 +1,36 @@
+import { getLinkKeyFromTag } from "../../../../../../stores/bounds/helpers/link-pairs.helpers";
+import type {
+	LinkPairsState,
+	ScreenPairKey,
+} from "../../../../../../stores/bounds/types";
+
+type HasActiveBoundaryPortalLinkParams = {
+	boundaryId: string;
+	pairsState: LinkPairsState;
+	sourcePairKey?: ScreenPairKey;
+};
+
+export const hasActiveBoundaryPortalLink = ({
+	boundaryId,
+	pairsState,
+	sourcePairKey,
+}: HasActiveBoundaryPortalLinkParams): boolean => {
+	"worklet";
+	if (!sourcePairKey) {
+		return false;
+	}
+
+	const pair = pairsState[sourcePairKey];
+	const linkKey = getLinkKeyFromTag(boundaryId);
+	const link = pair?.links[linkKey];
+
+	if (!link?.source) {
+		return false;
+	}
+
+	if (link.group && pair.groups[link.group]?.activeId !== linkKey) {
+		return false;
+	}
+
+	return true;
+};

package/src/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts

@@ -0,0 +1,114 @@
+import { useCallback, useLayoutEffect, useRef, useState } from "react";
+import { type SharedValue, useAnimatedReaction } from "react-native-reanimated";
+import { scheduleOnRN } from "react-native-worklets";
+import type { LocalStyleLayers } from "../../../../../../providers/screen/styles/helpers/resolve-slot-styles";
+import { pairs } from "../../../../../../stores/bounds/internals/state";
+import type { ScreenPairKey } from "../../../../../../stores/bounds/types";
+import type { NormalizedTransitionInterpolatedStyle } from "../../../../../../types/animation.types";
+import { createBoundaryPortalHostName } from "../../../utils/naming";
+import { hasActiveBoundaryPortalLink } from "../helpers/active-pair";
+import {
+	mountPortalBoundaryHost,
+	unmountPortalBoundaryHostByName,
+} from "../stores/portal-boundary-host.store";
+
+type UseActivePortalBoundaryHostParams = {
+	boundaryId: string;
+	currentScreenKey: string;
+	escapeHostKey?: string;
+	localStylesMaps: SharedValue<LocalStyleLayers>;
+	portalHostName: SharedValue<string | null>;
+	portalHostReady: SharedValue<boolean>;
+	slotsMap: SharedValue<NormalizedTransitionInterpolatedStyle>;
+	sourcePairKey?: ScreenPairKey;
+};
+
+export const useActivePortalBoundaryHost = ({
+	boundaryId,
+	currentScreenKey,
+	escapeHostKey,
+	localStylesMaps,
+	portalHostName,
+	portalHostReady,
+	slotsMap,
+	sourcePairKey,
+}: UseActivePortalBoundaryHostParams) => {
+	const [hasActiveLink, setHasActiveLink] = useState(false);
+	const sourcePairKeyRef = useRef(sourcePairKey);
+	sourcePairKeyRef.current = sourcePairKey;
+
+	const updateActiveLink = useCallback(
+		(
+			observedSourcePairKey: ScreenPairKey | undefined,
+			nextHasActiveLink: boolean,
+		) => {
+			if (sourcePairKeyRef.current !== observedSourcePairKey) {
+				return;
+			}
+
+			setHasActiveLink(nextHasActiveLink);
+		},
+		[],
+	);
+
+	useAnimatedReaction(
+		() => {
+			"worklet";
+			return hasActiveBoundaryPortalLink({
+				boundaryId,
+				pairsState: pairs.get(),
+				sourcePairKey,
+			});
+		},
+		(nextHasActiveLink, previousHasActiveLink) => {
+			"worklet";
+			if (nextHasActiveLink === previousHasActiveLink) {
+				return;
+			}
+
+			scheduleOnRN(updateActiveLink, sourcePairKey, nextHasActiveLink);
+		},
+	);
+
+	useLayoutEffect(() => {
+		if (!hasActiveLink || !sourcePairKey || !escapeHostKey) {
+			portalHostName.set(null);
+			portalHostReady.set(false);
+			return;
+		}
+
+		const nextPortalHostName = createBoundaryPortalHostName(
+			escapeHostKey,
+			boundaryId,
+			sourcePairKey,
+		);
+
+		mountPortalBoundaryHost({
+			boundaryId,
+			hostKey: escapeHostKey,
+			localStylesMaps,
+			pairKey: sourcePairKey,
+			portalHostName: nextPortalHostName,
+			portalHostReady,
+			screenKey: currentScreenKey,
+			slotsMap,
+		});
+		portalHostName.set(nextPortalHostName);
+
+		return () => {
+			portalHostName.set(null);
+			portalHostReady.set(false);
+			unmountPortalBoundaryHostByName(nextPortalHostName);
+		};
+	}, [
+		boundaryId,
+		currentScreenKey,
+		escapeHostKey,
+		localStylesMaps,
+		portalHostName,
+		portalHostReady,
+		sourcePairKey,
+		slotsMap,
+		hasActiveLink,
+	]);
+};

package/src/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts

@@ -1,4 +1,3 @@
-import { useLayoutEffect } from "react";
 import {
 	type SharedValue,
 	useAnimatedProps,
@@ -8,17 +7,13 @@ import { useDescriptorsStore } from "../../../../../../providers/screen/descript
 import { useScreenSlots } from "../../../../../../providers/screen/styles";
 import { hasCloseTransitionFinished } from "../../../../../../providers/screen/styles/helpers/transition-visual-state";
 import { AnimationStore } from "../../../../../../stores/animation.store";
-import { getLinkKeyFromTag } from "../../../../../../stores/bounds/helpers/link-pairs.helpers";
 import { pairs } from "../../../../../../stores/bounds/internals/state";
 import { SystemStore } from "../../../../../../stores/system.store";
 import { PORTAL_HOST_NAME_RESET_VALUE } from "../../../utils/naming";
 import { isTeleportEnabled } from "../../../utils/teleport-control";
-import { createBoundaryPortalHostName } from "../helpers/host-name";
+import { hasActiveBoundaryPortalLink } from "../helpers/active-pair";
 import { useActiveHostKey } from "../stores/host-registry.store";
-import {
-	mountPortalBoundaryHost,
-	unmountPortalBoundaryHostByName,
-} from "../stores/portal-boundary-host.store";
+import { useActivePortalBoundaryHost } from "./use-active-portal-boundary-host";
 
 interface UseBoundaryPortalAttachmentParams {
 	boundaryId: string;
@@ -52,37 +47,7 @@ export const useBoundaryPortalAttachment = ({
 	const attachedDestination = useSharedValue<AttachedDestination | null>(null);
 	const escapeHostKey = useActiveHostKey(currentScreenKey);
 
-	useLayoutEffect(() => {
-		if (!sourcePairKey || !escapeHostKey) {
-			portalHostName.set(null);
-			portalHostReady.set(false);
-			return;
-		}
-
-		const nextPortalHostName = createBoundaryPortalHostName(
-			escapeHostKey,
-			boundaryId,
-			sourcePairKey,
-		);
-
-		mountPortalBoundaryHost({
-			boundaryId,
-			hostKey: escapeHostKey,
-			localStylesMaps,
-			pairKey: sourcePairKey,
-			portalHostName: nextPortalHostName,
-			portalHostReady,
-			screenKey: currentScreenKey,
-			slotsMap,
-		});
-		portalHostName.set(nextPortalHostName);
-
-		return () => {
-			portalHostName.set(null);
-			portalHostReady.set(false);
-			unmountPortalBoundaryHostByName(nextPortalHostName);
-		};
-	}, [
+	useActivePortalBoundaryHost({
 		boundaryId,
 		currentScreenKey,
 		escapeHostKey,
@@ -91,7 +56,7 @@ export const useBoundaryPortalAttachment = ({
 		portalHostReady,
 		sourcePairKey,
 		slotsMap,
-	]);
+	});
 
 	const teleportProps = useAnimatedProps(() => {
 		"worklet";
@@ -104,13 +69,11 @@ export const useBoundaryPortalAttachment = ({
 		} = slot?.props ?? {};
 		const shouldTeleport = isTeleportEnabled(teleport);
 		const hostName = portalHostName.get();
-		const pair = sourcePairKey ? pairs.get()[sourcePairKey] : undefined;
-		const linkKey = getLinkKeyFromTag(boundaryId);
-		const link = pair?.links[linkKey];
-		const hasActiveLink =
-			link?.source !== null &&
-			link !== undefined &&
-			(!link.group || pair?.groups[link.group]?.activeId === linkKey);
+		const hasActiveLink = hasActiveBoundaryPortalLink({
+			boundaryId,
+			pairsState: pairs.get(),
+			sourcePairKey,
+		});
 		const hasAttachableHost =
 			shouldTeleport && hasActiveLink && portalHostReady.get() && hostName;
 

package/src/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts

@@ -1,4 +1,4 @@
-import { useLayoutEffect, useState } from "react";
+import { useLayoutEffect } from "react";
 import type { View } from "react-native";
 import {
 	cancelAnimation,
@@ -10,14 +10,13 @@ import {
 	withDelay,
 	withTiming,
 } from "react-native-reanimated";
-import { scheduleOnRN, scheduleOnUI } from "react-native-worklets";
-import { useOriginContext } from "../../../../../../providers/screen/origin.provider";
+import { scheduleOnUI } from "react-native-worklets";
 import { ScrollStore } from "../../../../../../stores/scroll.store";
 import { getVisibilityBlockOffset } from "../../../../../../utils/visibility-block-offset";
 import {
 	adjustedMeasuredBoundsForOverscrollDeltas,
+	correctMeasuredBoundsForVisibilityGate,
 	isMeasurementInViewport,
-	normalizeMeasuredBoundsWithVisibilityGate,
 } from "../../../../utils/measured-bounds";
 import {
 	clearPortalHostBounds,
@@ -47,8 +46,6 @@ export const useHostMeasurement = ({
 }: UseHostMeasurementParams) => {
 	const hostRef = useAnimatedRef<View>();
 	const scrollMetadata = ScrollStore.getValue(screenKey, "metadata");
-	const [canRenderHosts, setCanRenderHosts] = useState<boolean>(false);
-	const { originRef } = useOriginContext();
 	const hasMeasuredHost = useSharedValue(false);
 	const retryToken = useSharedValue(0);
 
@@ -75,9 +72,8 @@ export const useHostMeasurement = ({
 			}
 
 			const measured = measure(hostRef);
-			const measuredOrigin = measure(originRef);
 
-			if (!measured || !measuredOrigin) {
+			if (!measured) {
 				cancelAnimation(retryToken);
 				retryToken.set(
 					withDelay(
@@ -89,7 +85,6 @@ export const useHostMeasurement = ({
 			}
 
 			cancelAnimation(retryToken);
-			hasMeasuredHost.set(true);
 
 			// A measurement taken mid rubber-band would bake the transient
 			// overscroll displacement into the host frame. Store the at-rest
@@ -99,9 +94,8 @@ export const useHostMeasurement = ({
 				? adjustedMeasuredBoundsForOverscrollDeltas(measured, currentScroll)
 				: measured;
 
-			const normalizedMeasured = normalizeMeasuredBoundsWithVisibilityGate({
+			const correctedMeasured = correctMeasuredBoundsForVisibilityGate({
 				measured: overscrollNormalized,
-				origin: measuredOrigin,
 				visibilityBlocked: visibilityBlocked.get(),
 				visibilityBlockOffset: getVisibilityBlockOffset(viewportHeight),
 				viewportWidth,
@@ -110,7 +104,7 @@ export const useHostMeasurement = ({
 
 			if (
 				!isMeasurementInViewport(
-					normalizedMeasured,
+					correctedMeasured,
 					viewportWidth,
 					viewportHeight,
 				)
@@ -126,16 +120,16 @@ export const useHostMeasurement = ({
 			}
 
 			setPortalHostBounds(hostKey, {
-				x: normalizedMeasured.x,
-				y: normalizedMeasured.y,
-				width: normalizedMeasured.width,
-				height: normalizedMeasured.height,
-				pageX: normalizedMeasured.pageX,
-				pageY: normalizedMeasured.pageY,
+				x: correctedMeasured.x,
+				y: correctedMeasured.y,
+				width: correctedMeasured.width,
+				height: correctedMeasured.height,
+				pageX: correctedMeasured.pageX,
+				pageY: correctedMeasured.pageY,
 				scroll: capturesScroll ? currentScroll : null,
 			});
 
-			scheduleOnRN(setCanRenderHosts, true);
+			hasMeasuredHost.set(true);
 		},
 	);
 
@@ -146,7 +140,6 @@ export const useHostMeasurement = ({
 	}, [hostKey]);
 
 	return {
-		canRenderHosts,
 		hostRef,
 	};
 };

package/src/components/boundary/portal/utils/naming.ts

@@ -1 +1,12 @@
+const BOUNDARY_PORTAL_HOST_NAME_SUFFIX = "-portal-host";
+
+export const createBoundaryPortalHostName = (
+	hostKey: string,
+	boundaryId: string,
+	pairKey?: string | null,
+) => {
+	"worklet";
+	return `${hostKey}-${pairKey ? `${pairKey}-` : ""}${boundaryId}${BOUNDARY_PORTAL_HOST_NAME_SUFFIX}`;
+};
+
 export const PORTAL_HOST_NAME_RESET_VALUE = null;

package/src/components/boundary/providers/boundary-root.provider.tsx

@@ -14,6 +14,7 @@ import {
 	useComposedSlotStyles,
 	useSlotStackingStyles,
 } from "../../../providers/screen/styles";
+import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
 import { createBoundTag } from "../../../stores/bounds/helpers/link-pairs.helpers";
 import type { BoundTag } from "../../../stores/bounds/types";
 import createProvider from "../../../utils/create-provider";
@@ -64,14 +65,10 @@ type BoundaryRootProviderProps = Pick<
 	targetStyle?: unknown;
 };
 
-export const {
-	BoundaryRootProvider,
-	useBoundaryRootContext,
-	useBoundaryRootStore,
-} = createProvider("BoundaryRoot", { guarded: false })<
-	BoundaryRootProviderProps,
-	BoundaryRootContextValue
->(
+export const { BoundaryRootProvider, useBoundaryRootStore } = createProvider(
+	"BoundaryRoot",
+	{ guarded: false },
+)<BoundaryRootProviderProps, BoundaryRootContextValue>(
 	({
 		children,
 		config,
@@ -98,12 +95,12 @@ export const {
 		const currentScreenKey = useDescriptorsStore(
 			(s) => s.derivations.currentScreenKey,
 		);
-		const currentActivity = useDescriptorsStore(
-			(s) => s.descriptors.current.activity,
+		const isCurrentScreenClosing = useBlankStackStore(
+			(store) => store?.scenesByKey[currentScreenKey]?.activity === "closing",
 		);
 		const retainedBoundTagRef = useRef(requestedBoundTag);
 		const shouldRetainClosingBoundTag =
-			portalRuntime.handoff && currentActivity === "closing";
+			portalRuntime.handoff && isCurrentScreenClosing;
 
 		// Navigation can update a retained closing route's params before that
 		// route leaves the stack. Keep its handoff identity stable so the payload