react-native-screen-transitions 3.5.0 → 3.5.2

package/src/shared/providers/register-bounds.provider.tsx

@@ -14,8 +14,13 @@ import type { SharedValue } from "react-native-reanimated/lib/typescript/commonT
 import useStableCallback from "../hooks/use-stable-callback";
 import useStableCallbackValue from "../hooks/use-stable-callback-value";
 import { AnimationStore } from "../stores/animation.store";
-import { BoundStore } from "../stores/bounds";
 import { applyMeasuredBoundsWrites } from "../stores/bounds/helpers/apply-measured-bounds-writes";
+import {
+	getMeasuredEntry,
+	getPendingLink,
+	hasDestinationLink,
+	hasSourceLink,
+} from "../stores/bounds/internals/registry";
 import { prepareStyleForBounds } from "../utils/bounds/helpers/styles/styles";
 import createProvider from "../utils/create-provider";
 import { useDescriptorDerivations, useDescriptors } from "./screen/descriptors";
@@ -276,10 +281,7 @@ const registerBoundsBundle = createProvider("RegisterBounds", {
 				}
 
 				if (shouldSetSource && isAnimating.get()) {
-					const existing = BoundStore.entry.getMeasured(
-						sharedBoundTag,
-						currentScreenKey,
-					);
+					const existing = getMeasuredEntry(sharedBoundTag, currentScreenKey);
 					if (existing) {
 						applyMeasuredBoundsWrites({
 							sharedBoundTag,
@@ -297,13 +299,9 @@ const registerBoundsBundle = createProvider("RegisterBounds", {
 					return;
 				}
 
-				const hasPendingLink =
-					BoundStore.link.getPending(sharedBoundTag) !== null;
-				const hasSourceLink = BoundStore.link.hasSource(
-					sharedBoundTag,
-					currentScreenKey,
-				);
-				const hasDestinationLink = BoundStore.link.hasDestination(
+				const hasPending = getPendingLink(sharedBoundTag) !== null;
+				const hasSource = hasSourceLink(sharedBoundTag, currentScreenKey);
+				const hasDestination = hasDestinationLink(
 					sharedBoundTag,
 					currentScreenKey,
 				);
@@ -315,11 +313,10 @@ const registerBoundsBundle = createProvider("RegisterBounds", {
 					!wantsSetSource && !wantsSetDestination && !wantsUpdateSource;
 
 				const canSetSource = wantsSetSource;
-				const canSetDestination = wantsSetDestination && hasPendingLink;
-				const canUpdateSource = wantsUpdateSource && hasSourceLink;
+				const canSetDestination = wantsSetDestination && hasPending;
+				const canUpdateSource = wantsUpdateSource && hasSource;
 				const canSnapshotOnly =
-					wantsSnapshotOnly &&
-					(hasPendingLink || hasSourceLink || hasDestinationLink);
+					wantsSnapshotOnly && (hasPending || hasSource || hasDestination);
 
 				if (
 					!canSetSource &&

package/src/shared/providers/screen/styles/components/maybe-floating-container.tsx

@@ -15,7 +15,10 @@ export const MaybeFloatingContainer = memo(function MaybeFloatingContainer({
 	}
 
 	return (
-		<View style={styles.float} pointerEvents="box-none">
+		<View
+			style={[StyleSheet.absoluteFill, styles.float]}
+			pointerEvents="box-none"
+		>
 			{children}
 		</View>
 	);
@@ -23,7 +26,6 @@ export const MaybeFloatingContainer = memo(function MaybeFloatingContainer({
 
 const styles = StyleSheet.create({
 	float: {
-		...StyleSheet.absoluteFill,
 		zIndex: 999,
 	},
 });

package/src/shared/stores/bounds/helpers/apply-measured-bounds-writes.ts

@@ -1,5 +1,5 @@
 import type { MeasuredDimensions, StyleProps } from "react-native-reanimated";
-import { BoundStore } from "..";
+import { setDestination, setEntry, setSource } from "../internals/registry";
 
 type ApplyMeasuredBoundsWritesParams = {
 	sharedBoundTag: string;
@@ -38,7 +38,7 @@ export const applyMeasuredBoundsWrites = (
 	} = params;
 
 	if (shouldWriteEntry) {
-		BoundStore.entry.set(sharedBoundTag, currentScreenKey, {
+		setEntry(sharedBoundTag, currentScreenKey, {
 			bounds: measured,
 			styles: preparedStyles,
 			ancestorKeys,
@@ -48,7 +48,7 @@ export const applyMeasuredBoundsWrites = (
 	}
 
 	if (shouldSetSource) {
-		BoundStore.link.setSource(
+		setSource(
 			"capture",
 			sharedBoundTag,
 			currentScreenKey,
@@ -61,7 +61,7 @@ export const applyMeasuredBoundsWrites = (
 	}
 
 	if (shouldUpdateSource) {
-		BoundStore.link.setSource(
+		setSource(
 			"refresh",
 			sharedBoundTag,
 			currentScreenKey,
@@ -74,7 +74,7 @@ export const applyMeasuredBoundsWrites = (
 	}
 
 	if (shouldUpdateDestination) {
-		BoundStore.link.setDestination(
+		setDestination(
 			"refresh",
 			sharedBoundTag,
 			currentScreenKey,
@@ -88,7 +88,7 @@ export const applyMeasuredBoundsWrites = (
 	}
 
 	if (shouldSetDestination) {
-		BoundStore.link.setDestination(
+		setDestination(
 			"attach",
 			sharedBoundTag,
 			currentScreenKey,

package/src/shared/stores/bounds/index.ts

@@ -1,3 +1,4 @@
+import type { MeasuredDimensions, StyleProps } from "react-native-reanimated";
 import { clear, clearByAncestor, clearByBranch } from "./internals/clear";
 import { getGroupActiveId, setGroupActiveId } from "./internals/groups";
 import {
@@ -14,6 +15,13 @@ import {
 	setSource,
 } from "./internals/registry";
 import { resolveTransitionPair } from "./internals/resolver";
+import type {
+	BoundaryConfig,
+	MeasuredEntry,
+	NavigatorKey,
+	ScreenKey,
+	TagID,
+} from "./types";
 
 export type {
 	BoundaryConfig,
@@ -24,6 +32,154 @@ export type {
 	ResolveTransitionContext,
 } from "./types";
 
+export type Snapshot = MeasuredEntry;
+
+const registerSnapshot = (
+	tag: TagID,
+	screenKey: ScreenKey,
+	bounds: MeasuredDimensions,
+	styles: StyleProps = {},
+	ancestorKeys?: ScreenKey[],
+	navigatorKey?: NavigatorKey,
+	ancestorNavigatorKeys?: NavigatorKey[],
+) => {
+	"worklet";
+	setEntry(tag, screenKey, {
+		bounds,
+		styles,
+		ancestorKeys,
+		navigatorKey,
+		ancestorNavigatorKeys,
+	});
+};
+
+const registerBoundaryPresence = (
+	tag: TagID,
+	screenKey: ScreenKey,
+	ancestorKeys?: ScreenKey[],
+	boundaryConfig?: BoundaryConfig,
+	navigatorKey?: NavigatorKey,
+	ancestorNavigatorKeys?: NavigatorKey[],
+) => {
+	"worklet";
+	const currentPresenceCount = getEntry(tag, screenKey)?.presenceCount ?? 0;
+	setEntry(tag, screenKey, {
+		ancestorKeys,
+		boundaryConfig,
+		navigatorKey,
+		ancestorNavigatorKeys,
+		presenceCount: currentPresenceCount + 1,
+	});
+};
+
+const unregisterBoundaryPresence = (tag: TagID, screenKey: ScreenKey) => {
+	"worklet";
+	const currentPresenceCount = getEntry(tag, screenKey)?.presenceCount ?? 0;
+	if (currentPresenceCount > 1) {
+		setEntry(tag, screenKey, { presenceCount: currentPresenceCount - 1 });
+		return;
+	}
+
+	removeEntry(tag, screenKey);
+};
+
+const getLatestPendingSourceScreenKey = (tag: TagID): ScreenKey | null => {
+	"worklet";
+	return getPendingLink(tag)?.source.screenKey ?? null;
+};
+
+const setLinkSource = (
+	tag: TagID,
+	screenKey: ScreenKey,
+	bounds: MeasuredDimensions,
+	styles?: StyleProps,
+	ancestorKeys?: ScreenKey[],
+	navigatorKey?: NavigatorKey,
+	ancestorNavigatorKeys?: NavigatorKey[],
+) => {
+	"worklet";
+	setSource(
+		"capture",
+		tag,
+		screenKey,
+		bounds,
+		styles,
+		ancestorKeys,
+		navigatorKey,
+		ancestorNavigatorKeys,
+	);
+};
+
+const updateLinkSource = (
+	tag: TagID,
+	screenKey: ScreenKey,
+	bounds: MeasuredDimensions,
+	styles?: StyleProps,
+	ancestorKeys?: ScreenKey[],
+	navigatorKey?: NavigatorKey,
+	ancestorNavigatorKeys?: NavigatorKey[],
+) => {
+	"worklet";
+	setSource(
+		"refresh",
+		tag,
+		screenKey,
+		bounds,
+		styles,
+		ancestorKeys,
+		navigatorKey,
+		ancestorNavigatorKeys,
+	);
+};
+
+const setLinkDestination = (
+	tag: TagID,
+	screenKey: ScreenKey,
+	bounds: MeasuredDimensions,
+	styles?: StyleProps,
+	ancestorKeys?: ScreenKey[],
+	expectedSourceScreenKey?: ScreenKey,
+	navigatorKey?: NavigatorKey,
+	ancestorNavigatorKeys?: NavigatorKey[],
+) => {
+	"worklet";
+	setDestination(
+		"attach",
+		tag,
+		screenKey,
+		bounds,
+		styles,
+		ancestorKeys,
+		expectedSourceScreenKey,
+		navigatorKey,
+		ancestorNavigatorKeys,
+	);
+};
+
+const updateLinkDestination = (
+	tag: TagID,
+	screenKey: ScreenKey,
+	bounds: MeasuredDimensions,
+	styles?: StyleProps,
+	ancestorKeys?: ScreenKey[],
+	expectedSourceScreenKey?: ScreenKey,
+	navigatorKey?: NavigatorKey,
+	ancestorNavigatorKeys?: NavigatorKey[],
+) => {
+	"worklet";
+	setDestination(
+		"refresh",
+		tag,
+		screenKey,
+		bounds,
+		styles,
+		ancestorKeys,
+		expectedSourceScreenKey,
+		navigatorKey,
+		ancestorNavigatorKeys,
+	);
+};
+
 export const BoundStore = {
 	entry: {
 		set: setEntry,
@@ -50,4 +206,30 @@ export const BoundStore = {
 		byAncestor: clearByAncestor,
 		byBranch: clearByBranch,
 	},
+	// Legacy flat aliases used by the v3 tests and older internals. New code should
+	// prefer the explicit entry/link/group/cleanup namespaces above.
+	registerSnapshot,
+	getSnapshot: getMeasuredEntry,
+	setLinkSource,
+	updateLinkSource,
+	setLinkDestination,
+	updateLinkDestination,
+	getActiveLink,
+	resolveTransitionPair,
+	hasPendingLink: (tag: TagID) => getPendingLink(tag) !== null,
+	hasPendingLinkFromSource: (tag: TagID, sourceScreenKey: ScreenKey) =>
+		getPendingLink(tag, sourceScreenKey) !== null,
+	getLatestPendingSourceScreenKey,
+	hasSourceLink,
+	hasDestinationLink,
+	registerBoundaryPresence,
+	unregisterBoundaryPresence,
+	hasBoundaryPresence: (tag: TagID, screenKey: ScreenKey) =>
+		(getEntry(tag, screenKey)?.presenceCount ?? 0) > 0,
+	getBoundaryConfig: getEntryConfig,
+	setGroupActiveId,
+	getGroupActiveId,
+	clear,
+	clearByAncestor,
+	clearByBranch,
 };

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

@@ -102,6 +102,14 @@ const applyEntryPatch = (entry: ScreenEntry, patch: EntryPatch) => {
 			entry.ancestorNavigatorKeys = patch.ancestorNavigatorKeys;
 		}
 	}
+
+	if (patch.presenceCount !== undefined) {
+		if (patch.presenceCount === null) {
+			delete entry.presenceCount;
+		} else {
+			entry.presenceCount = patch.presenceCount;
+		}
+	}
 };
 
 const findMatchingScreenEntry = (

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

@@ -130,6 +130,7 @@ function resolveTransitionPair(
 	const destinationStyles = matchedLink?.destination?.styles ?? null;
 	const sourceScreenKey = matchedLink?.source?.screenKey ?? null;
 	const destinationScreenKey = matchedLink?.destination?.screenKey ?? null;
+	const usedPending = matchedLink ? matchedLink.destination === null : false;
 
 	return {
 		sourceBounds,
@@ -138,6 +139,7 @@ function resolveTransitionPair(
 		destinationStyles,
 		sourceScreenKey,
 		destinationScreenKey,
+		usedPending,
 	};
 }
 

package/src/shared/stores/bounds/types.ts

@@ -23,6 +23,7 @@ export type Entry = {
 	ancestorKeys?: ScreenKey[];
 	navigatorKey?: NavigatorKey;
 	ancestorNavigatorKeys?: NavigatorKey[];
+	presenceCount?: number;
 };
 
 export type MeasuredEntry = Entry & {
@@ -36,6 +37,7 @@ export type EntryPatch = {
 	ancestorKeys?: ScreenKey[] | null;
 	navigatorKey?: NavigatorKey | null;
 	ancestorNavigatorKeys?: NavigatorKey[] | null;
+	presenceCount?: number | null;
 };
 
 export type ScreenIdentifier = {
@@ -64,6 +66,7 @@ export type ResolvedTransitionPair = {
 	destinationStyles: StyleProps | null;
 	sourceScreenKey: ScreenKey | null;
 	destinationScreenKey: ScreenKey | null;
+	usedPending: boolean;
 };
 
 export type ScreenEntry = Entry;

package/src/shared/utils/bounds/helpers/create-interpolators.ts

@@ -4,7 +4,7 @@ import {
 	type MeasuredDimensions,
 } from "react-native-reanimated";
 import { ENTER_RANGE, EXIT_RANGE } from "../../../constants";
-import { BoundStore } from "../../../stores/bounds";
+import { getMeasuredEntry } from "../../../stores/bounds/internals/registry";
 import type { ScreenInterpolationProps } from "../../../types/animation.types";
 import type { BoundId } from "../types/options";
 import type { LinkAccessor } from "./create-link-accessor";
@@ -51,12 +51,9 @@ export const createInterpolators = ({
 		const normalizedTag = String(tag);
 
 		const currentMeasuredEntry = currentKey
-			? BoundStore.entry.getMeasured(normalizedTag, currentKey)
+			? getMeasuredEntry(normalizedTag, currentKey)
 			: null;
-		const targetMeasuredEntry = BoundStore.entry.getMeasured(
-			normalizedTag,
-			targetKey,
-		);
+		const targetMeasuredEntry = getMeasuredEntry(normalizedTag, targetKey);
 
 		const currentValue = currentMeasuredEntry?.bounds?.[property] ?? fb;
 		const targetValue = targetMeasuredEntry?.bounds?.[property] ?? fb;

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

@@ -1,4 +1,8 @@
-import { BoundStore, type MeasuredEntry } from "../../../stores/bounds";
+import {
+	getActiveLink,
+	getMeasuredEntry,
+} from "../../../stores/bounds/internals/registry";
+import type { MeasuredEntry } from "../../../stores/bounds/types";
 import type { ScreenInterpolationProps } from "../../../types/animation.types";
 import type { BoundsLink } from "../../../types/bounds.types";
 import type { BoundId } from "../types/options";
@@ -17,7 +21,7 @@ export const createLinkAccessor = (getProps: GetProps): LinkAccessor => {
 	const getMeasured = (tag: BoundId, key?: string): MeasuredEntry | null => {
 		"worklet";
 		if (!key) return null;
-		return BoundStore.entry.getMeasured(String(tag), key);
+		return getMeasuredEntry(String(tag), key);
 	};
 
 	const getSnapshot = (tag: BoundId, key?: string): MeasuredEntry | null => {
@@ -28,10 +32,7 @@ export const createLinkAccessor = (getProps: GetProps): LinkAccessor => {
 	const getLink = (tag: BoundId): BoundsLink | null => {
 		"worklet";
 		const props = getProps();
-		const link = BoundStore.link.getActive(
-			String(tag),
-			props.current?.route.key,
-		);
+		const link = getActiveLink(String(tag), props.current?.route.key);
 		if (!link) return null;
 		return {
 			source: link.source

package/src/shared/utils/bounds/helpers/prepare-bound-styles.ts

@@ -1,7 +1,9 @@
 import {
-	BoundStore,
-	type ResolvedTransitionPair,
-} from "../../../stores/bounds";
+	getGroupActiveId,
+	setGroupActiveId,
+} from "../../../stores/bounds/internals/groups";
+import { getEntryConfig } from "../../../stores/bounds/internals/registry";
+import type { ResolvedTransitionPair } from "../../../stores/bounds/types";
 import type { ScreenInterpolationProps } from "../../../types/animation.types";
 import { DEFAULT_BOUNDS_OPTIONS } from "../constants";
 import type {
@@ -40,9 +42,7 @@ export const buildBoundsOptions = ({
 	const currentScreenKey = props.current?.route.key;
 
 	const boundaryConfig =
-		tag && currentScreenKey
-			? BoundStore.entry.getConfig(tag, currentScreenKey)
-			: null;
+		tag && currentScreenKey ? getEntryConfig(tag, currentScreenKey) : null;
 
 	const resolved = {
 		...DEFAULT_BOUNDS_OPTIONS,
@@ -61,9 +61,9 @@ const syncGroupActiveMember = (group?: string, id?: BoundId) => {
 
 	const normalizedId = String(id);
 
-	if (BoundStore.group.getActiveId(group) === normalizedId) return;
+	if (getGroupActiveId(group) === normalizedId) return;
 
-	BoundStore.group.setActiveId(group, normalizedId);
+	setGroupActiveId(group, normalizedId);
 };
 
 export const prepareBoundStyles = <T extends BoundsOptions>({

package/src/shared/utils/bounds/helpers/styles/compute.ts

@@ -5,10 +5,8 @@ import {
 	FULLSCREEN_DIMENSIONS,
 	NO_STYLES,
 } from "../../../../constants";
-import {
-	BoundStore,
-	type ResolvedTransitionPair,
-} from "../../../../stores/bounds";
+import { resolveTransitionPair } from "../../../../stores/bounds/internals/resolver";
+import type { ResolvedTransitionPair } from "../../../../stores/bounds/types";
 import type { ScreenTransitionState } from "../../../../types/animation.types";
 import type { Layout } from "../../../../types/screen.types";
 import type {
@@ -54,7 +52,7 @@ const resolveStartEnd = (params: {
 
 	const resolvedPair =
 		params.resolvedPair ??
-		BoundStore.link.getPair(String(params.id), {
+		resolveTransitionPair(String(params.id), {
 			currentScreenKey,
 			previousScreenKey,
 			nextScreenKey,

package/src/shared/utils/bounds/zoom/build.ts

@@ -5,10 +5,9 @@ import {
 	NAVIGATION_MASK_ELEMENT_STYLE_ID,
 	VISIBLE_STYLE,
 } from "../../../constants";
-import {
-	BoundStore,
-	type ResolvedTransitionPair,
-} from "../../../stores/bounds";
+import { getGroupActiveId } from "../../../stores/bounds/internals/groups";
+import { resolveTransitionPair } from "../../../stores/bounds/internals/resolver";
+import type { ResolvedTransitionPair } from "../../../stores/bounds/types";
 import type { TransitionInterpolatedStyle } from "../../../types/animation.types";
 import type { Layout } from "../../../types/screen.types";
 import { prepareBoundStyles } from "../helpers/prepare-bound-styles";
@@ -176,7 +175,7 @@ export function buildZoomStyles({
 	let buildEffectiveTag = tag;
 	if (isGroup) {
 		const group = tag.split(":")[0];
-		const groupActiveTag = BoundStore.group.getActiveId(group)?.split(":")[0];
+		const groupActiveTag = getGroupActiveId(group)?.split(":")[0];
 		buildEffectiveTag = `${group}:${groupActiveTag ?? tag.split(":")[1]}`;
 	}
 
@@ -201,7 +200,7 @@ export function buildZoomStyles({
 		scaleMode: ZOOM_SHARED_OPTIONS.scaleMode,
 	} as const;
 
-	const linkPair = BoundStore.link.getPair(buildEffectiveTag, {
+	const linkPair = resolveTransitionPair(buildEffectiveTag, {
 		currentScreenKey: currentRouteKey,
 		previousScreenKey: previousRouteKey,
 		nextScreenKey: nextRouteKey,