react-native-screen-transitions 3.7.1 → 3.8.0-beta.0

package/src/shared/providers/screen/gestures/pan/{pan-activation.ts → activation/use-pan-activation.ts}

@@ -4,17 +4,18 @@ import type {
 	GestureTouchEvent,
 } from "react-native-gesture-handler";
 import { type SharedValue, useSharedValue } from "react-native-reanimated";
-import { GestureStore } from "../../../../stores/gesture.store";
-import { GestureActivationState } from "../../../../types/gesture.types";
-import { useDescriptorDerivations } from "../../descriptors";
-import type { ScreenOptionsContextValue } from "../../options";
-import { resolvePanRuntime } from "../shared/runtime";
+import { GestureStore } from "../../../../../stores/gesture.store";
+import { GestureActivationState } from "../../../../../types/gesture.types";
+import { useDescriptorDerivations } from "../../../descriptors";
+import type { ScreenOptionsContextValue } from "../../../options";
+import { resolvePanRuntime } from "../../shared/runtime";
 import type {
 	DirectionClaimMap,
+	GestureCompositionActivation,
 	GestureDimensions,
 	PanGestureRuntime,
 	ScrollGestureState,
-} from "../types";
+} from "../../types";
 import { resolvePanActivationMoveDecision } from "./pan-activation-decision";
 
 interface UsePanActivationProps {
@@ -23,6 +24,7 @@ interface UsePanActivationProps {
 	runtime: SharedValue<PanGestureRuntime>;
 	screenOptions: ScreenOptionsContextValue;
 	dimensions: GestureDimensions;
+	gestureCompositionActivation: SharedValue<GestureCompositionActivation>;
 }
 
 export const usePanActivation = ({
@@ -31,6 +33,7 @@ export const usePanActivation = ({
 	runtime,
 	screenOptions,
 	dimensions,
+	gestureCompositionActivation,
 }: UsePanActivationProps) => {
 	const { currentScreenKey, parentScreenKey } = useDescriptorDerivations();
 
@@ -51,16 +54,12 @@ export const usePanActivation = ({
 			stateManager: GestureStateManager | undefined,
 		) => {
 			"worklet";
-			const { participation, policy } = resolvePanRuntime(
+			const { participation } = resolvePanRuntime(
 				runtime.get(),
 				screenOptions.get(),
 			);
 
-			if (
-				!participation.canTrackGesture ||
-				!policy.enabled ||
-				event.numberOfTouches !== 1
-			) {
+			if (!participation.canTrackGesture) {
 				gestureActivationState.set(GestureActivationState.FAILED);
 				stateManager?.fail();
 				return;
@@ -82,6 +81,16 @@ export const usePanActivation = ({
 				runtime.get(),
 				screenOptions.get(),
 			);
+
+			if (
+				gestureCompositionActivation.get() === "pinch" &&
+				resolvedRuntime.participation.canTrackGesture &&
+				event.numberOfTouches === 2
+			) {
+				stateManager.activate();
+				return;
+			}
+
 			const decision = resolvePanActivationMoveDecision({
 				event,
 				runtime: resolvedRuntime,
@@ -113,6 +122,7 @@ export const usePanActivation = ({
 				gestures.direction.set(decision.direction);
 			}
 
+			gestureCompositionActivation.set("pan");
 			stateManager.activate();
 		},
 		[
@@ -125,6 +135,7 @@ export const usePanActivation = ({
 			runtime,
 			screenOptions,
 			scrollState,
+			gestureCompositionActivation,
 		],
 	);
 

package/src/shared/providers/screen/gestures/pan/{pan-lifecycle.ts → behavior/pan-lifecycle.ts}

@@ -1,18 +1,19 @@
-import { clamp, runOnJS } from "react-native-reanimated";
-import { EPSILON, FALSE, TRUE } from "../../../../constants";
-import { animateToProgress } from "../../../../utils/animation/animate-to-progress";
-import { emit } from "../../../../utils/animation/emit";
+import { clamp, runOnJS, type SharedValue } from "react-native-reanimated";
+import { EPSILON, FALSE, TRUE } from "../../../../../constants";
+import { animateToProgress } from "../../../../../utils/animation/animate-to-progress";
+import { emit } from "../../../../../utils/animation/emit";
 import {
 	normalizeGestureTranslation,
 	resolveGestureVelocity,
-} from "../shared/physics";
+} from "../../shared/physics";
 import type {
+	GestureCompositionActivation,
 	GestureDimensions,
 	PanGestureEvent,
 	PanGestureRuntime,
 	PanReleaseResult,
 	PanTrackState,
-} from "../types";
+} from "../../types";
 import { buildPanReleasePlan } from "./pan-release";
 import { resetPanGestureValues } from "./pan-reset";
 
@@ -26,7 +27,9 @@ export const startPanBase = (runtime: PanGestureRuntime) => {
 	const wasSettling = gestures.settling.get();
 	const hasResidualGesture =
 		Math.abs(gestures.normX.get()) > EPSILON ||
-		Math.abs(gestures.normY.get()) > EPSILON;
+		Math.abs(gestures.normY.get()) > EPSILON ||
+		Math.abs(gestures.normScale.get()) > EPSILON ||
+		Math.abs(gestures.rotation.get()) > EPSILON;
 
 	if (!wasSettling || !hasResidualGesture) {
 		emit(animations.willAnimate, TRUE, FALSE);
@@ -40,10 +43,18 @@ export const startPanBase = (runtime: PanGestureRuntime) => {
 	gestures.normX.set(0);
 	gestures.normY.set(0);
 	gestures.velocity.set(0);
+	gestures.scale.set(1);
+	gestures.normScale.set(0);
+	gestures.focalX.set(0);
+	gestures.focalY.set(0);
+	gestures.rotation.set(0);
 	gestures.raw.x.set(0);
 	gestures.raw.y.set(0);
 	gestures.raw.normX.set(0);
 	gestures.raw.normY.set(0);
+	gestures.raw.scale.set(1);
+	gestures.raw.normScale.set(0);
+	gestures.raw.rotation.set(0);
 	gestureProgressBaseline.set(animations.progress.get());
 };
 
@@ -98,12 +109,34 @@ export const finalizePanRelease = (
 	dimensions: GestureDimensions,
 	rawEvent: PanGestureEvent,
 	requestDismiss?: () => void,
+	gestureCompositionActivation?: SharedValue<GestureCompositionActivation>,
 ) => {
 	"worklet";
 	const {
+		policy,
 		stores: { gestures, animations, system },
 	} = runtime;
-	const plan = buildPanReleasePlan(release, runtime, dimensions, rawEvent);
+
+	const canDriveRelease =
+		!gestureCompositionActivation ||
+		gestureCompositionActivation.get() === "pan";
+
+	const plan = buildPanReleasePlan(
+		canDriveRelease
+			? release
+			: {
+					target: animations.progress.get(),
+					shouldDismiss: false,
+					initialVelocity: 0,
+					resetNormalizedValuesImmediately:
+						policy.gestureProgressMode === "progress-driven",
+					transitionSpec: undefined,
+					resetSpec: policy.transitionSpec?.open,
+				},
+		runtime,
+		dimensions,
+		rawEvent,
+	);
 
 	if (typeof plan.commitProgress === "number") {
 		animations.progress.set(plan.commitProgress);
@@ -122,8 +155,13 @@ export const finalizePanRelease = (
 		resetNormalizedValues: plan.resetNormalizedValues,
 		resetNormalizedValuesImmediately: plan.resetNormalizedValuesImmediately,
 		preserveRawValues: plan.preserveRawValues,
+		updateLifecycle: canDriveRelease,
 	});
 
+	if (!canDriveRelease) {
+		return;
+	}
+
 	const progressAlreadyAtTarget =
 		Math.abs(animations.progress.get() - plan.target) <= EPSILON;
 

package/src/shared/providers/screen/gestures/pan/{pan-release.ts → behavior/pan-release.ts}

@@ -2,28 +2,28 @@ import { clamp } from "react-native-reanimated";
 import {
 	getPanSnapAxisConfigForDirection,
 	isResolvedPanGestureDirection,
-} from "../shared/directions";
+} from "../../shared/directions";
 import {
 	getPanReleaseHandoffVelocity,
 	getPanReleaseProgressVelocity,
 	resolveGestureVelocity,
-} from "../shared/physics";
+} from "../../shared/physics";
 import {
 	getProgressVelocityTowardTarget,
 	resolveGestureSnapTransitionSpec,
-} from "../shared/release";
+} from "../../shared/release";
 import {
 	primeRuntimeSnapPoint,
 	resolveRuntimeGestureSnapPoints,
-} from "../shared/snap-points";
-import { determineDismissal, determineSnapTarget } from "../shared/targets";
+} from "../../shared/snap-points";
+import { determineDismissal, determineSnapTarget } from "../../shared/targets";
 import type {
 	GestureDimensions,
 	PanGestureEvent,
 	PanGestureRuntime,
 	PanReleasePlan,
 	PanReleaseResult,
-} from "../types";
+} from "../../types";
 
 const resolvePanReleaseVelocity = (
 	runtime: PanGestureRuntime,

package/src/shared/providers/screen/gestures/pan/{pan-reset.ts → behavior/pan-reset.ts}

@@ -1,11 +1,11 @@
-import { EPSILON, FALSE, TRUE } from "../../../../constants";
-import type { GestureStoreMap } from "../../../../stores/gesture.store";
-import type { AnimationConfig } from "../../../../types/animation.types";
+import { EPSILON, FALSE, TRUE } from "../../../../../constants";
+import type { GestureStoreMap } from "../../../../../stores/gesture.store";
+import type { AnimationConfig } from "../../../../../types/animation.types";
 import {
 	animateResetValue,
 	clearGestureSettlingIfResting,
 	getGestureResetSpec,
-} from "../shared/reset";
+} from "../../shared/reset";
 
 interface ResetPanGestureValuesProps {
 	spec?: AnimationConfig;
@@ -19,6 +19,7 @@ interface ResetPanGestureValuesProps {
 	resetNormalizedValues?: boolean;
 	resetNormalizedValuesImmediately?: boolean;
 	preserveRawValues?: boolean;
+	updateLifecycle?: boolean;
 }
 
 const clearPanSettlingIfResting = (gestures: GestureStoreMap) => {
@@ -47,8 +48,15 @@ export const resetPanGestureValues = ({
 	resetNormalizedValues = true,
 	resetNormalizedValuesImmediately = false,
 	preserveRawValues = shouldDismiss,
+	updateLifecycle = true,
 }: ResetPanGestureValuesProps) => {
 	"worklet";
+	const clearSettlingIfNeeded = () => {
+		"worklet";
+		if (updateLifecycle) {
+			clearPanSettlingIfResting(gestures);
+		}
+	};
 
 	if (!preserveRawValues) {
 		gestures.raw.x.set(0);
@@ -57,16 +65,18 @@ export const resetPanGestureValues = ({
 		gestures.raw.normY.set(0);
 	}
 
-	gestures.dragging.set(FALSE);
-	gestures.dismissing.set(shouldDismiss ? TRUE : FALSE);
-	gestures.settling.set(shouldDismiss ? FALSE : TRUE);
+	if (updateLifecycle) {
+		gestures.dragging.set(FALSE);
+		gestures.dismissing.set(shouldDismiss ? TRUE : FALSE);
+		gestures.settling.set(shouldDismiss ? FALSE : TRUE);
+	}
 	gestures.velocity.set(shouldDismiss ? (releaseVelocity ?? 0) : 0);
 
 	animateResetValue(gestures.x, 0, getGestureResetSpec(spec, velocityX), () =>
-		clearPanSettlingIfResting(gestures),
+		clearSettlingIfNeeded(),
 	);
 	animateResetValue(gestures.y, 0, getGestureResetSpec(spec, velocityY), () =>
-		clearPanSettlingIfResting(gestures),
+		clearSettlingIfNeeded(),
 	);
 
 	if (!resetNormalizedValues) {
@@ -76,7 +86,7 @@ export const resetPanGestureValues = ({
 	if (resetNormalizedValuesImmediately) {
 		gestures.normX.set(0);
 		gestures.normY.set(0);
-		clearPanSettlingIfResting(gestures);
+		clearSettlingIfNeeded();
 		return;
 	}
 
@@ -84,12 +94,12 @@ export const resetPanGestureValues = ({
 		gestures.normX,
 		0,
 		getGestureResetSpec(spec, velocityNormX),
-		() => clearPanSettlingIfResting(gestures),
+		() => clearSettlingIfNeeded(),
 	);
 	animateResetValue(
 		gestures.normY,
 		0,
 		getGestureResetSpec(spec, velocityNormY),
-		() => clearPanSettlingIfResting(gestures),
+		() => clearSettlingIfNeeded(),
 	);
 };

package/src/shared/providers/screen/gestures/pan/{use-pan-behavior.ts → behavior/use-pan-behavior.ts}

@@ -1,15 +1,16 @@
 import { useCallback, useMemo } from "react";
 import type { SharedValue } from "react-native-reanimated";
-import { useNavigationHelpers } from "../../../../hooks/navigation/use-navigation-helpers";
-import type { ScreenOptionsContextValue } from "../../options";
-import { usePanGestureSensitivity } from "../hooks/use-gesture-sensitivity";
-import { resolvePanRuntime } from "../shared/runtime";
+import { useNavigationHelpers } from "../../../../../hooks/navigation/use-navigation-helpers";
+import type { ScreenOptionsContextValue } from "../../../options";
+import { usePanGestureSensitivity } from "../../hooks/use-gesture-sensitivity";
+import { resolvePanRuntime } from "../../shared/runtime";
 import type {
+	GestureCompositionActivation,
 	GestureDimensions,
 	PanBehavior,
 	PanGestureEvent,
 	PanGestureRuntime,
-} from "../types";
+} from "../../types";
 import {
 	finalizePanRelease,
 	startPanBase,
@@ -25,6 +26,7 @@ export const usePanBehavior = (
 	runtime: SharedValue<PanGestureRuntime>,
 	screenOptions: ScreenOptionsContextValue,
 	dimensions: GestureDimensions,
+	gestureCompositionActivation: SharedValue<GestureCompositionActivation>,
 ): PanBehavior => {
 	const { dismissScreen, requestDismiss } = useNavigationHelpers();
 	const { withSensitivity, resetSensitivity } =
@@ -33,12 +35,27 @@ export const usePanBehavior = (
 	const onStart = useCallback(() => {
 		"worklet";
 		const latestRuntime = resolvePanRuntime(runtime.get(), screenOptions.get());
+		if (gestureCompositionActivation.get() === "pinch") {
+			const { gestures } = latestRuntime.stores;
+			gestures.x.set(0);
+			gestures.y.set(0);
+			gestures.normX.set(0);
+			gestures.normY.set(0);
+			gestures.velocity.set(0);
+			gestures.raw.x.set(0);
+			gestures.raw.y.set(0);
+			gestures.raw.normX.set(0);
+			gestures.raw.normY.set(0);
+			resetSensitivity();
+			return;
+		}
+
 		if (latestRuntime.participation.effectiveSnapPoints.hasSnapPoints) {
 			primeSnapPanRelease(latestRuntime);
 		}
 		startPanBase(latestRuntime);
 		resetSensitivity();
-	}, [runtime, screenOptions, resetSensitivity]);
+	}, [runtime, screenOptions, resetSensitivity, gestureCompositionActivation]);
 
 	const onUpdate = useCallback(
 		(rawEvent: PanGestureEvent) => {
@@ -66,10 +83,20 @@ export const usePanBehavior = (
 				screenOptions.get(),
 			);
 			const event = withSensitivity(rawEvent);
-			const release = latestRuntime.participation.effectiveSnapPoints
-				.hasSnapPoints
-				? resolveSnapPanRelease(event, latestRuntime, dimensions)
-				: resolvePanRelease(event, latestRuntime, dimensions);
+
+			const release = !latestRuntime.policy.enabled
+				? {
+						target: latestRuntime.stores.animations.progress.get(),
+						shouldDismiss: false,
+						initialVelocity: 0,
+						transitionSpec: undefined,
+						resetSpec: latestRuntime.policy.transitionSpec?.open,
+					}
+				: latestRuntime.participation.effectiveSnapPoints.hasSnapPoints
+					? resolveSnapPanRelease(event, latestRuntime, dimensions)
+					: resolvePanRelease(event, latestRuntime, dimensions);
+			const isPanComposition = gestureCompositionActivation.get() === "pan";
+
 			finalizePanRelease(
 				release,
 				latestRuntime,
@@ -77,7 +104,12 @@ export const usePanBehavior = (
 				dimensions,
 				rawEvent,
 				requestDismiss,
+				gestureCompositionActivation,
 			);
+
+			if (isPanComposition) {
+				gestureCompositionActivation.set(null);
+			}
 		},
 		[
 			runtime,
@@ -86,6 +118,7 @@ export const usePanBehavior = (
 			dismissScreen,
 			requestDismiss,
 			withSensitivity,
+			gestureCompositionActivation,
 		],
 	);
 

package/src/shared/providers/screen/gestures/pan/{build-pan-gesture.ts → use-build-pan-gesture.ts}

@@ -7,24 +7,27 @@ import { useGestureBuilderState } from "../hooks/use-gesture-builder-state";
 import { useStableRuntimeConfig } from "../hooks/use-stable-runtime-config";
 import type {
 	DirectionClaimMap,
+	GestureCompositionActivation,
 	PanGesture,
 	ScreenGestureConfig,
 	ScrollGestureState,
 } from "../types";
-import { usePanActivation } from "./pan-activation";
-import { usePanBehavior } from "./use-pan-behavior";
+import { usePanActivation } from "./activation/use-pan-activation";
+import { usePanBehavior } from "./behavior/use-pan-behavior";
 
-interface BuildPanGestureHookProps {
+interface UseBuildPanGestureProps {
 	scrollState: SharedValue<ScrollGestureState | null>;
 	gestureConfig: ScreenGestureConfig;
 	childDirectionClaims: SharedValue<DirectionClaimMap>;
+	gestureCompositionActivation: SharedValue<GestureCompositionActivation>;
 }
 
 export const useBuildPanGesture = ({
 	scrollState,
 	gestureConfig,
 	childDirectionClaims,
-}: BuildPanGestureHookProps): PanGesture => {
+	gestureCompositionActivation,
+}: UseBuildPanGestureProps): PanGesture => {
 	const dimensions = useWindowDimensions();
 	const { participation, pan: policy } = gestureConfig;
 	const screenOptions = useScreenOptionsContext();
@@ -45,15 +48,21 @@ export const useBuildPanGesture = ({
 		runtime,
 		screenOptions,
 		dimensions,
+		gestureCompositionActivation,
 	});
 
-	const behavior = usePanBehavior(runtime, screenOptions, dimensions);
+	const behavior = usePanBehavior(
+		runtime,
+		screenOptions,
+		dimensions,
+		gestureCompositionActivation,
+	);
 
 	const panGesture = useMemo(() => {
 		return Gesture.Pan()
 			.enabled(true)
 			.manualActivation(true)
-			.maxPointers(1)
+			.averageTouches(true)
 			.onTouchesDown(activation.onTouchesDown)
 			.onTouchesMove(activation.onTouchesMove)
 			.onStart(behavior.onStart)

package/src/shared/providers/screen/gestures/pinch/{pinch-activation.ts → activation/use-pinch-activation.ts}

@@ -4,18 +4,23 @@ import type {
 	GestureTouchEvent,
 } from "react-native-gesture-handler";
 import type { SharedValue } from "react-native-reanimated";
-import type { ScreenOptionsContextValue } from "../../options";
-import { resolvePinchRuntime } from "../shared/runtime";
-import type { PinchGestureRuntime } from "../types";
+import type { ScreenOptionsContextValue } from "../../../options";
+import { resolvePinchRuntime } from "../../shared/runtime";
+import type {
+	GestureCompositionActivation,
+	PinchGestureRuntime,
+} from "../../types";
 
 interface UsePinchActivationProps {
 	runtime: SharedValue<PinchGestureRuntime>;
 	screenOptions: ScreenOptionsContextValue;
+	gestureCompositionActivation: SharedValue<GestureCompositionActivation>;
 }
 
 export const usePinchActivation = ({
 	runtime,
 	screenOptions,
+	gestureCompositionActivation,
 }: UsePinchActivationProps) => {
 	const onTouchesDown = useCallback(
 		(
@@ -28,12 +33,18 @@ export const usePinchActivation = ({
 				screenOptions.get(),
 			);
 
+			if (gestureCompositionActivation.get() === "pan") {
+				stateManager?.fail();
+				return;
+			}
+
 			if (!participation.canTrackGesture || !policy.enabled) {
 				stateManager?.fail();
 				return;
 			}
 
 			if (event.numberOfTouches === 2) {
+				gestureCompositionActivation.set("pinch");
 				stateManager?.activate();
 				return;
 			}
@@ -42,7 +53,7 @@ export const usePinchActivation = ({
 				stateManager?.fail();
 			}
 		},
-		[runtime, screenOptions],
+		[runtime, screenOptions, gestureCompositionActivation],
 	);
 
 	const onTouchesMove = useCallback(
@@ -59,13 +70,14 @@ export const usePinchActivation = ({
 			}
 
 			if (event.numberOfTouches === 2) {
+				gestureCompositionActivation.set("pinch");
 				stateManager.activate();
 				return;
 			}
 
 			stateManager.fail();
 		},
-		[runtime, screenOptions],
+		[runtime, screenOptions, gestureCompositionActivation],
 	);
 
 	return useMemo(

package/src/shared/providers/screen/gestures/pinch/{pinch-lifecycle.ts → behavior/pinch-lifecycle.ts}

@@ -1,14 +1,14 @@
 import { clamp, runOnJS } from "react-native-reanimated";
-import { EPSILON, FALSE, TRUE } from "../../../../constants";
-import { animateToProgress } from "../../../../utils/animation/animate-to-progress";
-import { emit } from "../../../../utils/animation/emit";
-import { normalizePinchScale } from "../shared/physics";
+import { EPSILON, FALSE, TRUE } from "../../../../../constants";
+import { animateToProgress } from "../../../../../utils/animation/animate-to-progress";
+import { emit } from "../../../../../utils/animation/emit";
+import { normalizePinchScale } from "../../shared/physics";
 import type {
 	PinchGestureEvent,
 	PinchGestureRuntime,
 	PinchReleaseResult,
 	PinchTrackState,
-} from "../types";
+} from "../../types";
 import { resetPinchGestureValues } from "./pinch-reset";
 
 export const startPinchBase = (
@@ -22,7 +22,9 @@ export const startPinchBase = (
 	} = runtime;
 
 	const wasSettling = gestures.settling.get();
-	const hasResidualGesture = Math.abs(gestures.normScale.get()) > EPSILON;
+	const hasResidualGesture =
+		Math.abs(gestures.normScale.get()) > EPSILON ||
+		Math.abs(gestures.rotation.get()) > EPSILON;
 
 	if (!wasSettling || !hasResidualGesture) {
 		emit(animations.willAnimate, TRUE, FALSE);
@@ -36,8 +38,10 @@ export const startPinchBase = (
 	gestures.velocity.set(0);
 	gestures.scale.set(1);
 	gestures.normScale.set(0);
+	gestures.rotation.set(0);
 	gestures.raw.scale.set(1);
 	gestures.raw.normScale.set(0);
+	gestures.raw.rotation.set(0);
 	gestures.focalX.set(event.focalX);
 	gestures.focalY.set(event.focalY);
 	gestureProgressBaseline.set(animations.progress.get());
@@ -56,8 +60,6 @@ export const trackPinchGesture = (
 
 	gestures.scale.set(scale);
 	gestures.normScale.set(normScale);
-	gestures.focalX.set(event.focalX);
-	gestures.focalY.set(event.focalY);
 	gestures.raw.scale.set(rawScale);
 	gestures.raw.normScale.set(rawNormScale);
 	gestures.active.set(

package/src/shared/providers/screen/gestures/pinch/{pinch-release.ts → behavior/pinch-release.ts}

@@ -3,21 +3,21 @@ import {
 	getPinchReleaseHandoffVelocity,
 	normalizePinchScale,
 	shouldDismissFromPinch,
-} from "../shared/physics";
+} from "../../shared/physics";
 import {
 	getProgressVelocityTowardTarget,
 	resolveGestureSnapTransitionSpec,
-} from "../shared/release";
+} from "../../shared/release";
 import {
 	primeRuntimeSnapPoint,
 	resolveRuntimeGestureSnapPoints,
-} from "../shared/snap-points";
-import { determineSnapTarget } from "../shared/targets";
+} from "../../shared/snap-points";
+import { determineSnapTarget } from "../../shared/targets";
 import type {
 	PinchGestureEvent,
 	PinchGestureRuntime,
 	PinchReleaseResult,
-} from "../types";
+} from "../../types";
 
 const getPinchSnapDirection = (normalizedScale: number) => {
 	"worklet";

package/src/shared/providers/screen/gestures/pinch/{pinch-reset.ts → behavior/pinch-reset.ts}

@@ -1,11 +1,11 @@
-import { EPSILON, FALSE, TRUE } from "../../../../constants";
-import type { GestureStoreMap } from "../../../../stores/gesture.store";
-import type { AnimationConfig } from "../../../../types/animation.types";
+import { EPSILON, FALSE, TRUE } from "../../../../../constants";
+import type { GestureStoreMap } from "../../../../../stores/gesture.store";
+import type { AnimationConfig } from "../../../../../types/animation.types";
 import {
 	animateResetValue,
 	clearGestureSettlingIfResting,
 	getGestureResetSpec,
-} from "../shared/reset";
+} from "../../shared/reset";
 
 interface ResetPinchGestureValuesProps {
 	spec?: AnimationConfig;
@@ -21,7 +21,8 @@ const clearPinchSettlingIfResting = (gestures: GestureStoreMap) => {
 		!gestures.dragging.get() &&
 		!gestures.dismissing.get() &&
 		Math.abs(gestures.scale.get() - 1) <= EPSILON &&
-		Math.abs(gestures.normScale.get()) <= EPSILON;
+		Math.abs(gestures.normScale.get()) <= EPSILON &&
+		Math.abs(gestures.rotation.get()) <= EPSILON;
 
 	if (isResting) {
 		gestures.focalX.set(0);
@@ -43,6 +44,7 @@ export const resetPinchGestureValues = ({
 	if (!shouldDismiss) {
 		gestures.raw.scale.set(1);
 		gestures.raw.normScale.set(0);
+		gestures.raw.rotation.set(0);
 	}
 
 	gestures.dragging.set(FALSE);
@@ -52,6 +54,7 @@ export const resetPinchGestureValues = ({
 	if (resetValuesImmediately) {
 		gestures.scale.set(1);
 		gestures.normScale.set(0);
+		gestures.rotation.set(0);
 		clearPinchSettlingIfResting(gestures);
 		return;
 	}
@@ -62,4 +65,7 @@ export const resetPinchGestureValues = ({
 	animateResetValue(gestures.normScale, 0, resetSpec, () =>
 		clearPinchSettlingIfResting(gestures),
 	);
+	animateResetValue(gestures.rotation, 0, resetSpec, () =>
+		clearPinchSettlingIfResting(gestures),
+	);
 };