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

package/src/shared/utils/bounds/helpers/{compute-bounds-styles.ts → styles/compute.ts}

@@ -6,22 +6,22 @@ import {
 	FULLSCREEN_DIMENSIONS,
 	HIDDEN_STYLE,
 	NO_STYLES,
-} from "../../../constants";
+} from "../../../../constants";
 import {
 	BoundStore,
 	type ResolvedTransitionPair,
-} from "../../../stores/bounds";
-import type { ScreenTransitionState } from "../../../types/animation.types";
-import type { Layout } from "../../../types/screen.types";
+} from "../../../../stores/bounds";
+import type { ScreenTransitionState } from "../../../../types/animation.types";
+import type { Layout } from "../../../../types/screen.types";
 import type {
 	BoundId,
 	BoundsComputeParams,
 	BoundsOptions,
-} from "../types/options";
+} from "../../types/options";
 import {
 	computeContentTransformGeometry,
 	computeRelativeGeometry,
-} from "./geometry";
+} from "../geometry";
 import {
 	composeContentStyle,
 	composeSizeAbsolute,
@@ -29,9 +29,9 @@ import {
 	composeTransformAbsolute,
 	composeTransformRelative,
 	type ElementComposeParams,
-} from "./style-composers";
+} from "./composers";
 
-const resolveBounds = (params: {
+const resolveStartEnd = (params: {
 	id: BoundId;
 	previous?: ScreenTransitionState;
 	current?: ScreenTransitionState;
@@ -75,7 +75,6 @@ const resolveBounds = (params: {
 			sourceScreenKey: resolvedPair.sourceScreenKey,
 			destinationScreenKey: resolvedPair.destinationScreenKey,
 			hasTargetOverride,
-			usedSnapshotDestination: resolvedPair.usedSnapshotDestination,
 		};
 	}
 
@@ -89,7 +88,6 @@ const resolveBounds = (params: {
 			sourceScreenKey: resolvedPair.sourceScreenKey,
 			destinationScreenKey: resolvedPair.destinationScreenKey,
 			hasTargetOverride,
-			usedSnapshotDestination: resolvedPair.usedSnapshotDestination,
 		};
 	}
 
@@ -113,7 +111,6 @@ const resolveBounds = (params: {
 		sourceScreenKey: resolvedPair.sourceScreenKey,
 		destinationScreenKey: resolvedPair.destinationScreenKey,
 		hasTargetOverride,
-		usedSnapshotDestination: resolvedPair.usedSnapshotDestination,
 	};
 };
 
@@ -138,9 +135,7 @@ export const computeBoundStyles = (
 		currentScreenKey,
 		sourceScreenKey,
 		destinationScreenKey,
-		hasTargetOverride,
-		usedSnapshotDestination,
-	} = resolveBounds({
+	} = resolveStartEnd({
 		id,
 		previous,
 		current,
@@ -160,15 +155,10 @@ export const computeBoundStyles = (
 	const ranges: readonly [number, number] = entering ? ENTER_RANGE : EXIT_RANGE;
 
 	if (computeOptions.method === "content") {
-		const ignoresSnapshotDestinationOwnership =
-			hasTargetOverride &&
-			usedSnapshotDestination &&
-			destinationScreenKey === sourceScreenKey;
 		const currentOwnsSource =
 			!!currentScreenKey &&
 			currentScreenKey === sourceScreenKey &&
-			(currentScreenKey !== destinationScreenKey ||
-				ignoresSnapshotDestinationOwnership);
+			currentScreenKey !== destinationScreenKey;
 		const contentStart = currentOwnsSource ? end : start;
 		const contentEnd = currentOwnsSource ? start : end;
 		const geometry = computeContentTransformGeometry({

package/src/shared/utils/bounds/helpers/{interpolate-style.ts → styles/interpolate-link-style.ts}

@@ -1,6 +1,6 @@
-import { ENTER_RANGE, EXIT_RANGE } from "../../../constants";
-import type { BoundsLink } from "../../../types/bounds.types";
-import { interpolateClamped } from "./interpolate";
+import { Extrapolation, interpolate } from "react-native-reanimated";
+import { ENTER_RANGE, EXIT_RANGE } from "../../../../constants";
+import type { BoundsLink } from "../../../../types/bounds.types";
 
 type InterpolateStyleOptions = {
 	fallback?: number;
@@ -34,5 +34,10 @@ export function interpolateLinkStyle(
 
 	const range = entering ? ENTER_RANGE : EXIT_RANGE;
 
-	return interpolateClamped(progress, range, [sourceValue, destValue]);
+	return interpolate(
+		progress,
+		range,
+		[sourceValue, destValue],
+		Extrapolation.CLAMP,
+	);
 }

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

@@ -1,75 +1,35 @@
-import { BoundStore, type ResolvedTransitionPair } from "../../stores/bounds";
-import type { ScreenInterpolationProps } from "../../types/animation.types";
 import type {
 	BoundsAccessor,
 	BoundsInterpolationProps,
 	BoundsNavigationZoomOptions,
 } from "../../types/bounds.types";
-import { buildBoundsOptions } from "./helpers/build-bounds-options";
-import { computeBoundStyles } from "./helpers/compute-bounds-styles";
-import { createInterpolators } from "./helpers/interpolators";
-import { createLinkAccessor } from "./helpers/link-accessor";
-import { resolveBoundTag } from "./helpers/resolve-bound-tag";
+import { createBoundTag } from "./helpers/create-bound-tag";
+import { createInterpolators } from "./helpers/create-interpolators";
+import { createLinkAccessor } from "./helpers/create-link-accessor";
+import { prepareBoundStyles } from "./helpers/prepare-bound-styles";
 import type { BoundsOptions } from "./types/options";
 import { buildZoomStyles } from "./zoom/build";
 
-const syncGroupActiveMember = (group?: string, id?: string | number) => {
-	"worklet";
-	if (!group) return;
-	if (id === undefined || id === null || id === "") return;
-
-	const normalizedId = String(id);
-	if (BoundStore.getGroupActiveId(group) === normalizedId) return;
-
-	BoundStore.setGroupActiveId(group, normalizedId);
-};
-
 export const createBoundsAccessor = (
 	getProps: () => BoundsInterpolationProps,
 ): BoundsAccessor => {
 	"worklet";
 
-	const computeForResolvedOptions = (
-		resolvedOptions: BoundsOptions,
-		props: Omit<ScreenInterpolationProps, "bounds">,
-		resolvedPair?: ResolvedTransitionPair,
-	) => {
-		"worklet";
-		return computeBoundStyles(
-			{
-				id: resolvedOptions.id,
-				previous: props.previous,
-				current: props.current,
-				next: props.next,
-				progress: props.progress,
-				dimensions: props.layouts.screen,
-			},
-			resolvedOptions,
-			resolvedPair,
-		);
-	};
-
-	const computeElementBoundsStyles = (params?: BoundsOptions) => {
+	const computeBounds = (params?: BoundsOptions) => {
 		"worklet";
 		const props = getProps();
-		const id = params?.id;
-		const group = params?.group;
-		syncGroupActiveMember(group, id);
-
-		const resolved = buildBoundsOptions({
+		const options = (params ?? { id: "" }) as BoundsOptions;
+		const computed = prepareBoundStyles({
 			props,
-			id,
-			group,
-			overrides: params,
-			mode: "style",
-			resolveBoundTag,
+			options,
 		});
-
-		const computed = computeForResolvedOptions(resolved, props);
 		// Navigation helpers are intentionally opinionated. Only the resolved
 		// tag from `id`/`group` is allowed to flow into `navigation.zoom()`;
 		// base bounds overrides like `target`, `anchor`, or `scaleMode` must not.
-		const navigationTag = resolveBoundTag({ id, group });
+		const navigationTag = createBoundTag({
+			id: options.id,
+			group: options.group,
+		});
 
 		const target = Object.isExtensible(computed) ? computed : { ...computed };
 
@@ -97,7 +57,7 @@ export const createBoundsAccessor = (
 		getLink,
 	});
 
-	return Object.assign(computeElementBoundsStyles, {
+	return Object.assign(computeBounds, {
 		getSnapshot,
 		getLink,
 		interpolateStyle,

package/src/shared/utils/bounds/types/options.ts

@@ -112,8 +112,9 @@ export type BoundsOptions = {
 	/**
 	 * Coordinate space selection.
 	 *
-	 * For `bounds({ ... })` element styles, space is normalized to `"relative"`.
-	 * `"absolute"` is reserved for internal navigation helpers (e.g. mask geometry).
+	 * - `"relative"` composes movement relative to the current element's layout box
+	 * - `"absolute"` composes movement in screen/window coordinates
+	 *
 	 * @default "relative"
 	 */
 	space?: BoundsSpace;