react-native-screen-transitions 3.4.0-alpha.7 → 3.4.0-beta.1

package/src/shared/stores/bounds/internals/clear.ts

@@ -1,18 +1,13 @@
 import { matchesNavigatorKey, matchesScreenKey } from "../helpers/matching";
 import type {
 	NavigatorKey,
+	PresenceEntry,
 	PresenceState,
 	ScreenKey,
 	SnapshotEntry,
 	TagLink,
 } from "../types";
-import {
-	debugClearLog,
-	debugStoreSizeLog,
-	presence,
-	type RegistryState,
-	registry,
-} from "./state";
+import { presence, type RegistryState, registry } from "./state";
 
 const hasAnyKeys = (record: Record<string, unknown>) => {
 	"worklet";
@@ -22,128 +17,23 @@ const hasAnyKeys = (record: Record<string, unknown>) => {
 	return false;
 };
 
-const countRegistryMatches = (
+type SnapshotPredicate = (
 	screenKey: ScreenKey,
-	matchByAncestor: boolean,
-): { snapshots: number; links: number } => {
-	"worklet";
-	const currentRegistry = registry.value;
-	let snapshots = 0;
-	let links = 0;
-
-	for (const tag in currentRegistry) {
-		const tagState = currentRegistry[tag];
-
-		for (const snapshotKey in tagState.snapshots) {
-			const snapshot = tagState.snapshots[snapshotKey];
-			const matched = matchByAncestor
-				? snapshotKey === screenKey ||
-					(snapshot.ancestorKeys?.includes(screenKey) ?? false)
-				: snapshotKey === screenKey;
-			if (matched) snapshots++;
-		}
-
-		for (let i = 0; i < tagState.linkStack.length; i++) {
-			const link = tagState.linkStack[i];
-			if (
-				matchesScreenKey(link.source, screenKey) ||
-				matchesScreenKey(link.destination, screenKey)
-			) {
-				links++;
-			}
-		}
-	}
-
-	return { snapshots, links };
-};
-
-const countRegistryMatchesByBranch = (
-	branchNavigatorKey: NavigatorKey,
-): { snapshots: number; links: number } => {
-	"worklet";
-	const currentRegistry = registry.value;
-	let snapshots = 0;
-	let links = 0;
-
-	for (const tag in currentRegistry) {
-		const tagState = currentRegistry[tag];
-
-		for (const snapshotKey in tagState.snapshots) {
-			const snapshot = tagState.snapshots[snapshotKey];
-			const matched =
-				snapshot.navigatorKey === branchNavigatorKey ||
-				(snapshot.ancestorNavigatorKeys?.includes(branchNavigatorKey) ?? false);
-			if (matched) snapshots++;
-		}
-
-		for (let i = 0; i < tagState.linkStack.length; i++) {
-			const link = tagState.linkStack[i];
-			if (
-				matchesNavigatorKey(link.source, branchNavigatorKey) ||
-				matchesNavigatorKey(link.destination, branchNavigatorKey)
-			) {
-				links++;
-			}
-		}
-	}
+	snapshot: SnapshotEntry,
+) => boolean;
 
-	return { snapshots, links };
-};
+type LinkPredicate = (link: TagLink) => boolean;
 
-const countPresenceMatches = (
+type PresencePredicate = (
 	screenKey: ScreenKey,
-	matchByAncestor: boolean,
-): number => {
-	"worklet";
-	const currentPresence = presence.value;
-	let matches = 0;
-
-	for (const tag in currentPresence) {
-		const tagEntries = currentPresence[tag];
-		for (const entryScreenKey in tagEntries) {
-			const entry = tagEntries[entryScreenKey];
-			const matched = matchByAncestor
-				? entryScreenKey === screenKey ||
-					(entry.ancestorKeys?.includes(screenKey) ?? false)
-				: entryScreenKey === screenKey;
-			if (matched) matches++;
-		}
-	}
-
-	return matches;
-};
-
-const countPresenceMatchesByBranch = (
-	branchNavigatorKey: NavigatorKey,
-): number => {
-	"worklet";
-	const currentPresence = presence.value;
-	let matches = 0;
-
-	for (const tag in currentPresence) {
-		const tagEntries = currentPresence[tag];
-		for (const entryScreenKey in tagEntries) {
-			const entry = tagEntries[entryScreenKey];
-			const matched =
-				entry.navigatorKey === branchNavigatorKey ||
-				(entry.ancestorNavigatorKeys?.includes(branchNavigatorKey) ?? false);
-			if (matched) matches++;
-		}
-	}
-
-	return matches;
-};
+	entry: PresenceEntry,
+) => boolean;
 
-const clearRegistry = (params: {
-	shouldRemoveSnapshot: (
-		screenKey: ScreenKey,
-		snapshot: SnapshotEntry,
-	) => boolean;
-	shouldRemoveLink: (link: TagLink) => boolean;
-}) => {
+const clearRegistry = (
+	shouldClearSnapshot: SnapshotPredicate,
+	shouldClearLink: LinkPredicate,
+) => {
 	"worklet";
-	const { shouldRemoveSnapshot, shouldRemoveLink } = params;
-
 	registry.modify(<T extends RegistryState>(state: T): T => {
 		"worklet";
 		for (const tag in state) {
@@ -151,14 +41,14 @@ const clearRegistry = (params: {
 
 			for (const snapshotKey in tagState.snapshots) {
 				const snapshot = tagState.snapshots[snapshotKey];
-				if (shouldRemoveSnapshot(snapshotKey, snapshot)) {
+				if (shouldClearSnapshot(snapshotKey, snapshot)) {
 					delete tagState.snapshots[snapshotKey];
 				}
 			}
 
 			for (let i = tagState.linkStack.length - 1; i >= 0; i--) {
 				const link = tagState.linkStack[i];
-				if (shouldRemoveLink(link)) {
+				if (shouldClearLink(link)) {
 					tagState.linkStack.splice(i, 1);
 				}
 			}
@@ -172,25 +62,7 @@ const clearRegistry = (params: {
 	});
 };
 
-const clearPresenceDirect = (screenKey: ScreenKey) => {
-	"worklet";
-	presence.modify(<T extends PresenceState>(state: T): T => {
-		"worklet";
-		for (const tag in state) {
-			const tagEntries = state[tag];
-			if (!tagEntries[screenKey]) continue;
-
-			delete tagEntries[screenKey];
-
-			if (!hasAnyKeys(tagEntries)) {
-				delete state[tag];
-			}
-		}
-		return state;
-	});
-};
-
-const clearPresenceByAncestor = (ancestorKey: ScreenKey) => {
+const clearPresence = (shouldClearPresence: PresencePredicate) => {
 	"worklet";
 	presence.modify(<T extends PresenceState>(state: T): T => {
 		"worklet";
@@ -199,10 +71,7 @@ const clearPresenceByAncestor = (ancestorKey: ScreenKey) => {
 
 			for (const entryScreenKey in tagEntries) {
 				const entry = tagEntries[entryScreenKey];
-				const shouldRemove =
-					entryScreenKey === ancestorKey ||
-					(entry.ancestorKeys?.includes(ancestorKey) ?? false);
-				if (shouldRemove) {
+				if (shouldClearPresence(entryScreenKey, entry)) {
 					delete tagEntries[entryScreenKey];
 				}
 			}
@@ -211,125 +80,83 @@ const clearPresenceByAncestor = (ancestorKey: ScreenKey) => {
 				delete state[tag];
 			}
 		}
+
 		return state;
 	});
 };
 
-const clearPresenceByBranch = (branchNavigatorKey: NavigatorKey) => {
+const performClear = (
+	shouldClearSnapshot: SnapshotPredicate,
+	shouldClearLink: LinkPredicate,
+	shouldClearPresence: PresencePredicate,
+) => {
 	"worklet";
-	presence.modify(<T extends PresenceState>(state: T): T => {
-		"worklet";
-		for (const tag in state) {
-			const tagEntries = state[tag];
-
-			for (const entryScreenKey in tagEntries) {
-				const entry = tagEntries[entryScreenKey];
-				const shouldRemove =
-					entry.navigatorKey === branchNavigatorKey ||
-					(entry.ancestorNavigatorKeys?.includes(branchNavigatorKey) ?? false);
-
-				if (shouldRemove) {
-					delete tagEntries[entryScreenKey];
-				}
-			}
-
-			if (!hasAnyKeys(tagEntries)) {
-				delete state[tag];
-			}
-		}
-		return state;
-	});
+	clearRegistry(shouldClearSnapshot, shouldClearLink);
+	clearPresence(shouldClearPresence);
 };
 
 function clear(screenKey: ScreenKey) {
 	"worklet";
-	const beforeMatches = countRegistryMatches(screenKey, false);
-	const beforePresenceMatches = countPresenceMatches(screenKey, false);
-
-	clearRegistry({
-		shouldRemoveSnapshot: (snapshotKey) => snapshotKey === screenKey,
-		shouldRemoveLink: (link) => {
+	performClear(
+		(snapshotKey) => snapshotKey === screenKey,
+		(link) => {
 			return (
 				matchesScreenKey(link.source, screenKey) ||
 				matchesScreenKey(link.destination, screenKey)
 			);
 		},
-	});
-
-	clearPresenceDirect(screenKey);
-
-	const afterMatches = countRegistryMatches(screenKey, false);
-	const afterPresenceMatches = countPresenceMatches(screenKey, false);
-
-	debugClearLog(
-		`clear(${screenKey}) snapshots=${beforeMatches.snapshots}->${afterMatches.snapshots} links=${beforeMatches.links}->${afterMatches.links} presence=${beforePresenceMatches}->${afterPresenceMatches}`,
+		(entryScreenKey) => entryScreenKey === screenKey,
 	);
-	debugStoreSizeLog(`clear(${screenKey})`);
 }
 
 function clearByAncestor(ancestorKey: ScreenKey) {
 	"worklet";
-	const beforeMatches = countRegistryMatches(ancestorKey, true);
-	const beforePresenceMatches = countPresenceMatches(ancestorKey, true);
-
-	clearRegistry({
-		shouldRemoveSnapshot: (snapshotKey, snapshot) => {
+	performClear(
+		(snapshotKey, snapshot) => {
 			return (
 				snapshotKey === ancestorKey ||
 				(snapshot.ancestorKeys?.includes(ancestorKey) ?? false)
 			);
 		},
-		shouldRemoveLink: (link) => {
+		(link) => {
 			return (
 				matchesScreenKey(link.source, ancestorKey) ||
 				matchesScreenKey(link.destination, ancestorKey)
 			);
 		},
-	});
-
-	clearPresenceByAncestor(ancestorKey);
-
-	const afterMatches = countRegistryMatches(ancestorKey, true);
-	const afterPresenceMatches = countPresenceMatches(ancestorKey, true);
-
-	debugClearLog(
-		`clearByAncestor(${ancestorKey}) snapshots=${beforeMatches.snapshots}->${afterMatches.snapshots} links=${beforeMatches.links}->${afterMatches.links} presence=${beforePresenceMatches}->${afterPresenceMatches}`,
+		(entryScreenKey, entry) => {
+			return (
+				entryScreenKey === ancestorKey ||
+				(entry.ancestorKeys?.includes(ancestorKey) ?? false)
+			);
+		},
 	);
-	debugStoreSizeLog(`clearByAncestor(${ancestorKey})`);
 }
 
 function clearByBranch(branchNavigatorKey: NavigatorKey) {
 	"worklet";
 	if (!branchNavigatorKey) return;
 
-	const beforeMatches = countRegistryMatchesByBranch(branchNavigatorKey);
-	const beforePresenceMatches =
-		countPresenceMatchesByBranch(branchNavigatorKey);
-
-	clearRegistry({
-		shouldRemoveSnapshot: (_snapshotKey, snapshot) => {
+	performClear(
+		(_snapshotKey, snapshot) => {
 			return (
 				snapshot.navigatorKey === branchNavigatorKey ||
 				(snapshot.ancestorNavigatorKeys?.includes(branchNavigatorKey) ?? false)
 			);
 		},
-		shouldRemoveLink: (link) => {
+		(link) => {
 			return (
 				matchesNavigatorKey(link.source, branchNavigatorKey) ||
 				matchesNavigatorKey(link.destination, branchNavigatorKey)
 			);
 		},
-	});
-
-	clearPresenceByBranch(branchNavigatorKey);
-
-	const afterMatches = countRegistryMatchesByBranch(branchNavigatorKey);
-	const afterPresenceMatches = countPresenceMatchesByBranch(branchNavigatorKey);
-
-	debugClearLog(
-		`clearByBranch(${branchNavigatorKey}) snapshots=${beforeMatches.snapshots}->${afterMatches.snapshots} links=${beforeMatches.links}->${afterMatches.links} presence=${beforePresenceMatches}->${afterPresenceMatches}`,
+		(_entryScreenKey, entry) => {
+			return (
+				entry.navigatorKey === branchNavigatorKey ||
+				(entry.ancestorNavigatorKeys?.includes(branchNavigatorKey) ?? false)
+			);
+		},
 	);
-	debugStoreSizeLog(`clearByBranch(${branchNavigatorKey})`);
 }
 
 export { clear, clearByAncestor, clearByBranch };

package/src/shared/stores/bounds/internals/presence.ts

@@ -1,5 +1,5 @@
 import type { BoundaryConfig, PresenceState, ScreenKey, TagID } from "../types";
-import { debugStoreSizeLog, type GroupsState, groups, presence } from "./state";
+import { type GroupsState, groups, presence } from "./state";
 
 function registerBoundaryPresence(
 	tag: TagID,
@@ -31,7 +31,6 @@ function registerBoundaryPresence(
 
 		return state;
 	});
-	debugStoreSizeLog(`registerBoundaryPresence(${tag},${screenKey})`);
 }
 
 function unregisterBoundaryPresence(tag: TagID, screenKey: ScreenKey) {
@@ -63,7 +62,6 @@ function unregisterBoundaryPresence(tag: TagID, screenKey: ScreenKey) {
 		delete state[tag];
 		return state;
 	});
-	debugStoreSizeLog(`unregisterBoundaryPresence(${tag},${screenKey})`);
 }
 
 function hasBoundaryPresence(tag: TagID, screenKey: ScreenKey): boolean {
@@ -123,7 +121,6 @@ function setGroupActiveId(group: string, id: string) {
 		};
 		return state;
 	});
-	debugStoreSizeLog(`setGroupActiveId(${group},${id})`);
 }
 
 function getGroupActiveId(group: string): string | null {

package/src/shared/stores/bounds/internals/registry.ts

@@ -8,12 +8,7 @@ import type {
 	TagLink,
 	TagState,
 } from "../types";
-import {
-	createEmptyTagState,
-	debugStoreSizeLog,
-	type RegistryState,
-	registry,
-} from "./state";
+import { createEmptyTagState, type RegistryState, registry } from "./state";
 
 const LINK_HISTORY_LIMIT = 3;
 
@@ -86,7 +81,6 @@ function registerSnapshot(
 		};
 		return state;
 	});
-	debugStoreSizeLog(`registerSnapshot(${tag},${screenKey})`);
 }
 
 function setLinkSource(
@@ -129,7 +123,6 @@ function setLinkSource(
 
 		return state;
 	});
-	debugStoreSizeLog(`setLinkSource(${tag},${screenKey})`);
 }
 
 function updateLinkSource(
@@ -182,7 +175,6 @@ function updateLinkSource(
 
 		return state;
 	});
-	debugStoreSizeLog(`updateLinkSource(${tag},${screenKey})`);
 }
 
 const findLatestPendingIndex = (
@@ -204,6 +196,22 @@ const findLatestPendingIndex = (
 	return -1;
 };
 
+const findLatestSourceIndex = (
+	stack: TagLink[],
+	expectedSourceScreenKey?: ScreenKey,
+): number => {
+	"worklet";
+	if (!expectedSourceScreenKey) return -1;
+
+	for (let i = stack.length - 1; i >= 0; i--) {
+		if (matchesScreenKey(stack[i].source, expectedSourceScreenKey)) {
+			return i;
+		}
+	}
+
+	return -1;
+};
+
 function setLinkDestination(
 	tag: TagID,
 	screenKey: ScreenKey,
@@ -221,12 +229,13 @@ function setLinkDestination(
 		const stack = tagState?.linkStack;
 		if (!stack || stack.length === 0) return state;
 
-		const targetIndex = findLatestPendingIndex(stack, expectedSourceScreenKey);
+		let targetIndex = findLatestPendingIndex(stack, expectedSourceScreenKey);
+		if (targetIndex === -1) {
+			targetIndex = findLatestSourceIndex(stack, expectedSourceScreenKey);
+		}
 		if (targetIndex === -1) return state;
 
 		const targetLink = stack[targetIndex];
-		if (targetLink.destination !== null) return state;
-
 		targetLink.destination = {
 			screenKey,
 			ancestorKeys,
@@ -238,7 +247,6 @@ function setLinkDestination(
 
 		return state;
 	});
-	debugStoreSizeLog(`setLinkDestination(${tag},${screenKey})`);
 }
 
 function updateLinkDestination(
@@ -272,6 +280,10 @@ function updateLinkDestination(
 			targetIndex = findLatestPendingIndex(stack, expectedSourceScreenKey);
 		}
 
+		if (targetIndex === -1) {
+			targetIndex = findLatestSourceIndex(stack, expectedSourceScreenKey);
+		}
+
 		if (targetIndex === -1) {
 			return state;
 		}
@@ -287,7 +299,6 @@ function updateLinkDestination(
 
 		return state;
 	});
-	debugStoreSizeLog(`updateLinkDestination(${tag},${screenKey})`);
 }
 
 function getActiveLink(tag: TagID, screenKey?: ScreenKey): TagLink | null {

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

@@ -1,4 +1,3 @@
-import type { MeasuredDimensions, StyleProps } from "react-native-reanimated";
 import { matchesScreenKey } from "../helpers/matching";
 import type {
 	ResolvedTransitionPair,
@@ -8,8 +7,7 @@ import type {
 	TagLink,
 	TagState,
 } from "../types";
-import { getSnapshot } from "./registry";
-import { debugResolverLog, registry } from "./state";
+import { registry } from "./state";
 
 const findLatestLink = (
 	tagState: TagState,
@@ -67,30 +65,6 @@ function findPendingLinkBySource(
 	);
 }
 
-function getSnapshotBoundsByPriority(
-	tag: TagID,
-	keys: (ScreenKey | undefined)[],
-): {
-	bounds: MeasuredDimensions;
-	styles: StyleProps;
-	screenKey: ScreenKey;
-} | null {
-	"worklet";
-	for (let i = 0; i < keys.length; i++) {
-		const key = keys[i];
-		if (!key) continue;
-		const snapshot = getSnapshot(tag, key);
-		if (!snapshot) continue;
-		return {
-			bounds: snapshot.bounds,
-			styles: snapshot.styles,
-			screenKey: key,
-		};
-	}
-
-	return null;
-}
-
 function resolveTransitionPair(
 	tag: TagID,
 	context: ResolveTransitionContext,
@@ -153,61 +127,12 @@ function resolveTransitionPair(
 		}
 	}
 
-	let sourceBounds = matchedLink?.source?.bounds ?? null;
-	let destinationBounds = matchedLink?.destination?.bounds ?? null;
-	let sourceStyles = matchedLink?.source?.styles ?? null;
-	let destinationStyles = matchedLink?.destination?.styles ?? null;
-	let sourceScreenKey = matchedLink?.source?.screenKey ?? null;
-	let destinationScreenKey = matchedLink?.destination?.screenKey ?? null;
-	let usedSnapshotSource = false;
-	let usedSnapshotDestination = false;
-
-	const sourceFallbackKeys = context.entering
-		? [
-				context.previousScreenKey,
-				context.currentScreenKey,
-				context.nextScreenKey,
-			]
-		: [
-				context.currentScreenKey,
-				context.previousScreenKey,
-				context.nextScreenKey,
-			];
-
-	const destinationFallbackKeys = context.entering
-		? [context.currentScreenKey, context.nextScreenKey]
-		: [context.nextScreenKey, context.currentScreenKey];
-
-	if (!sourceBounds) {
-		const sourceSnapshot = getSnapshotBoundsByPriority(tag, sourceFallbackKeys);
-		if (sourceSnapshot) {
-			sourceBounds = sourceSnapshot.bounds;
-			sourceStyles = sourceSnapshot.styles;
-			sourceScreenKey = sourceSnapshot.screenKey;
-			usedSnapshotSource = true;
-		}
-	}
-
-	if (!destinationBounds) {
-		const destinationSnapshot = getSnapshotBoundsByPriority(
-			tag,
-			destinationFallbackKeys,
-		);
-		if (destinationSnapshot) {
-			destinationBounds = destinationSnapshot.bounds;
-			destinationStyles = destinationSnapshot.styles;
-			destinationScreenKey = destinationSnapshot.screenKey;
-			usedSnapshotDestination = true;
-		}
-	}
-
-	if (!sourceBounds || !destinationBounds) {
-		debugResolverLog(
-			`unresolved tag=${tag} entering=${context.entering ? 1 : 0} source=${
-				sourceBounds ? 1 : 0
-			} destination=${destinationBounds ? 1 : 0} pending=${usedPending ? 1 : 0}`,
-		);
-	}
+	const sourceBounds = matchedLink?.source?.bounds ?? null;
+	const destinationBounds = matchedLink?.destination?.bounds ?? null;
+	const sourceStyles = matchedLink?.source?.styles ?? null;
+	const destinationStyles = matchedLink?.destination?.styles ?? null;
+	const sourceScreenKey = matchedLink?.source?.screenKey ?? null;
+	const destinationScreenKey = matchedLink?.destination?.screenKey ?? null;
 
 	return {
 		sourceBounds,
@@ -217,8 +142,6 @@ function resolveTransitionPair(
 		sourceScreenKey,
 		destinationScreenKey,
 		usedPending,
-		usedSnapshotSource,
-		usedSnapshotDestination,
 	};
 }