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

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/stores/bounds/internals/entries.ts

@@ -62,6 +62,32 @@ function getEntry(tag: TagID, key: ScreenKey): Entry | null {
 	return boundaryRegistry.get()[tag]?.screens[key] ?? null;
 }
 
+function getMatchingSourceScreenKey(
+	tag: TagID,
+	destinationScreenKey: ScreenKey,
+	preferredScreenKey?: ScreenKey,
+): ScreenKey | null {
+	"worklet";
+	const screens = boundaryRegistry.get()[tag]?.screens;
+	if (!screens) return null;
+	if (
+		preferredScreenKey &&
+		preferredScreenKey !== destinationScreenKey &&
+		screens[preferredScreenKey]
+	) {
+		return preferredScreenKey;
+	}
+
+	let latestScreenKey: ScreenKey | null = null;
+	for (const screenKey in screens) {
+		if (screenKey !== destinationScreenKey) {
+			latestScreenKey = screenKey;
+		}
+	}
+
+	return latestScreenKey;
+}
+
 function setEntry(tag: TagID, screenKey: ScreenKey, patch: EntryPatch) {
 	"worklet";
 	boundaryRegistry.modify(<T extends BoundaryEntriesState>(state: T): T => {
@@ -90,4 +116,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);