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

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

@@ -31,8 +31,6 @@ export const getRefreshBoundarySignal = (params: {
 	currentScreenKey: string;
 	sourcePairKey?: ScreenPairKey;
 	destinationPairKey?: ScreenPairKey;
-	ancestorDestinationPairKey?: ScreenPairKey;
-	nextScreenKey?: string;
 	linkId: string;
 	group?: string;
 	shouldRefresh: boolean;
@@ -45,8 +43,6 @@ export const getRefreshBoundarySignal = (params: {
 		currentScreenKey,
 		sourcePairKey,
 		destinationPairKey,
-		ancestorDestinationPairKey,
-		nextScreenKey,
 		linkId,
 		group,
 		shouldRefresh,
@@ -79,9 +75,7 @@ export const getRefreshBoundarySignal = (params: {
 			);
 		}
 
-		const refreshDestinationPairKey =
-			destinationPairKey ??
-			(nextScreenKey ? undefined : ancestorDestinationPairKey);
+		const refreshDestinationPairKey = destinationPairKey;
 
 		if (!refreshDestinationPairKey) {
 			return null;
@@ -114,9 +108,7 @@ export const getRefreshBoundarySignal = (params: {
 		);
 	}
 
-	const refreshDestinationPairKey =
-		destinationPairKey ??
-		(nextScreenKey ? undefined : ancestorDestinationPairKey);
+	const refreshDestinationPairKey = destinationPairKey;
 
 	if (!refreshDestinationPairKey) return null;
 

package/src/providers/screen/descriptors/descriptors.provider.tsx

@@ -6,7 +6,7 @@ import type { BaseStackDescriptor } from "../../../types/stack.types";
 import createProvider from "../../../utils/create-provider";
 import type { DescriptorDerivations } from "./helpers/derive-descriptor-derivations";
 import { deriveDescriptorDerivations } from "./helpers/derive-descriptor-derivations";
-import { getAncestorKeyState } from "./helpers/get-ancestor-keys";
+import { getAncestorKeys } from "./helpers/get-ancestor-keys";
 
 /**
  * Base descriptor interface - minimal contract for all stack types.
@@ -84,8 +84,8 @@ export const { DescriptorsProvider, useDescriptorsStore } = createProvider(
 			[resolvedPrevious, resolvedCurrent, resolvedNext],
 		);
 
-		const { ancestorKeys, ancestorDestinationPairKey } = useMemo(
-			() => getAncestorKeyState(resolvedCurrent),
+		const ancestorKeys = useMemo(
+			() => getAncestorKeys(resolvedCurrent),
 			[resolvedCurrent],
 		);
 
@@ -96,15 +96,8 @@ export const { DescriptorsProvider, useDescriptorsStore } = createProvider(
 					current: resolvedCurrent,
 					next: resolvedNext,
 					ancestorKeys,
-					ancestorDestinationPairKey,
 				}),
-			[
-				resolvedPrevious,
-				resolvedCurrent,
-				resolvedNext,
-				ancestorKeys,
-				ancestorDestinationPairKey,
-			],
+			[resolvedPrevious, resolvedCurrent, resolvedNext, ancestorKeys],
 		);
 
 		return {

package/src/providers/screen/descriptors/helpers/derive-descriptor-derivations.ts

@@ -8,7 +8,6 @@ export interface DescriptorDerivations {
 	nextScreenKey?: string;
 	sourcePairKey?: ScreenPairKey;
 	destinationPairKey?: ScreenPairKey;
-	ancestorDestinationPairKey?: ScreenPairKey;
 	parentScreenKey?: string;
 	isFirstKey: boolean;
 	isTopMostScreen: boolean;
@@ -21,7 +20,6 @@ interface Params {
 	current: BaseStackDescriptor;
 	next?: BaseStackDescriptor;
 	ancestorKeys: string[];
-	ancestorDestinationPairKey?: ScreenPairKey;
 }
 
 export function deriveDescriptorDerivations({
@@ -29,7 +27,6 @@ export function deriveDescriptorDerivations({
 	current,
 	next,
 	ancestorKeys,
-	ancestorDestinationPairKey,
 }: Params): DescriptorDerivations {
 	const previousScreenKey = previous?.route.key;
 	const currentScreenKey = current.route.key;
@@ -56,7 +53,6 @@ export function deriveDescriptorDerivations({
 		nextScreenKey,
 		sourcePairKey,
 		destinationPairKey,
-		ancestorDestinationPairKey,
 		parentScreenKey: ancestorKeys[0],
 		isFirstKey,
 		isTopMostScreen,

package/src/providers/screen/descriptors/helpers/get-ancestor-keys.ts

@@ -1,26 +1,14 @@
-import { createScreenPairKey } from "../../../../stores/bounds/helpers/link-pairs.helpers";
-import type { ScreenPairKey } from "../../../../stores/bounds/types";
 import type { BaseStackDescriptor } from "../../../../types/stack.types";
 
-export interface AncestorKeyState {
-	ancestorKeys: string[];
-	ancestorDestinationPairKey?: ScreenPairKey;
-}
-
 /**
  * Builds nested navigator ancestor keys from immediate parent to root.
- * The nearest ancestor destination pair lets child routes attach measurements
- * to the transition owned by the parent stack.
  */
-export function getAncestorKeyState(
-	current: BaseStackDescriptor,
-): AncestorKeyState {
+export function getAncestorKeys(current: BaseStackDescriptor): string[] {
 	const ancestors: string[] = [];
-	let ancestorDestinationPairKey: ScreenPairKey | undefined;
 	const nav = current.navigation as any;
 
 	if (typeof nav?.getParent !== "function") {
-		return { ancestorKeys: ancestors };
+		return ancestors;
 	}
 
 	let parent = nav.getParent();
@@ -31,25 +19,10 @@ export function getAncestorKeyState(
 			const focusedRoute = state.routes[state.index];
 			if (focusedRoute?.key) {
 				ancestors.push(focusedRoute.key);
-
-				const previousRoute = state.routes[state.index - 1];
-				if (!ancestorDestinationPairKey && previousRoute?.key) {
-					ancestorDestinationPairKey = createScreenPairKey(
-						previousRoute.key,
-						focusedRoute.key,
-					);
-				}
 			}
 		}
 		parent = parent.getParent();
 	}
 
-	return {
-		ancestorKeys: ancestors,
-		ancestorDestinationPairKey,
-	};
-}
-
-export function getAncestorKeys(current: BaseStackDescriptor): string[] {
-	return getAncestorKeyState(current).ancestorKeys;
+	return ancestors;
 }

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

package/src/stores/bounds/internals/entries.ts

@@ -62,6 +62,43 @@ function getEntry(tag: TagID, key: ScreenKey): Entry | null {
 	return boundaryRegistry.get()[tag]?.screens[key] ?? null;
 }
 
+function getMatchingSourceScreenKey(
+	tag: TagID,
+	destinationScreenKey: ScreenKey,
+	preferredScreenKey?: ScreenKey,
+	excludedScreenKeys?: readonly ScreenKey[],
+): ScreenKey | null {
+	"worklet";
+	const screens = boundaryRegistry.get()[tag]?.screens;
+	if (!screens) return null;
+	const isExcluded = (screenKey: ScreenKey) => {
+		"worklet";
+		for (let index = 0; index < (excludedScreenKeys?.length ?? 0); index++) {
+			if (excludedScreenKeys?.[index] === screenKey) {
+				return true;
+			}
+		}
+		return false;
+	};
+	if (
+		preferredScreenKey &&
+		preferredScreenKey !== destinationScreenKey &&
+		!isExcluded(preferredScreenKey) &&
+		screens[preferredScreenKey]
+	) {
+		return preferredScreenKey;
+	}
+
+	let latestScreenKey: ScreenKey | null = null;
+	for (const screenKey in screens) {
+		if (screenKey !== destinationScreenKey && !isExcluded(screenKey)) {
+			latestScreenKey = screenKey;
+		}
+	}
+
+	return latestScreenKey;
+}
+
 function setEntry(tag: TagID, screenKey: ScreenKey, patch: EntryPatch) {
 	"worklet";
 	boundaryRegistry.modify(<T extends BoundaryEntriesState>(state: T): T => {
@@ -90,4 +127,4 @@ function removeEntry(tag: TagID, screenKey: ScreenKey) {
 	});
 }
 
-export { getEntry, removeEntry, setEntry };
+export { getEntry, getMatchingSourceScreenKey, removeEntry, setEntry };

package/src/stores/bounds/internals/links.ts

@@ -4,12 +4,14 @@ import {
 	ensurePairGroups,
 	ensurePairLinks,
 	ensurePairSourceRequests,
+	getDestinationScreenKeyFromPairKey,
 	getGroupKeyFromTag,
 	getLinkKeyFromTag,
 	getActiveGroupId as getPairActiveGroupId,
 	getDestination as getPairDestination,
 	getLink as getPairLink,
 	getSource as getPairSource,
+	getSourceScreenKeyFromPairKey,
 } from "../helpers/link-pairs.helpers";
 import type {
 	BoundaryRuntimeFlags,
@@ -402,6 +404,38 @@ function getResolvedLink(
 	};
 }
 
+function getPairKeyForSource(
+	tag: TagID,
+	screenKey: ScreenKey,
+): ScreenPairKey | null {
+	"worklet";
+	const state = pairs.get();
+	const linkKey = getLinkKeyFromTag(tag);
+	for (const pairKey in state) {
+		if (getSourceScreenKeyFromPairKey(pairKey) !== screenKey) continue;
+		if (
+			getResolvedLink(pairKey, tag).link?.destination ||
+			state[pairKey]?.sourceRequests?.[linkKey]
+		) {
+			return pairKey;
+		}
+	}
+	return null;
+}
+
+function getPairKeyForDestination(
+	tag: TagID,
+	screenKey: ScreenKey,
+): ScreenPairKey | null {
+	"worklet";
+	const state = pairs.get();
+	for (const pairKey in state) {
+		if (getDestinationScreenKeyFromPairKey(pairKey) !== screenKey) continue;
+		if (getResolvedLink(pairKey, tag).link) return pairKey;
+	}
+	return null;
+}
+
 function getSource(
 	pairKey: ScreenPairKey,
 	tag: TagID,
@@ -422,6 +456,8 @@ export {
 	getActiveGroupId,
 	getDestination,
 	getLink,
+	getPairKeyForDestination,
+	getPairKeyForSource,
 	getResolvedLink,
 	getSource,
 	requestSourceMeasure,

package/src/stores/bounds/internals/resolver.ts

@@ -1,35 +1,21 @@
-import { createScreenPairKey } from "../helpers/link-pairs.helpers";
 import type {
 	ResolvedTransitionPair,
 	ResolveTransitionContext,
-	ScreenPairKey,
 	TagID,
 } from "../types";
-import { getResolvedLink } from "./links";
-
-function resolvePairKey(
-	context: ResolveTransitionContext,
-): ScreenPairKey | null {
-	"worklet";
-
-	if (context.entering) {
-		if (!context.previousScreenKey || !context.currentScreenKey) return null;
-		return createScreenPairKey(
-			context.previousScreenKey,
-			context.currentScreenKey,
-		);
-	}
-
-	if (!context.currentScreenKey || !context.nextScreenKey) return null;
-	return createScreenPairKey(context.currentScreenKey, context.nextScreenKey);
-}
+import { getPairKeyForDestination, getResolvedLink } from "./links";
 
 function resolveTransitionPair(
 	tag: TagID,
 	context: ResolveTransitionContext,
 ): ResolvedTransitionPair {
 	"worklet";
-	const pairKey = resolvePairKey(context);
+	const destinationScreenKey = context.entering
+		? context.currentScreenKey
+		: context.nextScreenKey;
+	const pairKey = destinationScreenKey
+		? getPairKeyForDestination(tag, destinationScreenKey)
+		: null;
 	const matchedLink = pairKey ? getResolvedLink(pairKey, tag).link : null;
 
 	return {

package/src/utils/bounds/helpers/create-link-accessor.ts

@@ -1,10 +1,12 @@
-import { getResolvedLink } from "../../../stores/bounds/internals/links";
+import {
+	getPairKeyForDestination,
+	getResolvedLink,
+} from "../../../stores/bounds/internals/links";
 import type {
 	BoundsInterpolationProps,
 	BoundsLink,
 } from "../../../types/bounds.types";
 import type { BoundId } from "../types/options";
-import { resolveBoundsPairKey } from "./resolve-bounds-pair-key";
 
 type GetProps = () => BoundsInterpolationProps;
 
@@ -19,7 +21,11 @@ export const createLinkAccessor = (getProps: GetProps): LinkAccessor => {
 		"worklet";
 		const props = getProps();
 		const stringTag = String(tag);
-		const pairKey = resolveBoundsPairKey(props);
+		const destinationScreenKey =
+			props.next?.route.key ?? props.current?.route.key;
+		const pairKey = destinationScreenKey
+			? getPairKeyForDestination(stringTag, destinationScreenKey)
+			: null;
 		if (!pairKey) return null;
 
 		const resolved = getResolvedLink(pairKey, stringTag);

package/lib/commonjs/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.hasLocalSlot = void 0;
-const hasLocalSlot = (localStylesMaps, slotId) => {
-  "worklet";
-
-  for (let index = 0; index < localStylesMaps.length; index++) {
-    if (localStylesMaps[index]?.[slotId] !== undefined) {
-      return true;
-    }
-  }
-  return false;
-};
-exports.hasLocalSlot = hasLocalSlot;
-//# sourceMappingURL=has-local-slot.js.map

package/lib/commonjs/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["hasLocalSlot","localStylesMaps","slotId","index","length","undefined","exports"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/helpers/has-local-slot.ts"],"mappings":";;;;;;AAEO,MAAMA,YAAY,GAAGA,CAC3BC,eAAiC,EACjCC,MAAc,KACV;EACJ,SAAS;;EAET,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGF,eAAe,CAACG,MAAM,EAAED,KAAK,EAAE,EAAE;IAC5D,IAAIF,eAAe,CAACE,KAAK,CAAC,GAAGD,MAAM,CAAC,KAAKG,SAAS,EAAE;MACnD,OAAO,IAAI;IACZ;EACD;EAEA,OAAO,KAAK;AACb,CAAC;AAACC,OAAA,CAAAN,YAAA,GAAAA,YAAA","ignoreList":[]}

package/lib/module/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js

@@ -1,13 +0,0 @@
-"use strict";
-
-export const hasLocalSlot = (localStylesMaps, slotId) => {
-  "worklet";
-
-  for (let index = 0; index < localStylesMaps.length; index++) {
-    if (localStylesMaps[index]?.[slotId] !== undefined) {
-      return true;
-    }
-  }
-  return false;
-};
-//# sourceMappingURL=has-local-slot.js.map

package/lib/module/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["hasLocalSlot","localStylesMaps","slotId","index","length","undefined"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/helpers/has-local-slot.ts"],"mappings":";;AAEA,OAAO,MAAMA,YAAY,GAAGA,CAC3BC,eAAiC,EACjCC,MAAc,KACV;EACJ,SAAS;;EAET,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGF,eAAe,CAACG,MAAM,EAAED,KAAK,EAAE,EAAE;IAC5D,IAAIF,eAAe,CAACE,KAAK,CAAC,GAAGD,MAAM,CAAC,KAAKG,SAAS,EAAE;MACnD,OAAO,IAAI;IACZ;EACD;EAEA,OAAO,KAAK;AACb,CAAC","ignoreList":[]}

package/lib/typescript/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.d.ts

@@ -1,3 +0,0 @@
-import type { LocalStyleLayers } from "../../../../../../providers/screen/styles/helpers/resolve-slot-styles";
-export declare const hasLocalSlot: (localStylesMaps: LocalStyleLayers, slotId: string) => boolean;
-//# sourceMappingURL=has-local-slot.d.ts.map

package/lib/typescript/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"has-local-slot.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uEAAuE,CAAC;AAE9G,eAAO,MAAM,YAAY,GACxB,iBAAiB,gBAAgB,EACjC,QAAQ,MAAM,YAWd,CAAC"}

package/src/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.ts

@@ -1,16 +0,0 @@
-import type { LocalStyleLayers } from "../../../../../../providers/screen/styles/helpers/resolve-slot-styles";
-
-export const hasLocalSlot = (
-	localStylesMaps: LocalStyleLayers,
-	slotId: string,
-) => {
-	"worklet";
-
-	for (let index = 0; index < localStylesMaps.length; index++) {
-		if (localStylesMaps[index]?.[slotId] !== undefined) {
-			return true;
-		}
-	}
-
-	return false;
-};