react-native-screen-transitions 4.0.0-alpha.4 → 4.0.0-alpha.5

package/src/components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts

@@ -1,4 +1,4 @@
-import { useCallback, useLayoutEffect } from "react";
+import { useCallback, useLayoutEffect, useMemo } from "react";
 import {
 	cancelAnimation,
 	useAnimatedReaction,
@@ -7,6 +7,7 @@ import {
 	withTiming,
 } from "react-native-reanimated";
 import { scheduleOnUI } from "react-native-worklets";
+import { useStack } from "../../../../hooks/navigation/use-stack";
 import { useDescriptorsStore } from "../../../../providers/screen/descriptors";
 import { AnimationStore } from "../../../../stores/animation.store";
 import {
@@ -61,6 +62,16 @@ export const useInitialDestinationMeasurement = ({
 	const preferredSourceScreenKey = destinationPairKey
 		? getSourceScreenKeyFromPairKey(destinationPairKey)
 		: undefined;
+	const stackScenes = useStack((store) => store.scenes);
+	// A retained closing screen can still have registered boundaries, but it
+	// cannot own a new transition link.
+	const closingSourceScreenKeys = useMemo(
+		() =>
+			stackScenes
+				.filter((scene) => scene.activity === "closing")
+				.map((scene) => scene.route.key),
+		[stackScenes],
+	);
 	const progress = AnimationStore.getValue(
 		currentScreenKey,
 		"transitionProgress",
@@ -74,6 +85,7 @@ export const useInitialDestinationMeasurement = ({
 	const retryToken = useSharedValue(0);
 	const handshakeRetries = useSharedValue(0);
 	const hasGivenUp = useSharedValue(0);
+	const hasFinishedInitialMeasurement = useSharedValue(0);
 
 	const releaseLifecycleStartBlock = useCallback(() => {
 		"worklet";
@@ -83,19 +95,22 @@ export const useInitialDestinationMeasurement = ({
 			return;
 		}
 
+		hasFinishedInitialMeasurement.set(1);
 		isBlockingLifecycleStart.set(0);
 		unblockLifecycleStart();
-	}, [isBlockingLifecycleStart, retryToken, unblockLifecycleStart]);
+	}, [
+		hasFinishedInitialMeasurement,
+		isBlockingLifecycleStart,
+		retryToken,
+		unblockLifecycleStart,
+	]);
 
 	const claimLifecycleStartBlock = useCallback(() => {
 		"worklet";
 		if (
 			!canReceiveDestination ||
-			!getMatchingSourceScreenKey(
-				tag,
-				currentScreenKey,
-				preferredSourceScreenKey,
-			)
+			hasFinishedInitialMeasurement.get() ||
+			!getMatchingSourceScreenKey(tag, currentScreenKey)
 		) {
 			return;
 		}
@@ -113,9 +128,9 @@ export const useInitialDestinationMeasurement = ({
 		blockLifecycleStart,
 		canReceiveDestination,
 		currentScreenKey,
+		hasFinishedInitialMeasurement,
 		isBlockingLifecycleStart,
 		progress,
-		preferredSourceScreenKey,
 		tag,
 	]);
 
@@ -147,7 +162,11 @@ export const useInitialDestinationMeasurement = ({
 		() => {
 			"worklet";
 
-			if (!canReceiveDestination || isBlockingLifecycleStart.get() <= 0) {
+			if (
+				!canReceiveDestination ||
+				hasFinishedInitialMeasurement.get() ||
+				isBlockingLifecycleStart.get() <= 0
+			) {
 				return null;
 			}
 
@@ -160,6 +179,7 @@ export const useInitialDestinationMeasurement = ({
 				tag,
 				currentScreenKey,
 				preferredSourceScreenKey,
+				closingSourceScreenKeys,
 			);
 			const pairKey = sourceScreenKey
 				? createScreenPairKey(sourceScreenKey, currentScreenKey)
@@ -182,12 +202,12 @@ export const useInitialDestinationMeasurement = ({
 		},
 		(next, previous) => {
 			"worklet";
-			if (!next) {
+			if (!next || hasFinishedInitialMeasurement.get()) {
 				return;
 			}
 
 			const [measurePairKey, action, retryTick] = next;
-			if (!measurePairKey || !action) {
+			if (!action) {
 				return;
 			}
 
@@ -213,19 +233,20 @@ export const useInitialDestinationMeasurement = ({
 				return;
 			}
 
-			if (action === "measure") {
+			if (action === "measure" && measurePairKey) {
 				measureBoundary({
 					type: "destination",
 					pairKey: measurePairKey,
 				});
 			}
 
-			const link = getLink(measurePairKey, linkKey);
+			const link = measurePairKey ? getLink(measurePairKey, linkKey) : null;
 			const linkComplete = !!link?.source && !!link.destination;
 
 			if (linkComplete || action === "complete") {
 				cancelAnimation(retryToken);
 				handshakeRetries.set(0);
+				hasFinishedInitialMeasurement.set(1);
 				if (escapeClipping) {
 					// Screen-level escape has a second readiness phase after destination
 					// matching: the host must commit before the transition starts, or

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

@@ -16,7 +16,6 @@ import { getLink } from "../../../../../../stores/bounds/internals/links";
 import { SystemStore } from "../../../../../../stores/system.store";
 import type { ScrollMeasuredDimensions } from "../../../../utils/measured-bounds";
 import { NativePortalHost, PORTAL_POINTER_EVENTS } from "../../../teleport";
-import { hasLocalSlot } from "../helpers/has-local-slot";
 import { resolvePortalOffsetStyle } from "../helpers/offset-style";
 import { getPortalHostBounds } from "../stores/host-bounds.store";
 import type { ActivePortalBoundaryHost } from "../stores/portal-boundary-host.store";
@@ -44,11 +43,10 @@ export const PortalBoundaryHost = memo(function PortalBoundaryHost({
 		}
 
 		const link = getLink(host.pairKey, host.boundaryId);
-		const hasGeometry =
-			link?.source !== null &&
-			link !== undefined &&
-			getPortalHostBounds(host.hostKey) !== null &&
-			hasLocalSlot(host.localStylesMaps.get(), host.boundaryId);
+		const hasSource = !!link?.source;
+		const hasHostBounds = getPortalHostBounds(host.hostKey) !== null;
+		const hasSlot = host.slotsMap.get()[host.boundaryId] !== undefined;
+		const hasGeometry = hasSource && hasHostBounds && hasSlot;
 
 		if (!hasGeometry) {
 			geometryReadyFrames.set(0);
@@ -103,20 +101,6 @@ export const PortalBoundaryHost = memo(function PortalBoundaryHost({
 	});
 	const slotStyle = useAnimatedStyle(() => {
 		"worklet";
-		// `slotsMap` is the resolved map: it may contain real interpolator output,
-		// inherited styles, or resolver-created reset patches for slots that just
-		// disappeared. Normal components need those reset patches so stale styles
-		// clear correctly.
-		//
-		// A screen-level portal host is different. It is only the temporary visual
-		// receiver for teleported content, not the original component that needs a
-		// cleanup frame. If the current local interpolator layers did not emit this
-		// boundary id, any resolved style here is cleanup/stale residue and should
-		// not be drawn by the host.
-		if (!hasLocalSlot(host.localStylesMaps.get(), host.boundaryId)) {
-			return NO_STYLES;
-		}
-
 		const slot = host.slotsMap.get()[host.boundaryId];
 
 		return composeSlotStyleWithLocalTransform(

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

@@ -1,12 +1,10 @@
 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 { getPairKeyForSource } from "../../../../../../stores/bounds/internals/links";
 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,
@@ -16,62 +14,57 @@ type UseActivePortalBoundaryHostParams = {
 	boundaryId: string;
 	currentScreenKey: string;
 	escapeHostKey?: string;
-	localStylesMaps: SharedValue<LocalStyleLayers>;
 	portalHostName: SharedValue<string | null>;
 	portalHostReady: SharedValue<boolean>;
 	slotsMap: SharedValue<NormalizedTransitionInterpolatedStyle>;
-	sourcePairKey?: ScreenPairKey;
+};
+
+type ActivePortal = {
+	pairKey: 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 [activePortal, setActivePortal] = useState<ActivePortal | null>(null);
+	const activePairKeyRef = useRef<ScreenPairKey | null>(null);
 
-	const updateActiveLink = useCallback(
-		(
-			observedSourcePairKey: ScreenPairKey | undefined,
-			nextHasActiveLink: boolean,
-		) => {
-			if (sourcePairKeyRef.current !== observedSourcePairKey) {
-				return;
-			}
+	const updateActivePortal = useCallback((pairKey: ScreenPairKey | null) => {
+		if (activePairKeyRef.current === pairKey) {
+			return;
+		}
 
-			setHasActiveLink(nextHasActiveLink);
-		},
-		[],
-	);
+		activePairKeyRef.current = pairKey;
+		setActivePortal(pairKey ? { pairKey } : null);
+	}, []);
 
 	useAnimatedReaction(
 		() => {
 			"worklet";
-			return hasActiveBoundaryPortalLink({
-				boundaryId,
-				pairsState: pairs.get(),
-				sourcePairKey,
-			});
+			const isBoundaryAnimating = slotsMap.get()[boundaryId] !== undefined;
+			if (!isBoundaryAnimating) {
+				return null;
+			}
+
+			return getPairKeyForSource(boundaryId, currentScreenKey);
 		},
-		(nextHasActiveLink, previousHasActiveLink) => {
+		(pairKey, previousPairKey) => {
 			"worklet";
-			if (nextHasActiveLink === previousHasActiveLink) {
+			if (pairKey === previousPairKey) {
 				return;
 			}
 
-			scheduleOnRN(updateActiveLink, sourcePairKey, nextHasActiveLink);
+			scheduleOnRN(updateActivePortal, pairKey);
 		},
 	);
 
 	useLayoutEffect(() => {
-		if (!hasActiveLink || !sourcePairKey || !escapeHostKey) {
+		if (!activePortal || !escapeHostKey) {
 			portalHostName.set(null);
 			portalHostReady.set(false);
 			return;
@@ -80,14 +73,13 @@ export const useActivePortalBoundaryHost = ({
 		const nextPortalHostName = createBoundaryPortalHostName(
 			escapeHostKey,
 			boundaryId,
-			sourcePairKey,
+			activePortal.pairKey,
 		);
 
 		mountPortalBoundaryHost({
 			boundaryId,
 			hostKey: escapeHostKey,
-			localStylesMaps,
-			pairKey: sourcePairKey,
+			pairKey: activePortal.pairKey,
 			portalHostName: nextPortalHostName,
 			portalHostReady,
 			screenKey: currentScreenKey,
@@ -101,14 +93,12 @@ export const useActivePortalBoundaryHost = ({
 			unmountPortalBoundaryHostByName(nextPortalHostName);
 		};
 	}, [
+		activePortal,
 		boundaryId,
 		currentScreenKey,
 		escapeHostKey,
-		localStylesMaps,
 		portalHostName,
 		portalHostReady,
-		sourcePairKey,
 		slotsMap,
-		hasActiveLink,
 	]);
 };

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

@@ -1,17 +1,8 @@
-import {
-	type SharedValue,
-	useAnimatedProps,
-	useSharedValue,
-} from "react-native-reanimated";
+import { useAnimatedProps, useSharedValue } from "react-native-reanimated";
 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 { 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 { hasActiveBoundaryPortalLink } from "../helpers/active-pair";
 import { useActiveHostKey } from "../stores/host-registry.store";
 import { useActivePortalBoundaryHost } from "./use-active-portal-boundary-host";
 
@@ -19,42 +10,23 @@ interface UseBoundaryPortalAttachmentParams {
 	boundaryId: string;
 }
 
-type AttachedDestination = {
-	animationProgress: SharedValue<number>;
-	closing: SharedValue<number>;
-};
-
 export const useBoundaryPortalAttachment = ({
 	boundaryId,
 }: UseBoundaryPortalAttachmentParams) => {
-	const sourcePairKey = useDescriptorsStore((s) => s.derivations.sourcePairKey);
 	const currentScreenKey = useDescriptorsStore(
 		(s) => s.derivations.currentScreenKey,
 	);
-	const nextScreenKey = useDescriptorsStore((s) => s.derivations.nextScreenKey);
-	const destinationScreenKey = nextScreenKey ?? currentScreenKey;
-	const destinationAnimationProgress = SystemStore.getValue(
-		destinationScreenKey,
-		"animationProgress",
-	);
-	const destinationClosing = AnimationStore.getValue(
-		destinationScreenKey,
-		"closing",
-	);
-	const { localStylesMaps, slotsMap } = useScreenSlots();
+	const { slotsMap } = useScreenSlots();
 	const portalHostName = useSharedValue<string | null>(null);
 	const portalHostReady = useSharedValue(false);
-	const attachedDestination = useSharedValue<AttachedDestination | null>(null);
 	const escapeHostKey = useActiveHostKey(currentScreenKey);
 
 	useActivePortalBoundaryHost({
 		boundaryId,
 		currentScreenKey,
 		escapeHostKey,
-		localStylesMaps,
 		portalHostName,
 		portalHostReady,
-		sourcePairKey,
 		slotsMap,
 	});
 
@@ -67,36 +39,17 @@ export const useBoundaryPortalAttachment = ({
 			teleport,
 			...slotProps
 		} = slot?.props ?? {};
-		const shouldTeleport = isTeleportEnabled(teleport);
-		const hostName = portalHostName.get();
-		const hasActiveLink = hasActiveBoundaryPortalLink({
-			boundaryId,
-			pairsState: pairs.get(),
-			sourcePairKey,
-		});
-		const hasAttachableHost =
-			shouldTeleport && hasActiveLink && portalHostReady.get() && hostName;
-
-		if (hasAttachableHost) {
-			attachedDestination.set({
-				animationProgress: destinationAnimationProgress,
-				closing: destinationClosing,
-			});
-		}
-
-		const attached = attachedDestination.get();
-		const hasAttachedCloseFinished =
-			attached !== null &&
-			hasCloseTransitionFinished({
-				animationProgress: attached.animationProgress.get(),
-				closing: attached.closing.get(),
-			});
-		const canAttach = hasAttachableHost && !hasAttachedCloseFinished;
-		const targetHostName = canAttach ? hostName : PORTAL_HOST_NAME_RESET_VALUE;
+		const shouldAttach =
+			slot !== undefined &&
+			isTeleportEnabled(teleport) &&
+			portalHostReady.get();
+		const hostName = shouldAttach
+			? portalHostName.get()
+			: PORTAL_HOST_NAME_RESET_VALUE;
 
 		return {
 			...slotProps,
-			hostName: targetHostName,
+			hostName,
 		};
 	});
 

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

@@ -16,7 +16,6 @@ import { getVisibilityBlockOffset } from "../../../../../../utils/visibility-blo
 import {
 	adjustedMeasuredBoundsForOverscrollDeltas,
 	correctMeasuredBoundsForVisibilityGate,
-	isMeasurementInViewport,
 } from "../../../../utils/measured-bounds";
 import {
 	clearPortalHostBounds,
@@ -102,13 +101,7 @@ export const useHostMeasurement = ({
 				viewportHeight,
 			});
 
-			if (
-				!isMeasurementInViewport(
-					correctedMeasured,
-					viewportWidth,
-					viewportHeight,
-				)
-			) {
+			if (correctedMeasured.width <= 0 || correctedMeasured.height <= 0) {
 				cancelAnimation(retryToken);
 				retryToken.set(
 					withDelay(

package/src/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts

@@ -1,12 +1,10 @@
 import { useSyncExternalStore } from "react";
 import type { SharedValue } from "react-native-reanimated";
-import type { LocalStyleLayers } from "../../../../../../providers/screen/styles/helpers/resolve-slot-styles";
 import type { NormalizedTransitionInterpolatedStyle } from "../../../../../../types/animation.types";
 
 export type ActivePortalBoundaryHost = {
 	boundaryId: string;
 	hostKey: string;
-	localStylesMaps: SharedValue<LocalStyleLayers>;
 	pairKey: string;
 	portalHostName: string;
 	portalHostReady: SharedValue<boolean>;
@@ -56,7 +54,6 @@ const isSameHost = (
 	return (
 		a.boundaryId === b.boundaryId &&
 		a.hostKey === b.hostKey &&
-		a.localStylesMaps === b.localStylesMaps &&
 		a.pairKey === b.pairKey &&
 		a.portalHostName === b.portalHostName &&
 		a.portalHostReady === b.portalHostReady &&

package/src/components/boundary/utils/destination-signals.ts

@@ -14,7 +14,7 @@ export type InitialDestinationMeasurementAction =
 	| "complete";
 
 export type InitialDestinationMeasurementSignal = {
-	pairKey: ScreenPairKey;
+	pairKey: ScreenPairKey | null;
 	action: InitialDestinationMeasurementAction;
 };
 
@@ -37,10 +37,14 @@ export const getInitialDestinationMeasurementSignal = (params: {
 		sourcePresent,
 		linkState,
 	} = params;
-	if (!enabled || !pairKey) {
+	if (!enabled) {
 		return null;
 	}
 
+	if (!pairKey) {
+		return { pairKey: null, action: "wait" };
+	}
+
 	if (!destinationPresent) {
 		return { pairKey, action: "wait" };
 	}

package/src/providers/screen/styles/helpers/resolve-interpolator-style-handoff.ts

@@ -81,18 +81,18 @@ const mergeSlots = (
 	return merged;
 };
 
-const composeFrozenAndLiveStyles = (
-	frozen: NormalizedTransitionInterpolatedStyle,
-	live: NormalizedTransitionInterpolatedStyle,
+const composeCurrentAndNextStyles = (
+	current: NormalizedTransitionInterpolatedStyle,
+	next: NormalizedTransitionInterpolatedStyle,
 ) => {
 	"worklet";
-	const composed: NormalizedTransitionInterpolatedStyle = { ...frozen };
+	const composed: NormalizedTransitionInterpolatedStyle = { ...current };
 
-	for (const slotId in live) {
-		const liveSlot = live[slotId];
+	for (const slotId in next) {
+		const nextSlot = next[slotId];
 
-		if (liveSlot) {
-			composed[slotId] = mergeSlots(frozen[slotId], liveSlot);
+		if (nextSlot) {
+			composed[slotId] = mergeSlots(current[slotId], nextSlot);
 		}
 	}
 
@@ -103,36 +103,36 @@ export const resolveInterpolatorStyleHandoff = ({
 	currentOwnsInterpolator,
 	currentStylesMap,
 	nextStylesMap,
-	frozenCurrentStylesMap,
 }: {
 	currentOwnsInterpolator: boolean;
 	currentStylesMap: NormalizedTransitionInterpolatedStyle | undefined;
 	nextStylesMap: NormalizedTransitionInterpolatedStyle | undefined;
-	frozenCurrentStylesMap: NormalizedTransitionInterpolatedStyle;
 }): {
 	localStylesMaps: LocalStyleLayers;
-	nextFrozenCurrentStylesMap: NormalizedTransitionInterpolatedStyle;
 } => {
 	"worklet";
 
 	if (currentOwnsInterpolator) {
 		return {
 			localStylesMaps: currentStylesMap ? [currentStylesMap] : [],
-			nextFrozenCurrentStylesMap: currentStylesMap ?? frozenCurrentStylesMap,
 		};
 	}
 
 	if (!nextStylesMap) {
 		return {
-			localStylesMaps: frozenCurrentStylesMap ? [frozenCurrentStylesMap] : [],
-			nextFrozenCurrentStylesMap: frozenCurrentStylesMap,
+			localStylesMaps: currentStylesMap ? [currentStylesMap] : [],
+		};
+	}
+
+	if (!currentStylesMap) {
+		return {
+			localStylesMaps: [nextStylesMap],
 		};
 	}
 
 	return {
 		localStylesMaps: [
-			composeFrozenAndLiveStyles(frozenCurrentStylesMap, nextStylesMap),
+			composeCurrentAndNextStyles(currentStylesMap, nextStylesMap),
 		],
-		nextFrozenCurrentStylesMap: frozenCurrentStylesMap,
 	};
 };

package/src/providers/screen/styles/hooks/use-interpolated-style-maps.tsx

@@ -125,10 +125,10 @@ const runInterpolator = ({
  * normal interpolator selection once the gesture-driven close is no longer in
  * play.
  *
- * At an ownership handoff, the last current-owner styles are frozen. The next
- * owner replaces matching scalar keys and composes its live transforms after
- * the frozen transforms. The previous interpolator is not evaluated again until
- * it regains ownership.
+ * At an ownership handoff, the current interpolator remains live but is
+ * evaluated without the next-screen relationship. The next owner replaces
+ * matching scalar keys and composes its live transforms after the current
+ * screen's self-owned transforms.
  */
 export const useInterpolatedStylesMap = ({
 	enabled,
@@ -177,8 +177,6 @@ export const useInterpolatedStylesMap = ({
 
 	const isGesturingDuringCloseAnimation = useSharedValue(false);
 	const initialDestinationStylesReady = useSharedValue(0);
-	const frozenCurrentStylesMap =
-		useSharedValue<NormalizedTransitionInterpolatedStyle>(NO_STYLES);
 	const shouldPrepareInitialDestinationStyles =
 		enabled && !!destinationPairKey && !nextScreenKey && !!currentInterpolator;
 
@@ -261,17 +259,21 @@ export const useInterpolatedStylesMap = ({
 			? "current"
 			: "next";
 
-		const selectedFrame = selectInterpolatorFrame(props, isInGestureMode);
-
-		const currentResult = currentOwnsInterpolator
-			? runInterpolator({
-					interpolator: currentInterpolator,
-					props,
-					selectedFrame,
-					bounds: boundsAccessor,
-					transition,
-				})
-			: undefined;
+		// Once the next interpolator owns the relationship, the current
+		// interpolator remains responsible only for its own live presentation.
+		// This preserves snap-point transforms without letting current-screen
+		// unfocus rules compete with the next screen's outgoing transition.
+		const currentSelectedFrame = selectInterpolatorFrame(
+			props,
+			isInGestureMode || !!nextInterpolator,
+		);
+		const currentResult = runInterpolator({
+			interpolator: currentInterpolator,
+			props,
+			selectedFrame: currentSelectedFrame,
+			bounds: boundsAccessor,
+			transition,
+		});
 
 		const initialDestinationStyleGate = resolveInitialDestinationStyleGate({
 			shouldPrepareStyles: shouldPrepareInitialDestinationStyles,
@@ -295,22 +297,18 @@ export const useInterpolatedStylesMap = ({
 				currentOwnsInterpolator: true,
 				currentStylesMap: currentResult?.stylesMap,
 				nextStylesMap: undefined,
-				frozenCurrentStylesMap: frozenCurrentStylesMap.get(),
 			});
 
-			if (handoff.nextFrozenCurrentStylesMap !== frozenCurrentStylesMap.get()) {
-				frozenCurrentStylesMap.set(handoff.nextFrozenCurrentStylesMap);
-			}
-
 			return handoff.localStylesMaps.length
 				? handoff.localStylesMaps
 				: NO_STYLE_LAYERS;
 		}
 
+		const nextSelectedFrame = selectInterpolatorFrame(props, false);
 		const nextResult = runInterpolator({
 			interpolator: nextInterpolator,
 			props,
-			selectedFrame,
+			selectedFrame: nextSelectedFrame,
 			bounds: boundsAccessor,
 			transition,
 		});
@@ -326,7 +324,6 @@ export const useInterpolatedStylesMap = ({
 			currentOwnsInterpolator: false,
 			currentStylesMap: currentResult?.stylesMap,
 			nextStylesMap: nextResult?.stylesMap,
-			frozenCurrentStylesMap: frozenCurrentStylesMap.get(),
 		});
 
 		return handoff.localStylesMaps.length