react-native-screen-transitions 3.5.1 → 3.6.0-alpha.0

package/lib/typescript/shared/utils/bounds/{zoom → navigation/zoom}/types.d.ts

@@ -1,5 +1,5 @@
-import { NAVIGATION_MASK_CONTAINER_STYLE_ID, NAVIGATION_MASK_ELEMENT_STYLE_ID } from "../../../constants";
-import type { BoundsInterpolationProps, BoundsNavigationZoomOptions, BoundsNavigationZoomStyle } from "../../../types/bounds.types";
+import { NAVIGATION_MASK_CONTAINER_STYLE_ID, NAVIGATION_MASK_ELEMENT_STYLE_ID } from "../../../../constants";
+import type { BoundsInterpolationProps, BoundsNavigationZoomOptions, BoundsNavigationZoomStyle } from "../../../../types/bounds.types";
 export type ZoomInterpolatedStyle = BoundsNavigationZoomStyle & {
     [NAVIGATION_MASK_CONTAINER_STYLE_ID]?: BoundsNavigationZoomStyle[typeof NAVIGATION_MASK_CONTAINER_STYLE_ID];
     [NAVIGATION_MASK_ELEMENT_STYLE_ID]?: BoundsNavigationZoomStyle[typeof NAVIGATION_MASK_ELEMENT_STYLE_ID];

package/lib/typescript/shared/utils/bounds/navigation/zoom/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/utils/bounds/navigation/zoom/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,kCAAkC,EAClC,gCAAgC,EAChC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EACX,wBAAwB,EACxB,2BAA2B,EAC3B,yBAAyB,EACzB,MAAM,gCAAgC,CAAC;AAExC,MAAM,MAAM,qBAAqB,GAAG,yBAAyB,GAAG;IAC/D,CAAC,kCAAkC,CAAC,CAAC,EAAE,yBAAyB,CAAC,OAAO,kCAAkC,CAAC,CAAC;IAC5G,CAAC,gCAAgC,CAAC,CAAC,EAAE,yBAAyB,CAAC,OAAO,gCAAgC,CAAC,CAAC;CACxG,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,2BAA2B,CAAC;IAC1C,KAAK,EAAE,wBAAwB,CAAC;CAChC,CAAC"}

package/lib/typescript/shared/utils/bounds/types/options.d.ts

@@ -82,7 +82,16 @@ export type BoundsOptions = {
      */
     space?: BoundsSpace;
     /**
-     * The gesture offsets to apply to the bounds.
+     * The x/y offsets to apply to the bounds.
+     */
+    offset?: {
+        x?: number;
+        y?: number;
+    };
+    /**
+     * The x/y offsets to apply to the bounds.
+     *
+     * @deprecated Use `offset` instead.
      */
     gestures?: {
         x?: number;

package/lib/typescript/shared/utils/bounds/types/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../../../../src/shared/utils/bounds/types/options.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../../../../src/shared/utils/bounds/types/options.ts"],"names":[],"mappings":"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"}

package/lib/typescript/shared/utils/resolve-chain-target.d.ts

@@ -0,0 +1,11 @@
+export type ChainTarget = "self" | "parent" | "root" | {
+    ancestor: number;
+};
+type ResolveChainTargetParams<T> = {
+    target: ChainTarget | undefined;
+    self: T | null | undefined;
+    ancestors: readonly T[];
+};
+export declare function resolveChainTarget<T>({ target, self, ancestors, }: ResolveChainTargetParams<T>): T | null;
+export {};
+//# sourceMappingURL=resolve-chain-target.d.ts.map

package/lib/typescript/shared/utils/resolve-chain-target.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-chain-target.d.ts","sourceRoot":"","sources":["../../../../src/shared/utils/resolve-chain-target.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5E,KAAK,wBAAwB,CAAC,CAAC,IAAI;IAClC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;CACxB,CAAC;AAQF,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,EACrC,MAAM,EACN,IAAI,EACJ,SAAS,GACT,EAAE,wBAAwB,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CA2BxC"}

package/lib/typescript/shared/utils/resolve-screen-transition-options.d.ts

@@ -1,5 +1,4 @@
 import type { ScreenTransitionConfig, SheetScrollGestureBehavior } from "../types/screen.types";
 export declare const DEFAULT_SHEET_SCROLL_GESTURE_BEHAVIOR: SheetScrollGestureBehavior;
 export declare const resolveSheetScrollGestureBehavior: (options: Pick<ScreenTransitionConfig, "sheetScrollGestureBehavior" | "expandViaScrollView">) => SheetScrollGestureBehavior;
-export declare const resolveNavigationMaskEnabled: (options: Pick<ScreenTransitionConfig, "navigationMaskEnabled" | "maskEnabled">) => boolean;
 //# sourceMappingURL=resolve-screen-transition-options.d.ts.map

package/lib/typescript/shared/utils/resolve-screen-transition-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-screen-transition-options.d.ts","sourceRoot":"","sources":["../../../../src/shared/utils/resolve-screen-transition-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,sBAAsB,EACtB,0BAA0B,EAC1B,MAAM,uBAAuB,CAAC;AAE/B,eAAO,MAAM,qCAAqC,EAAE,0BAC9B,CAAC;AAEvB,eAAO,MAAM,iCAAiC,GAC7C,SAAS,IAAI,CACZ,sBAAsB,EACtB,4BAA4B,GAAG,qBAAqB,CACpD,KACC,0BAUF,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACxC,SAAS,IAAI,CACZ,sBAAsB,EACtB,uBAAuB,GAAG,aAAa,CACvC,KACC,OAMF,CAAC"}
+{"version":3,"file":"resolve-screen-transition-options.d.ts","sourceRoot":"","sources":["../../../../src/shared/utils/resolve-screen-transition-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,sBAAsB,EACtB,0BAA0B,EAC1B,MAAM,uBAAuB,CAAC;AAE/B,eAAO,MAAM,qCAAqC,EAAE,0BAC9B,CAAC;AAEvB,eAAO,MAAM,iCAAiC,GAC7C,SAAS,IAAI,CACZ,sBAAsB,EACtB,4BAA4B,GAAG,qBAAqB,CACpD,KACC,0BAUF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "react-native-screen-transitions",
-	"version": "3.5.1",
+	"version": "3.6.0-alpha.0",
 	"description": "Easy screen transitions for React Native and Expo",
 	"author": "Ed",
 	"license": "MIT",
@@ -43,17 +43,7 @@
 		"build": "bob build",
 		"lint": "biome check ./src",
 		"typecheck": "tsc -p tsconfig.typecheck.json",
-		"prepublishOnly": "bun run build",
-		"release": "release-it",
-		"release:patch": "release-it patch",
-		"release:stable": "release-it",
-		"release:beta": "release-it --preRelease=beta",
-		"release:alpha": "release-it --preRelease=alpha",
-		"release:rc": "release-it --preRelease=rc",
-		"release:dry-run": "release-it --dry-run",
-		"release:alpha:dry-run": "release-it --preRelease=alpha --dry-run",
-		"release:beta:dry-run": "release-it --preRelease=beta --dry-run",
-		"release:rc:dry-run": "release-it --preRelease=rc --dry-run"
+		"prepublishOnly": "bun run build"
 	},
 	"keywords": [
 		"react-native",
@@ -84,11 +74,9 @@
 		"react-native-screens": ">=4.4.0"
 	},
 	"devDependencies": {
-		"@release-it/conventional-changelog": "^10.0.1",
 		"@testing-library/react-native": "13.3.3",
 		"@types/react": "~19.1.10",
 		"react-native-builder-bob": "0.39.0",
-		"release-it": "^19.0.4",
 		"typescript": "catalog:"
 	},
 	"react-native-builder-bob": {
@@ -105,29 +93,5 @@
 			]
 		]
 	},
-	"release-it": {
-		"git": {
-			"commitMessage": "chore: release ${version}",
-			"tagName": "v${version}",
-			"commitArgs": [
-				"-n"
-			]
-		},
-		"npm": {
-			"publish": true
-		},
-		"github": {
-			"release": true
-		},
-		"plugins": {
-			"@release-it/conventional-changelog": {
-				"infile": "CHANGELOG.md",
-				"preset": {
-					"name": "angular"
-				},
-				"path": "."
-			}
-		}
-	},
 	"gitHead": "888d4df9936ec0e3b8221bea7cd81115e6301693"
 }

package/src/shared/animation/snap-to.ts

@@ -1,9 +1,9 @@
 import { runOnUI } from "react-native-reanimated";
-import { DefaultSnapSpec } from "../configs/specs";
 import { AnimationStore } from "../stores/animation.store";
 import type { HistoryEntry } from "../stores/history.store";
 import { SystemStore } from "../stores/system.store";
 import { animateToProgress } from "../utils/animation/animate-to-progress";
+import { resolveSnapTransitionSpec } from "../utils/animation/resolve-snap-transition-spec";
 import { logger } from "../utils/logger";
 import { resolveSnapTargetEntry } from "./resolve-snap-target";
 
@@ -17,7 +17,7 @@ const getSortedSnapPoints = (
 	const autoVal = SystemStore.getValue(
 		descriptor.route.key,
 		"resolvedAutoSnapPoint",
-	).value;
+	).get();
 
 	const resolved = snapPoints
 		.map((p) => (p === "auto" ? autoVal : p))
@@ -52,14 +52,16 @@ export function snapDescriptorToIndex(
 
 	runOnUI(() => {
 		"worklet";
+		const currentProgress = animations.progress.get();
+
 		animateToProgress({
 			target: targetProgress,
 			animations,
 			targetProgress: targetProgressValue,
-			spec: {
-				open: descriptor.options.transitionSpec?.expand ?? DefaultSnapSpec,
-				close: descriptor.options.transitionSpec?.collapse ?? DefaultSnapSpec,
-			},
+			spec: resolveSnapTransitionSpec(
+				descriptor.options.transitionSpec,
+				targetProgress < currentProgress ? "collapse" : "expand",
+			),
 		});
 	})();
 

package/src/shared/components/create-boundary-component/components/boundary-target.tsx

@@ -1,7 +1,8 @@
 import type React from "react";
-import { memo, useLayoutEffect } from "react";
+import { memo, useLayoutEffect, useMemo } from "react";
 import type { View } from "react-native";
 import Animated, { useAnimatedRef } from "react-native-reanimated";
+import { prepareStyleForBounds } from "../../../utils/bounds/helpers/styles/styles";
 import {
 	TARGET_OUTSIDE_OWNER_WARNING,
 	useBoundaryOwnerContext,
@@ -18,6 +19,7 @@ export const BoundaryTarget = memo(function BoundaryTarget(
 	const registerTargetRef = ownerContext?.registerTargetRef;
 	const unregisterTargetRef = ownerContext?.unregisterTargetRef;
 	const isActiveTarget = ownerContext?.activeTargetRef === targetAnimatedRef;
+	const preparedStyles = useMemo(() => prepareStyleForBounds(style), [style]);
 
 	useLayoutEffect(() => {
 		if (!registerTargetRef || !unregisterTargetRef) {
@@ -27,11 +29,16 @@ export const BoundaryTarget = memo(function BoundaryTarget(
 			return;
 		}
 
-		registerTargetRef(targetAnimatedRef);
+		registerTargetRef(targetAnimatedRef, preparedStyles);
 		return () => {
 			unregisterTargetRef(targetAnimatedRef);
 		};
-	}, [registerTargetRef, unregisterTargetRef, targetAnimatedRef]);
+	}, [
+		registerTargetRef,
+		unregisterTargetRef,
+		targetAnimatedRef,
+		preparedStyles,
+	]);
 
 	return (
 		<Animated.View

package/src/shared/components/create-boundary-component/create-boundary-component.tsx

@@ -15,11 +15,11 @@ import Animated, {
 import { NO_STYLES } from "../../constants";
 import { useDescriptorDerivations } from "../../providers/screen/descriptors";
 import { useScreenStyles } from "../../providers/screen/styles";
-import { setGroupActiveId } from "../../stores/bounds/internals/groups";
+import { setGroupInitialId } from "../../stores/bounds/internals/groups";
 import { prepareStyleForBounds } from "../../utils/bounds/helpers/styles/styles";
 import { useBoundaryPresence } from "./hooks/use-boundary-presence";
-import { useCaptureDestinationBoundary } from "./hooks/use-capture-destination-boundary";
-import { useCaptureSourceBoundary } from "./hooks/use-capture-source-boundary";
+import { useInitialDestinationMeasurement } from "./hooks/use-initial-destination-measurement";
+import { useInitialSourceMeasurement } from "./hooks/use-initial-source-measurement";
 import { useMeasurer } from "./hooks/use-measurer";
 import { useRefreshBoundary } from "./hooks/use-refresh-boundary";
 import {
@@ -92,7 +92,10 @@ export function createBoundaryComponent<P extends object>(
 			};
 		}, [anchor, scaleMode, target, method]);
 
-		const preparedStyles = useMemo(() => prepareStyleForBounds(style), [style]);
+		const ownerPreparedStyles = useMemo(
+			() => prepareStyleForBounds(style),
+			[style],
+		);
 		const { stylesMap } = useScreenStyles();
 
 		const associatedStyles = useAnimatedStyle(() => {
@@ -110,10 +113,13 @@ export function createBoundaryComponent<P extends object>(
 			};
 		});
 
-		const { contextValue, measuredRef, hasActiveTarget } = useBoundaryOwner({
-			ownerRef,
-			associatedTargetStyles: runtimeEnabled ? associatedStyles : undefined,
-		});
+		const { contextValue, measuredRef, hasActiveTarget, targetPreparedStyles } =
+			useBoundaryOwner({
+				ownerRef,
+				associatedTargetStyles: runtimeEnabled ? associatedStyles : undefined,
+			});
+
+		const preparedStyles = targetPreparedStyles ?? ownerPreparedStyles;
 
 		const measureBoundary = useMeasurer({
 			enabled,
@@ -141,26 +147,20 @@ export function createBoundaryComponent<P extends object>(
 			boundaryConfig,
 		});
 
-		// On the source screen, capture source bounds when a matching destination
-		// appears on the next screen.
-		useCaptureSourceBoundary({
+		// Initial source measurement: capture source bounds when a matching
+		// destination appears on the next screen.
+		useInitialSourceMeasurement({
 			enabled: runtimeEnabled,
-			sharedBoundTag,
-			id,
-			group,
 			nextScreenKey,
 			measureBoundary,
 		});
 
-		// Destination completion path: hold lifecycle start until the first valid
-		// destination measurement attaches, then release the pending transition.
-		useCaptureDestinationBoundary({
+		// Initial destination measurement: hold lifecycle start until the first
+		// valid destination measurement attaches, then release the pending transition.
+		useInitialDestinationMeasurement({
 			sharedBoundTag,
 			enabled: shouldRunDestinationEffects,
-			id,
-			group,
 			currentScreenKey,
-			expectedSourceScreenKey: preferredSourceScreenKey,
 			measureBoundary,
 		});
 
@@ -183,7 +183,7 @@ export function createBoundaryComponent<P extends object>(
 			(...args: unknown[]) => {
 				// Press path has priority: capture source before user onPress/navigation.
 				if (group) {
-					runOnUI(setGroupActiveId)(group, String(id));
+					runOnUI(setGroupInitialId)(group, String(id));
 				}
 				runOnUI(measureBoundary)({ intent: "capture-source" });
 

package/src/shared/{stores/bounds → components/create-boundary-component}/helpers/apply-measured-bounds-writes.ts

@@ -1,5 +1,9 @@
 import type { MeasuredDimensions, StyleProps } from "react-native-reanimated";
-import { setDestination, setEntry, setSource } from "../internals/registry";
+import { setEntry } from "../../../stores/bounds/internals/entries";
+import {
+	setDestination,
+	setSource,
+} from "../../../stores/bounds/internals/links";
 
 type ApplyMeasuredBoundsWritesParams = {
 	sharedBoundTag: string;
@@ -9,7 +13,6 @@ type ApplyMeasuredBoundsWritesParams = {
 	ancestorKeys: string[];
 	navigatorKey?: string;
 	ancestorNavigatorKeys?: string[];
-	shouldWriteEntry?: boolean;
 	shouldSetSource?: boolean;
 	shouldUpdateSource?: boolean;
 	shouldSetDestination?: boolean;
@@ -29,7 +32,6 @@ export const applyMeasuredBoundsWrites = (
 		ancestorKeys,
 		navigatorKey,
 		ancestorNavigatorKeys,
-		shouldWriteEntry,
 		shouldSetSource,
 		shouldUpdateSource,
 		shouldSetDestination,
@@ -37,15 +39,11 @@ export const applyMeasuredBoundsWrites = (
 		expectedSourceScreenKey,
 	} = params;
 
-	if (shouldWriteEntry) {
-		setEntry(sharedBoundTag, currentScreenKey, {
-			bounds: measured,
-			styles: preparedStyles,
-			ancestorKeys,
-			navigatorKey,
-			ancestorNavigatorKeys,
-		});
-	}
+	// Set the bounds entry on every measure to avoid any stale measurements
+	// for the public read API.
+	setEntry(sharedBoundTag, currentScreenKey, {
+		bounds: measured,
+	});
 
 	if (shouldSetSource) {
 		setSource(

package/src/shared/components/create-boundary-component/helpers/resolve-pending-source-key.ts

@@ -1,7 +1,7 @@
 import {
 	getPendingLink,
 	hasSourceLink,
-} from "../../../stores/bounds/internals/registry";
+} from "../../../stores/bounds/internals/links";
 
 export const resolvePendingSourceKey = (
 	sharedBoundTag: string,

package/src/shared/components/create-boundary-component/hooks/helpers/boundary-link-context.ts

@@ -0,0 +1,48 @@
+import {
+	getPendingLink,
+	hasDestinationLink,
+	hasSourceLink,
+} from "../../../../stores/bounds/internals/links";
+import { resolvePendingSourceKey } from "../../helpers/resolve-pending-source-key";
+
+export type LinkContext = {
+	/**
+	 * The source screen this measurement should pair with, if one can be
+	 * resolved. Disambiguates between multiple candidate sources in the
+	 * registry (e.g. nested or repeat presentations of the same tag).
+	 */
+	expectedSourceScreenKey: string | undefined;
+	/** A pending link exists waiting for a destination to attach. */
+	hasPendingLink: boolean;
+	/** The expected source screen has a captured source ready to attach to. */
+	hasAttachableSourceLink: boolean;
+	/** The current screen is already registered as the source for this tag. */
+	hasSourceLink: boolean;
+	/** The current screen is already registered as the destination for this tag. */
+	hasDestinationLink: boolean;
+};
+
+export const createLinkContext = (params: {
+	sharedBoundTag: string;
+	currentScreenKey: string;
+	preferredSourceScreenKey?: string;
+}): LinkContext => {
+	"worklet";
+	const { sharedBoundTag, currentScreenKey, preferredSourceScreenKey } = params;
+
+	const expectedSourceScreenKey =
+		resolvePendingSourceKey(sharedBoundTag, preferredSourceScreenKey) ??
+		undefined;
+	const hasPendingLink =
+		getPendingLink(sharedBoundTag, expectedSourceScreenKey) !== null;
+
+	return {
+		expectedSourceScreenKey,
+		hasPendingLink,
+		hasAttachableSourceLink: expectedSourceScreenKey
+			? hasSourceLink(sharedBoundTag, expectedSourceScreenKey)
+			: false,
+		hasSourceLink: hasSourceLink(sharedBoundTag, currentScreenKey),
+		hasDestinationLink: hasDestinationLink(sharedBoundTag, currentScreenKey),
+	};
+};

package/src/shared/components/create-boundary-component/hooks/helpers/measurement-rules.ts

@@ -1,10 +1,5 @@
 import type { MeasureIntent } from "../../types";
 
-type PresenceLikeEntry = {
-	count: number;
-	ancestorKeys?: string[];
-};
-
 export type MeasureIntentFlags = {
 	captureSource: boolean;
 	completeDestination: boolean;
@@ -21,11 +16,6 @@ export type MeasureWritePlan = {
 	wantsDestinationWrite: boolean;
 };
 
-export type DeferredMeasurementAction =
-	| "clear-pending"
-	| "queue-or-flush"
-	| "noop";
-
 export const getMeasureIntentFlags = (
 	intent?: MeasureIntent | readonly MeasureIntent[],
 ): MeasureIntentFlags => {
@@ -63,7 +53,7 @@ export const getMeasureIntentFlags = (
 	return flags;
 };
 
-export const resolveMeasureWritePlan = (params: {
+export const buildMeasurementWritePlan = (params: {
 	intents: MeasureIntentFlags;
 	hasPendingLink: boolean;
 	hasSourceLink: boolean;
@@ -98,175 +88,3 @@ export const resolveMeasureWritePlan = (params: {
 		wantsDestinationWrite: completeDestination || refreshDestination,
 	};
 };
-
-/**
- * Temporarily removed destination-match gating for auto source capture.
- *
- * For now, any enabled boundary on a source screen will eagerly capture when a
- * next screen exists, even if no matching destination boundary has registered
- * presence yet. The previous behavior waited for an explicit destination match
- * before allowing source capture.
- */
-export const resolveAutoSourceCaptureSignal = (params: {
-	enabled: boolean;
-	nextScreenKey?: string;
-	tagPresence?: Record<string, PresenceLikeEntry>;
-}): string | 0 => {
-	"worklet";
-	const { enabled, nextScreenKey } = params;
-	if (!enabled) return 0;
-	if (!nextScreenKey) return 0;
-
-	/**
-	 * Temporarily removed destination-match gating for auto source capture.
-	 *
-	 * For now, any enabled boundary on a source screen will eagerly capture when
-	 * a next screen exists, even if no matching destination boundary has
-	 * registered presence yet. The previous behavior waited for an explicit
-	 * destination match before allowing source capture.
-	 */
-	// const tagPresence = params.tagPresence;
-	// if (!tagPresence) return 0;
-	//
-	// const direct = tagPresence[nextScreenKey];
-	// if (direct && direct.count > 0) return nextScreenKey;
-	//
-	// for (const screenKey in tagPresence) {
-	// 	const entry = tagPresence[screenKey];
-	// 	if (entry.ancestorKeys?.includes(nextScreenKey)) {
-	// 		return nextScreenKey;
-	// 	}
-	// }
-	//
-	// return 0;
-
-	return nextScreenKey;
-};
-
-export const resolvePendingDestinationCaptureSignal = (params: {
-	enabled: boolean;
-	resolvedSourceKey?: string | null;
-	hasAttachableSourceLink: boolean;
-	hasDestinationLink: boolean;
-}): string | 0 => {
-	"worklet";
-	const {
-		enabled,
-		resolvedSourceKey,
-		hasAttachableSourceLink,
-		hasDestinationLink,
-	} = params;
-	if (!enabled) return 0;
-	if (!resolvedSourceKey) return 0;
-	if (!hasAttachableSourceLink) return 0;
-	if (hasDestinationLink) return 0;
-	return resolvedSourceKey;
-};
-
-export const resolvePendingDestinationRetrySignal = (params: {
-	enabled: boolean;
-	retryCount: number;
-	maxRetries: number;
-	isAnimating: boolean;
-	hasDestinationLink: boolean;
-	progress: number;
-	retryProgressMax: number;
-	retryProgressBuckets: number;
-	resolvedSourceKey?: string | null;
-	hasAttachableSourceLink: boolean;
-}): number => {
-	"worklet";
-	const {
-		enabled,
-		retryCount,
-		maxRetries,
-		isAnimating,
-		hasDestinationLink,
-		progress,
-		retryProgressMax,
-		retryProgressBuckets,
-		resolvedSourceKey,
-		hasAttachableSourceLink,
-	} = params;
-
-	if (!enabled) return 0;
-	if (retryCount >= maxRetries) return 0;
-	if (!isAnimating) return 0;
-	if (hasDestinationLink) return 0;
-	if (progress <= 0 || progress >= retryProgressMax) return 0;
-	if (!resolvedSourceKey) return 0;
-	if (!hasAttachableSourceLink) return 0;
-
-	return Math.floor(progress * retryProgressBuckets) + 1;
-};
-
-export const resolvePrepareSourceMeasurementIntent = (params: {
-	hasSourceLink: boolean;
-	shouldRefreshExistingSource: boolean;
-}): MeasureIntent | null => {
-	"worklet";
-	if (!params.hasSourceLink) {
-		return "capture-source";
-	}
-
-	return params.shouldRefreshExistingSource ? "refresh-source" : null;
-};
-
-export const PREPARE_DESTINATION_MEASUREMENT_INTENT = [
-	"complete-destination",
-	"refresh-destination",
-] as const satisfies readonly MeasureIntent[];
-
-export const resolveGroupActiveMeasurementAction = (params: {
-	enabled: boolean;
-	isEligible: boolean;
-	memberId: string;
-	activeId: string | null;
-	previousActiveId: string | null;
-}): DeferredMeasurementAction => {
-	"worklet";
-	const { enabled, isEligible, memberId, activeId, previousActiveId } = params;
-
-	if (!enabled || !isEligible) return "noop";
-	if (activeId !== memberId) return "clear-pending";
-	if (activeId === memberId && activeId !== previousActiveId) {
-		return "queue-or-flush";
-	}
-	return "noop";
-};
-
-export const canFlushGroupActiveMeasurement = (params: {
-	enabled: boolean;
-	isEligible: boolean;
-	memberId: string;
-	activeId: string | null;
-}): boolean => {
-	"worklet";
-	const { enabled, isEligible, memberId, activeId } = params;
-	if (!enabled || !isEligible) return false;
-	return activeId === memberId;
-};
-
-export const shouldTriggerScrollSettledRefresh = (params: {
-	enabled: boolean;
-	group: string | undefined;
-	hasNextScreen: boolean;
-	hasSettledSignal: boolean;
-	signal: number;
-	previousSignal: number | null;
-}): boolean => {
-	"worklet";
-	const {
-		enabled,
-		group,
-		hasNextScreen,
-		hasSettledSignal,
-		signal,
-		previousSignal,
-	} = params;
-
-	if (!enabled) return false;
-	if (!group || !hasNextScreen || !hasSettledSignal) return false;
-	if (signal === 0 || signal === previousSignal) return false;
-	return true;
-};

package/src/shared/components/create-boundary-component/hooks/helpers/measurement.ts

@@ -1,23 +1,5 @@
 import type { MeasuredDimensions } from "react-native-reanimated";
 
-export const SNAPSHOT_EPSILON = 0.5;
-
-export const areMeasurementsEqual = (
-	a: MeasuredDimensions,
-	b: MeasuredDimensions,
-): boolean => {
-	"worklet";
-
-	return (
-		Math.abs(a.x - b.x) <= SNAPSHOT_EPSILON &&
-		Math.abs(a.y - b.y) <= SNAPSHOT_EPSILON &&
-		Math.abs(a.pageX - b.pageX) <= SNAPSHOT_EPSILON &&
-		Math.abs(a.pageY - b.pageY) <= SNAPSHOT_EPSILON &&
-		Math.abs(a.width - b.width) <= SNAPSHOT_EPSILON &&
-		Math.abs(a.height - b.height) <= SNAPSHOT_EPSILON
-	);
-};
-
 export const isMeasurementInViewport = (
 	measured: MeasuredDimensions,
 	viewportWidth: number,