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

package/lib/module/shared/providers/screen/gestures/pan/behavior/pan-reset.js

@@ -1,59 +1,60 @@
 "use strict";
 
-import { EPSILON, FALSE, TRUE } from "../../../../../constants";
-import { animateResetValue, clearGestureSettlingIfResting, getGestureResetSpec } from "../../shared/reset";
-const clearPanSettlingIfResting = gestures => {
-  "worklet";
-
-  clearGestureSettlingIfResting(gestures, !gestures.dragging.get() && !gestures.dismissing.get() && Math.abs(gestures.x.get()) <= EPSILON && Math.abs(gestures.y.get()) <= EPSILON && Math.abs(gestures.normX.get()) <= EPSILON && Math.abs(gestures.normY.get()) <= EPSILON);
-};
+import { FALSE, TRUE } from "../../../../../constants";
+import { animateMany } from "../../shared/reset";
+import { clearPanProgressDeltaValues, clearRawPanValues } from "../../shared/values";
 export const resetPanGestureValues = ({
-  spec,
+  plan,
   gestures,
-  shouldDismiss,
-  velocityX,
-  velocityY,
-  velocityNormX,
-  velocityNormY,
-  releaseVelocity,
-  resetNormalizedValues = true,
-  resetNormalizedValuesImmediately = false,
-  preserveRawValues = shouldDismiss,
   updateLifecycle = true
 }) => {
   "worklet";
 
-  const clearSettlingIfNeeded = () => {
+  const finishPanReset = () => {
     "worklet";
 
-    if (updateLifecycle) {
-      clearPanSettlingIfResting(gestures);
+    if (!updateLifecycle || plan.shouldDismiss) {
+      return;
     }
+    gestures.active.set(null);
+    gestures.direction.set(null);
+    gestures.settling.set(FALSE);
   };
-  if (!preserveRawValues) {
-    gestures.raw.x.set(0);
-    gestures.raw.y.set(0);
-    gestures.raw.normX.set(0);
-    gestures.raw.normY.set(0);
-  }
+  clearRawPanValues(gestures);
   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), () => clearSettlingIfNeeded());
-  animateResetValue(gestures.y, 0, getGestureResetSpec(spec, velocityY), () => clearSettlingIfNeeded());
-  if (!resetNormalizedValues) {
-    return;
+    gestures.dismissing.set(plan.shouldDismiss ? TRUE : FALSE);
+    gestures.settling.set(plan.shouldDismiss ? FALSE : TRUE);
   }
-  if (resetNormalizedValuesImmediately) {
-    gestures.normX.set(0);
-    gestures.normY.set(0);
-    clearSettlingIfNeeded();
-    return;
+  gestures.velocity.set(0);
+  const progressDeltaWasCommitted = typeof plan.commitProgress === "number";
+  if (progressDeltaWasCommitted) {
+    clearPanProgressDeltaValues(gestures);
   }
-  animateResetValue(gestures.normX, 0, getGestureResetSpec(spec, velocityNormX), () => clearSettlingIfNeeded());
-  animateResetValue(gestures.normY, 0, getGestureResetSpec(spec, velocityNormY), () => clearSettlingIfNeeded());
+  animateMany([{
+    value: gestures.x,
+    toValue: 0,
+    velocity: plan.resetVelocityX
+  }, {
+    value: gestures.y,
+    toValue: 0,
+    velocity: plan.resetVelocityY
+  }, {
+    value: gestures.normX,
+    toValue: 0,
+    velocity: plan.resetVelocityNormX
+  }, {
+    value: gestures.normY,
+    toValue: 0,
+    velocity: plan.resetVelocityNormY
+  }, ...(progressDeltaWasCommitted ? [] : [{
+    value: gestures.internal.progressDeltaX,
+    toValue: 0,
+    velocity: plan.resetVelocityNormX
+  }, {
+    value: gestures.internal.progressDeltaY,
+    toValue: 0,
+    velocity: plan.resetVelocityNormY
+  }])], plan.resetSpec, finishPanReset);
 };
 //# sourceMappingURL=pan-reset.js.map

package/lib/module/shared/providers/screen/gestures/pan/behavior/pan-reset.js.map

@@ -1 +1 @@
-{"version":3,"names":["EPSILON","FALSE","TRUE","animateResetValue","clearGestureSettlingIfResting","getGestureResetSpec","clearPanSettlingIfResting","gestures","dragging","get","dismissing","Math","abs","x","y","normX","normY","resetPanGestureValues","spec","shouldDismiss","velocityX","velocityY","velocityNormX","velocityNormY","releaseVelocity","resetNormalizedValues","resetNormalizedValuesImmediately","preserveRawValues","updateLifecycle","clearSettlingIfNeeded","raw","set","settling","velocity"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pan/behavior/pan-reset.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["FALSE","TRUE","animateMany","clearPanProgressDeltaValues","clearRawPanValues","resetPanGestureValues","plan","gestures","updateLifecycle","finishPanReset","shouldDismiss","active","set","direction","settling","dragging","dismissing","velocity","progressDeltaWasCommitted","commitProgress","value","x","toValue","resetVelocityX","y","resetVelocityY","normX","resetVelocityNormX","normY","resetVelocityNormY","internal","progressDeltaX","progressDeltaY","resetSpec"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pan/behavior/pan-reset.ts"],"mappings":";;AAAA,SAASA,KAAK,EAAEC,IAAI,QAAQ,0BAA0B;AAEtD,SAASC,WAAW,QAAQ,oBAAoB;AAChD,SACCC,2BAA2B,EAC3BC,iBAAiB,QACX,qBAAqB;AAS5B,OAAO,MAAMC,qBAAqB,GAAGA,CAAC;EACrCC,IAAI;EACJC,QAAQ;EACRC,eAAe,GAAG;AACS,CAAC,KAAK;EACjC,SAAS;;EACT,MAAMC,cAAc,GAAGA,CAAA,KAAM;IAC5B,SAAS;;IACT,IAAI,CAACD,eAAe,IAAIF,IAAI,CAACI,aAAa,EAAE;MAC3C;IACD;IAEAH,QAAQ,CAACI,MAAM,CAACC,GAAG,CAAC,IAAI,CAAC;IACzBL,QAAQ,CAACM,SAAS,CAACD,GAAG,CAAC,IAAI,CAAC;IAC5BL,QAAQ,CAACO,QAAQ,CAACF,GAAG,CAACZ,KAAK,CAAC;EAC7B,CAAC;EAEDI,iBAAiB,CAACG,QAAQ,CAAC;EAE3B,IAAIC,eAAe,EAAE;IACpBD,QAAQ,CAACQ,QAAQ,CAACH,GAAG,CAACZ,KAAK,CAAC;IAC5BO,QAAQ,CAACS,UAAU,CAACJ,GAAG,CAACN,IAAI,CAACI,aAAa,GAAGT,IAAI,GAAGD,KAAK,CAAC;IAC1DO,QAAQ,CAACO,QAAQ,CAACF,GAAG,CAACN,IAAI,CAACI,aAAa,GAAGV,KAAK,GAAGC,IAAI,CAAC;EACzD;EAEAM,QAAQ,CAACU,QAAQ,CAACL,GAAG,CAAC,CAAC,CAAC;EAExB,MAAMM,yBAAyB,GAAG,OAAOZ,IAAI,CAACa,cAAc,KAAK,QAAQ;EAEzE,IAAID,yBAAyB,EAAE;IAC9Bf,2BAA2B,CAACI,QAAQ,CAAC;EACtC;EAEAL,WAAW,CACV,CACC;IAAEkB,KAAK,EAAEb,QAAQ,CAACc,CAAC;IAAEC,OAAO,EAAE,CAAC;IAAEL,QAAQ,EAAEX,IAAI,CAACiB;EAAe,CAAC,EAChE;IAAEH,KAAK,EAAEb,QAAQ,CAACiB,CAAC;IAAEF,OAAO,EAAE,CAAC;IAAEL,QAAQ,EAAEX,IAAI,CAACmB;EAAe,CAAC,EAChE;IAAEL,KAAK,EAAEb,QAAQ,CAACmB,KAAK;IAAEJ,OAAO,EAAE,CAAC;IAAEL,QAAQ,EAAEX,IAAI,CAACqB;EAAmB,CAAC,EACxE;IAAEP,KAAK,EAAEb,QAAQ,CAACqB,KAAK;IAAEN,OAAO,EAAE,CAAC;IAAEL,QAAQ,EAAEX,IAAI,CAACuB;EAAmB,CAAC,EACxE,IAAIX,yBAAyB,GAC1B,EAAE,GACF,CACA;IACCE,KAAK,EAAEb,QAAQ,CAACuB,QAAQ,CAACC,cAAc;IACvCT,OAAO,EAAE,CAAC;IACVL,QAAQ,EAAEX,IAAI,CAACqB;EAChB,CAAC,EACD;IACCP,KAAK,EAAEb,QAAQ,CAACuB,QAAQ,CAACE,cAAc;IACvCV,OAAO,EAAE,CAAC;IACVL,QAAQ,EAAEX,IAAI,CAACuB;EAChB,CAAC,CACD,CAAC,CACJ,EACDvB,IAAI,CAAC2B,SAAS,EACdxB,cACD,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/gestures/pan/behavior/use-pan-behavior.js

@@ -4,9 +4,10 @@ import { useCallback, useMemo } from "react";
 import { useNavigationHelpers } from "../../../../../hooks/navigation/use-navigation-helpers";
 import { usePanGestureSensitivity } from "../../hooks/use-gesture-sensitivity";
 import { resolvePanRuntime } from "../../shared/runtime";
+import { clearPanTrackingValues } from "../../shared/values";
 import { finalizePanRelease, startPanBase, trackPanGesture } from "./pan-lifecycle";
 import { primeSnapPanRelease, resolvePanRelease, resolveSnapPanRelease } from "./pan-release";
-export const usePanBehavior = (runtime, screenOptions, dimensions, gestureCompositionActivation) => {
+export const usePanBehavior = (runtime, screenOptions, dimensions, gestureCompositionOwner) => {
   const {
     dismissScreen,
     requestDismiss
@@ -19,19 +20,8 @@ export const usePanBehavior = (runtime, screenOptions, dimensions, gestureCompos
     "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);
+    if (gestureCompositionOwner.get() === "pinch") {
+      clearPanTrackingValues(latestRuntime.stores.gestures);
       resetSensitivity();
       return;
     }
@@ -40,7 +30,7 @@ export const usePanBehavior = (runtime, screenOptions, dimensions, gestureCompos
     }
     startPanBase(latestRuntime);
     resetSensitivity();
-  }, [runtime, screenOptions, resetSensitivity, gestureCompositionActivation]);
+  }, [runtime, screenOptions, resetSensitivity, gestureCompositionOwner]);
   const onUpdate = useCallback(rawEvent => {
     "worklet";
 
@@ -54,18 +44,18 @@ export const usePanBehavior = (runtime, screenOptions, dimensions, gestureCompos
     const latestRuntime = resolvePanRuntime(runtime.get(), screenOptions.get());
     const event = withSensitivity(rawEvent);
     const release = !latestRuntime.policy.enabled ? {
-      target: latestRuntime.stores.animations.progress.get(),
+      target: latestRuntime.stores.animations.transitionProgress.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, dismissScreen, dimensions, rawEvent, requestDismiss, gestureCompositionActivation);
-    if (isPanComposition) {
-      gestureCompositionActivation.set(null);
+    const isPanCompositionOwner = gestureCompositionOwner.get() === "pan";
+    finalizePanRelease(release, latestRuntime, dismissScreen, dimensions, rawEvent, requestDismiss, gestureCompositionOwner);
+    if (isPanCompositionOwner) {
+      gestureCompositionOwner.set(null);
     }
-  }, [runtime, screenOptions, dimensions, dismissScreen, requestDismiss, withSensitivity, gestureCompositionActivation]);
+  }, [runtime, screenOptions, dimensions, dismissScreen, requestDismiss, withSensitivity, gestureCompositionOwner]);
   return useMemo(() => ({
     onStart,
     onUpdate,

package/lib/module/shared/providers/screen/gestures/pan/behavior/use-pan-behavior.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useMemo","useNavigationHelpers","usePanGestureSensitivity","resolvePanRuntime","finalizePanRelease","startPanBase","trackPanGesture","primeSnapPanRelease","resolvePanRelease","resolveSnapPanRelease","usePanBehavior","runtime","screenOptions","dimensions","gestureCompositionActivation","dismissScreen","requestDismiss","withSensitivity","resetSensitivity","onStart","latestRuntime","get","gestures","stores","x","set","y","normX","normY","velocity","raw","participation","effectiveSnapPoints","hasSnapPoints","onUpdate","rawEvent","event","onEnd","release","policy","enabled","target","animations","progress","shouldDismiss","initialVelocity","transitionSpec","undefined","resetSpec","open","isPanComposition"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pan/behavior/use-pan-behavior.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAE5C,SAASC,oBAAoB,QAAQ,wDAAwD;AAE7F,SAASC,wBAAwB,QAAQ,qCAAqC;AAC9E,SAASC,iBAAiB,QAAQ,sBAAsB;AAQxD,SACCC,kBAAkB,EAClBC,YAAY,EACZC,eAAe,QACT,iBAAiB;AACxB,SACCC,mBAAmB,EACnBC,iBAAiB,EACjBC,qBAAqB,QACf,eAAe;AAEtB,OAAO,MAAMC,cAAc,GAAGA,CAC7BC,OAAuC,EACvCC,aAAwC,EACxCC,UAA6B,EAC7BC,4BAAuE,KACtD;EACjB,MAAM;IAAEC,aAAa;IAAEC;EAAe,CAAC,GAAGf,oBAAoB,CAAC,CAAC;EAChE,MAAM;IAAEgB,eAAe;IAAEC;EAAiB,CAAC,GAC1ChB,wBAAwB,CAACU,aAAa,CAAC;EAExC,MAAMO,OAAO,GAAGpB,WAAW,CAAC,MAAM;IACjC,SAAS;;IACT,MAAMqB,aAAa,GAAGjB,iBAAiB,CAACQ,OAAO,CAACU,GAAG,CAAC,CAAC,EAAET,aAAa,CAACS,GAAG,CAAC,CAAC,CAAC;IAC3E,IAAIP,4BAA4B,CAACO,GAAG,CAAC,CAAC,KAAK,OAAO,EAAE;MACnD,MAAM;QAAEC;MAAS,CAAC,GAAGF,aAAa,CAACG,MAAM;MACzCD,QAAQ,CAACE,CAAC,CAACC,GAAG,CAAC,CAAC,CAAC;MACjBH,QAAQ,CAACI,CAAC,CAACD,GAAG,CAAC,CAAC,CAAC;MACjBH,QAAQ,CAACK,KAAK,CAACF,GAAG,CAAC,CAAC,CAAC;MACrBH,QAAQ,CAACM,KAAK,CAACH,GAAG,CAAC,CAAC,CAAC;MACrBH,QAAQ,CAACO,QAAQ,CAACJ,GAAG,CAAC,CAAC,CAAC;MACxBH,QAAQ,CAACQ,GAAG,CAACN,CAAC,CAACC,GAAG,CAAC,CAAC,CAAC;MACrBH,QAAQ,CAACQ,GAAG,CAACJ,CAAC,CAACD,GAAG,CAAC,CAAC,CAAC;MACrBH,QAAQ,CAACQ,GAAG,CAACH,KAAK,CAACF,GAAG,CAAC,CAAC,CAAC;MACzBH,QAAQ,CAACQ,GAAG,CAACF,KAAK,CAACH,GAAG,CAAC,CAAC,CAAC;MACzBP,gBAAgB,CAAC,CAAC;MAClB;IACD;IAEA,IAAIE,aAAa,CAACW,aAAa,CAACC,mBAAmB,CAACC,aAAa,EAAE;MAClE1B,mBAAmB,CAACa,aAAa,CAAC;IACnC;IACAf,YAAY,CAACe,aAAa,CAAC;IAC3BF,gBAAgB,CAAC,CAAC;EACnB,CAAC,EAAE,CAACP,OAAO,EAAEC,aAAa,EAAEM,gBAAgB,EAAEJ,4BAA4B,CAAC,CAAC;EAE5E,MAAMoB,QAAQ,GAAGnC,WAAW,CAC1BoC,QAAyB,IAAK;IAC9B,SAAS;;IACT,MAAMf,aAAa,GAAGjB,iBAAiB,CACtCQ,OAAO,CAACU,GAAG,CAAC,CAAC,EACbT,aAAa,CAACS,GAAG,CAAC,CACnB,CAAC;IACD,MAAMe,KAAK,GAAGnB,eAAe,CAACkB,QAAQ,CAAC;IACvC7B,eAAe,CACd8B,KAAK,EACLD,QAAQ,EACRf,aAAa,CAACG,MAAM,CAACD,QAAQ,EAC7BT,UACD,CAAC;EACF,CAAC,EACD,CAACF,OAAO,EAAEC,aAAa,EAAEC,UAAU,EAAEI,eAAe,CACrD,CAAC;EAED,MAAMoB,KAAK,GAAGtC,WAAW,CACvBoC,QAAyB,IAAK;IAC9B,SAAS;;IACT,MAAMf,aAAa,GAAGjB,iBAAiB,CACtCQ,OAAO,CAACU,GAAG,CAAC,CAAC,EACbT,aAAa,CAACS,GAAG,CAAC,CACnB,CAAC;IACD,MAAMe,KAAK,GAAGnB,eAAe,CAACkB,QAAQ,CAAC;IAEvC,MAAMG,OAAO,GAAG,CAAClB,aAAa,CAACmB,MAAM,CAACC,OAAO,GAC1C;MACAC,MAAM,EAAErB,aAAa,CAACG,MAAM,CAACmB,UAAU,CAACC,QAAQ,CAACtB,GAAG,CAAC,CAAC;MACtDuB,aAAa,EAAE,KAAK;MACpBC,eAAe,EAAE,CAAC;MAClBC,cAAc,EAAEC,SAAS;MACzBC,SAAS,EAAE5B,aAAa,CAACmB,MAAM,CAACO,cAAc,EAAEG;IACjD,CAAC,GACA7B,aAAa,CAACW,aAAa,CAACC,mBAAmB,CAACC,aAAa,GAC5DxB,qBAAqB,CAAC2B,KAAK,EAAEhB,aAAa,EAAEP,UAAU,CAAC,GACvDL,iBAAiB,CAAC4B,KAAK,EAAEhB,aAAa,EAAEP,UAAU,CAAC;IACvD,MAAMqC,gBAAgB,GAAGpC,4BAA4B,CAACO,GAAG,CAAC,CAAC,KAAK,KAAK;IAErEjB,kBAAkB,CACjBkC,OAAO,EACPlB,aAAa,EACbL,aAAa,EACbF,UAAU,EACVsB,QAAQ,EACRnB,cAAc,EACdF,4BACD,CAAC;IAED,IAAIoC,gBAAgB,EAAE;MACrBpC,4BAA4B,CAACW,GAAG,CAAC,IAAI,CAAC;IACvC;EACD,CAAC,EACD,CACCd,OAAO,EACPC,aAAa,EACbC,UAAU,EACVE,aAAa,EACbC,cAAc,EACdC,eAAe,EACfH,4BAA4B,CAE9B,CAAC;EAED,OAAOd,OAAO,CACb,OAAO;IACNmB,OAAO;IACPe,QAAQ;IACRG;EACD,CAAC,CAAC,EACF,CAAClB,OAAO,EAAEe,QAAQ,EAAEG,KAAK,CAC1B,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useCallback","useMemo","useNavigationHelpers","usePanGestureSensitivity","resolvePanRuntime","clearPanTrackingValues","finalizePanRelease","startPanBase","trackPanGesture","primeSnapPanRelease","resolvePanRelease","resolveSnapPanRelease","usePanBehavior","runtime","screenOptions","dimensions","gestureCompositionOwner","dismissScreen","requestDismiss","withSensitivity","resetSensitivity","onStart","latestRuntime","get","stores","gestures","participation","effectiveSnapPoints","hasSnapPoints","onUpdate","rawEvent","event","onEnd","release","policy","enabled","target","animations","transitionProgress","shouldDismiss","initialVelocity","transitionSpec","undefined","resetSpec","open","isPanCompositionOwner","set"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pan/behavior/use-pan-behavior.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAE5C,SAASC,oBAAoB,QAAQ,wDAAwD;AAE7F,SAASC,wBAAwB,QAAQ,qCAAqC;AAC9E,SAASC,iBAAiB,QAAQ,sBAAsB;AACxD,SAASC,sBAAsB,QAAQ,qBAAqB;AAQ5D,SACCC,kBAAkB,EAClBC,YAAY,EACZC,eAAe,QACT,iBAAiB;AACxB,SACCC,mBAAmB,EACnBC,iBAAiB,EACjBC,qBAAqB,QACf,eAAe;AAEtB,OAAO,MAAMC,cAAc,GAAGA,CAC7BC,OAAuC,EACvCC,aAAwC,EACxCC,UAA6B,EAC7BC,uBAA6D,KAC5C;EACjB,MAAM;IAAEC,aAAa;IAAEC;EAAe,CAAC,GAAGhB,oBAAoB,CAAC,CAAC;EAChE,MAAM;IAAEiB,eAAe;IAAEC;EAAiB,CAAC,GAC1CjB,wBAAwB,CAACW,aAAa,CAAC;EAExC,MAAMO,OAAO,GAAGrB,WAAW,CAAC,MAAM;IACjC,SAAS;;IACT,MAAMsB,aAAa,GAAGlB,iBAAiB,CAACS,OAAO,CAACU,GAAG,CAAC,CAAC,EAAET,aAAa,CAACS,GAAG,CAAC,CAAC,CAAC;IAC3E,IAAIP,uBAAuB,CAACO,GAAG,CAAC,CAAC,KAAK,OAAO,EAAE;MAC9ClB,sBAAsB,CAACiB,aAAa,CAACE,MAAM,CAACC,QAAQ,CAAC;MACrDL,gBAAgB,CAAC,CAAC;MAClB;IACD;IAEA,IAAIE,aAAa,CAACI,aAAa,CAACC,mBAAmB,CAACC,aAAa,EAAE;MAClEnB,mBAAmB,CAACa,aAAa,CAAC;IACnC;IACAf,YAAY,CAACe,aAAa,CAAC;IAC3BF,gBAAgB,CAAC,CAAC;EACnB,CAAC,EAAE,CAACP,OAAO,EAAEC,aAAa,EAAEM,gBAAgB,EAAEJ,uBAAuB,CAAC,CAAC;EAEvE,MAAMa,QAAQ,GAAG7B,WAAW,CAC1B8B,QAAyB,IAAK;IAC9B,SAAS;;IACT,MAAMR,aAAa,GAAGlB,iBAAiB,CACtCS,OAAO,CAACU,GAAG,CAAC,CAAC,EACbT,aAAa,CAACS,GAAG,CAAC,CACnB,CAAC;IACD,MAAMQ,KAAK,GAAGZ,eAAe,CAACW,QAAQ,CAAC;IACvCtB,eAAe,CACduB,KAAK,EACLD,QAAQ,EACRR,aAAa,CAACE,MAAM,CAACC,QAAQ,EAC7BV,UACD,CAAC;EACF,CAAC,EACD,CAACF,OAAO,EAAEC,aAAa,EAAEC,UAAU,EAAEI,eAAe,CACrD,CAAC;EAED,MAAMa,KAAK,GAAGhC,WAAW,CACvB8B,QAAyB,IAAK;IAC9B,SAAS;;IACT,MAAMR,aAAa,GAAGlB,iBAAiB,CACtCS,OAAO,CAACU,GAAG,CAAC,CAAC,EACbT,aAAa,CAACS,GAAG,CAAC,CACnB,CAAC;IACD,MAAMQ,KAAK,GAAGZ,eAAe,CAACW,QAAQ,CAAC;IAEvC,MAAMG,OAAO,GAAG,CAACX,aAAa,CAACY,MAAM,CAACC,OAAO,GAC1C;MACAC,MAAM,EAAEd,aAAa,CAACE,MAAM,CAACa,UAAU,CAACC,kBAAkB,CAACf,GAAG,CAAC,CAAC;MAChEgB,aAAa,EAAE,KAAK;MACpBC,eAAe,EAAE,CAAC;MAClBC,cAAc,EAAEC,SAAS;MACzBC,SAAS,EAAErB,aAAa,CAACY,MAAM,CAACO,cAAc,EAAEG;IACjD,CAAC,GACAtB,aAAa,CAACI,aAAa,CAACC,mBAAmB,CAACC,aAAa,GAC5DjB,qBAAqB,CAACoB,KAAK,EAAET,aAAa,EAAEP,UAAU,CAAC,GACvDL,iBAAiB,CAACqB,KAAK,EAAET,aAAa,EAAEP,UAAU,CAAC;IACvD,MAAM8B,qBAAqB,GAAG7B,uBAAuB,CAACO,GAAG,CAAC,CAAC,KAAK,KAAK;IAErEjB,kBAAkB,CACjB2B,OAAO,EACPX,aAAa,EACbL,aAAa,EACbF,UAAU,EACVe,QAAQ,EACRZ,cAAc,EACdF,uBACD,CAAC;IAED,IAAI6B,qBAAqB,EAAE;MAC1B7B,uBAAuB,CAAC8B,GAAG,CAAC,IAAI,CAAC;IAClC;EACD,CAAC,EACD,CACCjC,OAAO,EACPC,aAAa,EACbC,UAAU,EACVE,aAAa,EACbC,cAAc,EACdC,eAAe,EACfH,uBAAuB,CAEzB,CAAC;EAED,OAAOf,OAAO,CACb,OAAO;IACNoB,OAAO;IACPQ,QAAQ;IACRG;EACD,CAAC,CAAC,EACF,CAACX,OAAO,EAAEQ,QAAQ,EAAEG,KAAK,CAC1B,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/gestures/pan/use-build-pan-gesture.js

@@ -4,7 +4,6 @@ import { useMemo } from "react";
 import { useWindowDimensions } from "react-native";
 import { Gesture } from "react-native-gesture-handler";
 import { useScreenOptionsContext } from "../../options";
-import { useGestureBuilderState } from "../hooks/use-gesture-builder-state";
 import { useStableRuntimeConfig } from "../hooks/use-stable-runtime-config";
 import { usePanActivation } from "./activation/use-pan-activation";
 import { usePanBehavior } from "./behavior/use-pan-behavior";
@@ -12,7 +11,7 @@ export const useBuildPanGesture = ({
   scrollState,
   gestureConfig,
   childDirectionClaims,
-  gestureCompositionActivation
+  gestureCompositionOwner
 }) => {
   const dimensions = useWindowDimensions();
   const {
@@ -20,15 +19,9 @@ export const useBuildPanGesture = ({
     pan: policy
   } = gestureConfig;
   const screenOptions = useScreenOptionsContext();
-  const {
-    gestureProgressBaseline,
-    lockedSnapPoint
-  } = useGestureBuilderState(participation);
   const runtime = useStableRuntimeConfig({
     participation,
-    policy,
-    gestureProgressBaseline,
-    lockedSnapPoint
+    policy
   });
   const activation = usePanActivation({
     scrollState,
@@ -36,9 +29,9 @@ export const useBuildPanGesture = ({
     runtime,
     screenOptions,
     dimensions,
-    gestureCompositionActivation
+    gestureCompositionOwner
   });
-  const behavior = usePanBehavior(runtime, screenOptions, dimensions, gestureCompositionActivation);
+  const behavior = usePanBehavior(runtime, screenOptions, dimensions, gestureCompositionOwner);
   const panGesture = useMemo(() => {
     return Gesture.Pan().enabled(true).manualActivation(true).averageTouches(true).onTouchesDown(activation.onTouchesDown).onTouchesMove(activation.onTouchesMove).onStart(behavior.onStart).onUpdate(behavior.onUpdate).onEnd(behavior.onEnd);
   }, [activation, behavior]);

package/lib/module/shared/providers/screen/gestures/pan/use-build-pan-gesture.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useWindowDimensions","Gesture","useScreenOptionsContext","useGestureBuilderState","useStableRuntimeConfig","usePanActivation","usePanBehavior","useBuildPanGesture","scrollState","gestureConfig","childDirectionClaims","gestureCompositionActivation","dimensions","participation","pan","policy","screenOptions","gestureProgressBaseline","lockedSnapPoint","runtime","activation","behavior","panGesture","Pan","enabled","manualActivation","averageTouches","onTouchesDown","onTouchesMove","onStart","onUpdate","onEnd"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/pan/use-build-pan-gesture.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,mBAAmB,QAAQ,cAAc;AAClD,SAASC,OAAO,QAAQ,8BAA8B;AAEtD,SAASC,uBAAuB,QAAQ,eAAe;AACvD,SAASC,sBAAsB,QAAQ,oCAAoC;AAC3E,SAASC,sBAAsB,QAAQ,oCAAoC;AAQ3E,SAASC,gBAAgB,QAAQ,iCAAiC;AAClE,SAASC,cAAc,QAAQ,6BAA6B;AAS5D,OAAO,MAAMC,kBAAkB,GAAGA,CAAC;EAClCC,WAAW;EACXC,aAAa;EACbC,oBAAoB;EACpBC;AACwB,CAAC,KAAiB;EAC1C,MAAMC,UAAU,GAAGZ,mBAAmB,CAAC,CAAC;EACxC,MAAM;IAAEa,aAAa;IAAEC,GAAG,EAAEC;EAAO,CAAC,GAAGN,aAAa;EACpD,MAAMO,aAAa,GAAGd,uBAAuB,CAAC,CAAC;EAE/C,MAAM;IAAEe,uBAAuB;IAAEC;EAAgB,CAAC,GACjDf,sBAAsB,CAACU,aAAa,CAAC;EAEtC,MAAMM,OAAO,GAAGf,sBAAsB,CAAC;IACtCS,aAAa;IACbE,MAAM;IACNE,uBAAuB;IACvBC;EACD,CAAC,CAAC;EAEF,MAAME,UAAU,GAAGf,gBAAgB,CAAC;IACnCG,WAAW;IACXE,oBAAoB;IACpBS,OAAO;IACPH,aAAa;IACbJ,UAAU;IACVD;EACD,CAAC,CAAC;EAEF,MAAMU,QAAQ,GAAGf,cAAc,CAC9Ba,OAAO,EACPH,aAAa,EACbJ,UAAU,EACVD,4BACD,CAAC;EAED,MAAMW,UAAU,GAAGvB,OAAO,CAAC,MAAM;IAChC,OAAOE,OAAO,CAACsB,GAAG,CAAC,CAAC,CAClBC,OAAO,CAAC,IAAI,CAAC,CACbC,gBAAgB,CAAC,IAAI,CAAC,CACtBC,cAAc,CAAC,IAAI,CAAC,CACpBC,aAAa,CAACP,UAAU,CAACO,aAAa,CAAC,CACvCC,aAAa,CAACR,UAAU,CAACQ,aAAa,CAAC,CACvCC,OAAO,CAACR,QAAQ,CAACQ,OAAO,CAAC,CACzBC,QAAQ,CAACT,QAAQ,CAACS,QAAQ,CAAC,CAC3BC,KAAK,CAACV,QAAQ,CAACU,KAAK,CAAC;EACxB,CAAC,EAAE,CAACX,UAAU,EAAEC,QAAQ,CAAC,CAAC;EAE1B,OAAOC,UAAU;AAClB,CAAC","ignoreList":[]}
+{"version":3,"names":["useMemo","useWindowDimensions","Gesture","useScreenOptionsContext","useStableRuntimeConfig","usePanActivation","usePanBehavior","useBuildPanGesture","scrollState","gestureConfig","childDirectionClaims","gestureCompositionOwner","dimensions","participation","pan","policy","screenOptions","runtime","activation","behavior","panGesture","Pan","enabled","manualActivation","averageTouches","onTouchesDown","onTouchesMove","onStart","onUpdate","onEnd"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/pan/use-build-pan-gesture.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,mBAAmB,QAAQ,cAAc;AAClD,SAASC,OAAO,QAAQ,8BAA8B;AAEtD,SAASC,uBAAuB,QAAQ,eAAe;AACvD,SAASC,sBAAsB,QAAQ,oCAAoC;AAQ3E,SAASC,gBAAgB,QAAQ,iCAAiC;AAClE,SAASC,cAAc,QAAQ,6BAA6B;AAS5D,OAAO,MAAMC,kBAAkB,GAAGA,CAAC;EAClCC,WAAW;EACXC,aAAa;EACbC,oBAAoB;EACpBC;AACwB,CAAC,KAAiB;EAC1C,MAAMC,UAAU,GAAGX,mBAAmB,CAAC,CAAC;EACxC,MAAM;IAAEY,aAAa;IAAEC,GAAG,EAAEC;EAAO,CAAC,GAAGN,aAAa;EACpD,MAAMO,aAAa,GAAGb,uBAAuB,CAAC,CAAC;EAE/C,MAAMc,OAAO,GAAGb,sBAAsB,CAAC;IACtCS,aAAa;IACbE;EACD,CAAC,CAAC;EAEF,MAAMG,UAAU,GAAGb,gBAAgB,CAAC;IACnCG,WAAW;IACXE,oBAAoB;IACpBO,OAAO;IACPD,aAAa;IACbJ,UAAU;IACVD;EACD,CAAC,CAAC;EAEF,MAAMQ,QAAQ,GAAGb,cAAc,CAC9BW,OAAO,EACPD,aAAa,EACbJ,UAAU,EACVD,uBACD,CAAC;EAED,MAAMS,UAAU,GAAGpB,OAAO,CAAC,MAAM;IAChC,OAAOE,OAAO,CAACmB,GAAG,CAAC,CAAC,CAClBC,OAAO,CAAC,IAAI,CAAC,CACbC,gBAAgB,CAAC,IAAI,CAAC,CACtBC,cAAc,CAAC,IAAI,CAAC,CACpBC,aAAa,CAACP,UAAU,CAACO,aAAa,CAAC,CACvCC,aAAa,CAACR,UAAU,CAACQ,aAAa,CAAC,CACvCC,OAAO,CAACR,QAAQ,CAACQ,OAAO,CAAC,CACzBC,QAAQ,CAACT,QAAQ,CAACS,QAAQ,CAAC,CAC3BC,KAAK,CAACV,QAAQ,CAACU,KAAK,CAAC;EACxB,CAAC,EAAE,CAACX,UAAU,EAAEC,QAAQ,CAAC,CAAC;EAE1B,OAAOC,UAAU;AAClB,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/gestures/pinch/activation/use-pinch-activation.js

@@ -5,7 +5,7 @@ import { resolvePinchRuntime } from "../../shared/runtime";
 export const usePinchActivation = ({
   runtime,
   screenOptions,
-  gestureCompositionActivation
+  gestureCompositionOwner
 }) => {
   const onTouchesDown = useCallback((event, stateManager) => {
     "worklet";
@@ -14,23 +14,21 @@ export const usePinchActivation = ({
       participation,
       policy
     } = resolvePinchRuntime(runtime.get(), screenOptions.get());
-    if (gestureCompositionActivation.get() === "pan") {
-      stateManager?.fail();
-      return;
-    }
     if (!participation.canTrackGesture || !policy.enabled) {
       stateManager?.fail();
       return;
     }
     if (event.numberOfTouches === 2) {
-      gestureCompositionActivation.set("pinch");
+      if (gestureCompositionOwner.get() === null) {
+        gestureCompositionOwner.set("pinch");
+      }
       stateManager?.activate();
       return;
     }
     if (event.numberOfTouches > 2) {
       stateManager?.fail();
     }
-  }, [runtime, screenOptions, gestureCompositionActivation]);
+  }, [runtime, screenOptions, gestureCompositionOwner]);
   const onTouchesMove = useCallback((event, stateManager) => {
     "worklet";
 
@@ -43,12 +41,16 @@ export const usePinchActivation = ({
       return;
     }
     if (event.numberOfTouches === 2) {
-      gestureCompositionActivation.set("pinch");
+      if (gestureCompositionOwner.get() === null) {
+        gestureCompositionOwner.set("pinch");
+      }
       stateManager.activate();
       return;
     }
-    stateManager.fail();
-  }, [runtime, screenOptions, gestureCompositionActivation]);
+    if (event.numberOfTouches > 2) {
+      stateManager.fail();
+    }
+  }, [runtime, screenOptions, gestureCompositionOwner]);
   return useMemo(() => ({
     onTouchesDown,
     onTouchesMove

package/lib/module/shared/providers/screen/gestures/pinch/activation/use-pinch-activation.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useMemo","resolvePinchRuntime","usePinchActivation","runtime","screenOptions","gestureCompositionActivation","onTouchesDown","event","stateManager","participation","policy","get","fail","canTrackGesture","enabled","numberOfTouches","set","activate","onTouchesMove"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/activation/use-pinch-activation.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAO5C,SAASC,mBAAmB,QAAQ,sBAAsB;AAY1D,OAAO,MAAMC,kBAAkB,GAAGA,CAAC;EAClCC,OAAO;EACPC,aAAa;EACbC;AACwB,CAAC,KAAK;EAC9B,MAAMC,aAAa,GAAGP,WAAW,CAChC,CACCQ,KAAwB,EACxBC,YAA6C,KACzC;IACJ,SAAS;;IACT,MAAM;MAAEC,aAAa;MAAEC;IAAO,CAAC,GAAGT,mBAAmB,CACpDE,OAAO,CAACQ,GAAG,CAAC,CAAC,EACbP,aAAa,CAACO,GAAG,CAAC,CACnB,CAAC;IAED,IAAIN,4BAA4B,CAACM,GAAG,CAAC,CAAC,KAAK,KAAK,EAAE;MACjDH,YAAY,EAAEI,IAAI,CAAC,CAAC;MACpB;IACD;IAEA,IAAI,CAACH,aAAa,CAACI,eAAe,IAAI,CAACH,MAAM,CAACI,OAAO,EAAE;MACtDN,YAAY,EAAEI,IAAI,CAAC,CAAC;MACpB;IACD;IAEA,IAAIL,KAAK,CAACQ,eAAe,KAAK,CAAC,EAAE;MAChCV,4BAA4B,CAACW,GAAG,CAAC,OAAO,CAAC;MACzCR,YAAY,EAAES,QAAQ,CAAC,CAAC;MACxB;IACD;IAEA,IAAIV,KAAK,CAACQ,eAAe,GAAG,CAAC,EAAE;MAC9BP,YAAY,EAAEI,IAAI,CAAC,CAAC;IACrB;EACD,CAAC,EACD,CAACT,OAAO,EAAEC,aAAa,EAAEC,4BAA4B,CACtD,CAAC;EAED,MAAMa,aAAa,GAAGnB,WAAW,CAChC,CAACQ,KAAwB,EAAEC,YAAiC,KAAK;IAChE,SAAS;;IACT,MAAM;MAAEC,aAAa;MAAEC;IAAO,CAAC,GAAGT,mBAAmB,CACpDE,OAAO,CAACQ,GAAG,CAAC,CAAC,EACbP,aAAa,CAACO,GAAG,CAAC,CACnB,CAAC;IAED,IAAI,CAACF,aAAa,CAACI,eAAe,IAAI,CAACH,MAAM,CAACI,OAAO,EAAE;MACtDN,YAAY,CAACI,IAAI,CAAC,CAAC;MACnB;IACD;IAEA,IAAIL,KAAK,CAACQ,eAAe,KAAK,CAAC,EAAE;MAChCV,4BAA4B,CAACW,GAAG,CAAC,OAAO,CAAC;MACzCR,YAAY,CAACS,QAAQ,CAAC,CAAC;MACvB;IACD;IAEAT,YAAY,CAACI,IAAI,CAAC,CAAC;EACpB,CAAC,EACD,CAACT,OAAO,EAAEC,aAAa,EAAEC,4BAA4B,CACtD,CAAC;EAED,OAAOL,OAAO,CACb,OAAO;IAAEM,aAAa;IAAEY;EAAc,CAAC,CAAC,EACxC,CAACZ,aAAa,EAAEY,aAAa,CAC9B,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useCallback","useMemo","resolvePinchRuntime","usePinchActivation","runtime","screenOptions","gestureCompositionOwner","onTouchesDown","event","stateManager","participation","policy","get","canTrackGesture","enabled","fail","numberOfTouches","set","activate","onTouchesMove"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/activation/use-pinch-activation.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAO5C,SAASC,mBAAmB,QAAQ,sBAAsB;AAS1D,OAAO,MAAMC,kBAAkB,GAAGA,CAAC;EAClCC,OAAO;EACPC,aAAa;EACbC;AACwB,CAAC,KAAK;EAC9B,MAAMC,aAAa,GAAGP,WAAW,CAChC,CACCQ,KAAwB,EACxBC,YAA6C,KACzC;IACJ,SAAS;;IACT,MAAM;MAAEC,aAAa;MAAEC;IAAO,CAAC,GAAGT,mBAAmB,CACpDE,OAAO,CAACQ,GAAG,CAAC,CAAC,EACbP,aAAa,CAACO,GAAG,CAAC,CACnB,CAAC;IAED,IAAI,CAACF,aAAa,CAACG,eAAe,IAAI,CAACF,MAAM,CAACG,OAAO,EAAE;MACtDL,YAAY,EAAEM,IAAI,CAAC,CAAC;MACpB;IACD;IAEA,IAAIP,KAAK,CAACQ,eAAe,KAAK,CAAC,EAAE;MAChC,IAAIV,uBAAuB,CAACM,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE;QAC3CN,uBAAuB,CAACW,GAAG,CAAC,OAAO,CAAC;MACrC;MACAR,YAAY,EAAES,QAAQ,CAAC,CAAC;MACxB;IACD;IAEA,IAAIV,KAAK,CAACQ,eAAe,GAAG,CAAC,EAAE;MAC9BP,YAAY,EAAEM,IAAI,CAAC,CAAC;IACrB;EACD,CAAC,EACD,CAACX,OAAO,EAAEC,aAAa,EAAEC,uBAAuB,CACjD,CAAC;EAED,MAAMa,aAAa,GAAGnB,WAAW,CAChC,CAACQ,KAAwB,EAAEC,YAAiC,KAAK;IAChE,SAAS;;IACT,MAAM;MAAEC,aAAa;MAAEC;IAAO,CAAC,GAAGT,mBAAmB,CACpDE,OAAO,CAACQ,GAAG,CAAC,CAAC,EACbP,aAAa,CAACO,GAAG,CAAC,CACnB,CAAC;IAED,IAAI,CAACF,aAAa,CAACG,eAAe,IAAI,CAACF,MAAM,CAACG,OAAO,EAAE;MACtDL,YAAY,CAACM,IAAI,CAAC,CAAC;MACnB;IACD;IAEA,IAAIP,KAAK,CAACQ,eAAe,KAAK,CAAC,EAAE;MAChC,IAAIV,uBAAuB,CAACM,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE;QAC3CN,uBAAuB,CAACW,GAAG,CAAC,OAAO,CAAC;MACrC;MACAR,YAAY,CAACS,QAAQ,CAAC,CAAC;MACvB;IACD;IAEA,IAAIV,KAAK,CAACQ,eAAe,GAAG,CAAC,EAAE;MAC9BP,YAAY,CAACM,IAAI,CAAC,CAAC;IACpB;EACD,CAAC,EACD,CAACX,OAAO,EAAEC,aAAa,EAAEC,uBAAuB,CACjD,CAAC;EAED,OAAOL,OAAO,CACb,OAAO;IAAEM,aAAa;IAAEY;EAAc,CAAC,CAAC,EACxC,CAACZ,aAAa,EAAEY,aAAa,CAC9B,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/gestures/pinch/behavior/pinch-lifecycle.js

@@ -5,6 +5,8 @@ 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 { snapshotGestureHandoff } from "../../shared/snapshot";
+import { clearTransformTrackingValues } from "../../shared/values";
 import { resetPinchGestureValues } from "./pinch-reset";
 export const startPinchBase = (runtime, event) => {
   "worklet";
@@ -13,8 +15,7 @@ export const startPinchBase = (runtime, event) => {
     stores: {
       gestures,
       animations
-    },
-    gestureProgressBaseline
+    }
   } = runtime;
   const wasSettling = gestures.settling.get();
   const hasResidualGesture = Math.abs(gestures.normScale.get()) > EPSILON || Math.abs(gestures.rotation.get()) > EPSILON;
@@ -27,15 +28,10 @@ export const startPinchBase = (runtime, event) => {
   gestures.active.set(null);
   gestures.direction.set(null);
   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);
+  clearTransformTrackingValues(gestures);
   gestures.focalX.set(event.focalX);
   gestures.focalY.set(event.focalY);
-  gestureProgressBaseline.set(animations.progress.get());
+  gestures.internal.progressBaseline.set(animations.transitionProgress.get());
 };
 export const trackPinchGesture = (event, rawEvent, gestures) => {
   "worklet";
@@ -46,6 +42,8 @@ export const trackPinchGesture = (event, rawEvent, gestures) => {
   const rawScale = clamp(1 + rawNormScale, 0, 2);
   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(normScale < 0 ? "pinch-in" : normScale > 0 ? "pinch-out" : null);
@@ -65,9 +63,14 @@ export const finalizePinchRelease = (release, runtime, dismissScreen, requestDis
     }
   } = runtime;
   if (typeof release.commitProgress === "number") {
-    animations.progress.set(release.commitProgress);
+    animations.transitionProgress.set(release.commitProgress);
     system.targetProgress.set(release.commitProgress);
   }
+  if (release.shouldDismiss) {
+    snapshotGestureHandoff(gestures, {
+      velocity: release.handoffVelocity
+    });
+  }
   resetPinchGestureValues({
     spec: release.resetSpec,
     gestures,

package/lib/module/shared/providers/screen/gestures/pinch/behavior/pinch-lifecycle.js.map

@@ -1 +1 @@
-{"version":3,"names":["clamp","runOnJS","EPSILON","FALSE","TRUE","animateToProgress","emit","normalizePinchScale","resetPinchGestureValues","startPinchBase","runtime","event","stores","gestures","animations","gestureProgressBaseline","wasSettling","settling","get","hasResidualGesture","Math","abs","normScale","rotation","willAnimate","dragging","set","dismissing","active","direction","velocity","scale","raw","focalX","focalY","progress","trackPinchGesture","rawEvent","rawNormScale","rawScale","finalizePinchRelease","release","dismissScreen","requestDismiss","system","commitProgress","targetProgress","spec","resetSpec","shouldDismiss","resetValuesImmediately","target","onAnimationFinish","undefined","transitionSpec","emitWillAnimate","markEntering","initialVelocity"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/behavior/pinch-lifecycle.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["clamp","runOnJS","EPSILON","FALSE","TRUE","animateToProgress","emit","normalizePinchScale","snapshotGestureHandoff","clearTransformTrackingValues","resetPinchGestureValues","startPinchBase","runtime","event","stores","gestures","animations","wasSettling","settling","get","hasResidualGesture","Math","abs","normScale","rotation","willAnimate","dragging","set","dismissing","active","direction","velocity","focalX","focalY","internal","progressBaseline","transitionProgress","trackPinchGesture","rawEvent","scale","rawNormScale","rawScale","raw","finalizePinchRelease","release","dismissScreen","requestDismiss","system","commitProgress","targetProgress","shouldDismiss","handoffVelocity","spec","resetSpec","resetValuesImmediately","target","onAnimationFinish","undefined","transitionSpec","emitWillAnimate","markEntering","initialVelocity"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/behavior/pinch-lifecycle.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/providers/screen/gestures/pinch/behavior/pinch-release.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import { clamp } from "react-native-reanimated";
-import { getPinchReleaseHandoffVelocity, normalizePinchScale, shouldDismissFromPinch } from "../../shared/physics";
+import { getPinchReleaseHandoffVelocity, normalizePinchScale, resolveGestureVelocityMagnitude, shouldDismissFromPinch } from "../../shared/physics";
 import { getProgressVelocityTowardTarget, resolveGestureSnapTransitionSpec } from "../../shared/release";
 import { primeRuntimeSnapPoint, resolveRuntimeGestureSnapPoints } from "../../shared/snap-points";
 import { determineSnapTarget } from "../../shared/targets";
@@ -37,10 +37,10 @@ const getPinchSnapReleaseProgress = ({
   const pinchDirection = getPinchSnapDirection(normalizedScale);
   const snapDirections = runtime.policy.snapDirections;
   if (!pinchDirection || !snapDirections) {
-    return runtime.stores.animations.progress.get();
+    return runtime.stores.animations.transitionProgress.get();
   }
   const progressDelta = snapDirections.collapse === pinchDirection ? -Math.abs(normalizedScale) : Math.abs(normalizedScale);
-  return clamp(runtime.gestureProgressBaseline.get() + progressDelta, minSnapPoint, maxSnapPoint);
+  return clamp(runtime.stores.gestures.internal.progressBaseline.get() + progressDelta, minSnapPoint, maxSnapPoint);
 };
 export const primeSnapPinchRelease = runtime => {
   "worklet";
@@ -53,23 +53,25 @@ export const resolvePinchRelease = (event, runtime) => {
   const {
     participation,
     policy,
-    gestureProgressBaseline,
     stores: {
       animations
     }
   } = runtime;
   const normalizedScale = clamp(normalizePinchScale(event.scale), -1, 1);
-  const currentProgress = animations.progress.get();
+  const currentProgress = animations.transitionProgress.get();
   const shouldDismiss = participation.canDismiss && shouldDismissFromPinch(normalizedScale, policy.pinchInEnabled, policy.pinchOutEnabled);
-  const target = shouldDismiss ? 0 : gestureProgressBaseline.get();
+  const target = shouldDismiss ? 0 : runtime.stores.gestures.internal.progressBaseline.get();
+  const progressVelocity = getPinchReleaseHandoffVelocity(event.velocity);
+  const handoffVelocity = getPinchReleaseHandoffVelocity(event.velocity, policy.gestureReleaseVelocityScale);
   return {
     target,
     shouldDismiss,
     initialVelocity: getProgressVelocityTowardTarget({
-      handoffVelocity: getPinchReleaseHandoffVelocity(event.velocity, policy.gestureReleaseVelocityScale),
+      handoffVelocity: progressVelocity,
       target,
       currentProgress
     }),
+    handoffVelocity: shouldDismiss ? resolveGestureVelocityMagnitude(handoffVelocity) : 0,
     transitionSpec: policy.transitionSpec,
     resetSpec: shouldDismiss ? policy.transitionSpec?.close : policy.transitionSpec?.open
   };
@@ -79,8 +81,7 @@ export const resolveSnapPinchRelease = (event, runtime) => {
 
   const {
     participation,
-    policy,
-    lockedSnapPoint
+    policy
   } = runtime;
   const normalizedScale = clamp(normalizePinchScale(event.scale), -1, 1);
   const {
@@ -96,7 +97,7 @@ export const resolveSnapPinchRelease = (event, runtime) => {
   });
   const result = determineSnapTarget({
     currentProgress,
-    snapPoints: policy.gestureSnapLocked ? [lockedSnapPoint.get()] : resolvedSnapPoints,
+    snapPoints: policy.gestureSnapLocked ? [runtime.stores.gestures.internal.lockedSnapPoint.get() ?? resolvedMaxSnapPoint] : resolvedSnapPoints,
     velocity: getPinchSnapVelocity(event, runtime, normalizedScale),
     dimension: 1,
     velocityFactor: policy.gestureSnapVelocityImpact,
@@ -104,16 +105,19 @@ export const resolveSnapPinchRelease = (event, runtime) => {
   });
   const shouldDismiss = participation.canDismiss && result.shouldDismiss;
   const target = shouldDismiss ? 0 : result.targetProgress;
+  const progressVelocity = getPinchReleaseHandoffVelocity(event.velocity);
+  const handoffVelocity = getPinchReleaseHandoffVelocity(event.velocity, policy.gestureReleaseVelocityScale);
   return {
     target,
     shouldDismiss,
     initialVelocity: getProgressVelocityTowardTarget({
-      handoffVelocity: getPinchReleaseHandoffVelocity(event.velocity, policy.gestureReleaseVelocityScale),
+      handoffVelocity: progressVelocity,
       target,
       currentProgress
     }),
+    handoffVelocity: shouldDismiss ? resolveGestureVelocityMagnitude(handoffVelocity) : 0,
     commitProgress: currentProgress,
-    resetValuesImmediately: policy.gestureProgressMode === "progress-driven",
+    resetValuesImmediately: true,
     transitionSpec: resolveGestureSnapTransitionSpec({
       transitionSpec: policy.transitionSpec,
       shouldDismiss,

package/lib/module/shared/providers/screen/gestures/pinch/behavior/pinch-release.js.map

@@ -1 +1 @@
-{"version":3,"names":["clamp","getPinchReleaseHandoffVelocity","normalizePinchScale","shouldDismissFromPinch","getProgressVelocityTowardTarget","resolveGestureSnapTransitionSpec","primeRuntimeSnapPoint","resolveRuntimeGestureSnapPoints","determineSnapTarget","getPinchSnapDirection","normalizedScale","getPinchSnapVelocity","event","runtime","pinchDirection","snapDirections","policy","collapse","Math","abs","velocity","getPinchSnapReleaseProgress","minSnapPoint","maxSnapPoint","stores","animations","progress","get","progressDelta","gestureProgressBaseline","primeSnapPinchRelease","resolvePinchRelease","participation","scale","currentProgress","shouldDismiss","canDismiss","pinchInEnabled","pinchOutEnabled","target","initialVelocity","handoffVelocity","gestureReleaseVelocityScale","transitionSpec","resetSpec","close","open","resolveSnapPinchRelease","lockedSnapPoint","resolvedSnapPoints","resolvedMinSnapPoint","resolvedMaxSnapPoint","result","snapPoints","gestureSnapLocked","dimension","velocityFactor","gestureSnapVelocityImpact","targetProgress","commitProgress","resetValuesImmediately","gestureProgressMode"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/behavior/pinch-release.ts"],"mappings":";;AAAA,SAASA,KAAK,QAAQ,yBAAyB;AAC/C,SACCC,8BAA8B,EAC9BC,mBAAmB,EACnBC,sBAAsB,QAChB,sBAAsB;AAC7B,SACCC,+BAA+B,EAC/BC,gCAAgC,QAC1B,sBAAsB;AAC7B,SACCC,qBAAqB,EACrBC,+BAA+B,QACzB,0BAA0B;AACjC,SAASC,mBAAmB,QAAQ,sBAAsB;AAO1D,MAAMC,qBAAqB,GAAIC,eAAuB,IAAK;EAC1D,SAAS;;EACT,IAAIA,eAAe,GAAG,CAAC,EAAE;IACxB,OAAO,UAAU;EAClB;EAEA,IAAIA,eAAe,GAAG,CAAC,EAAE;IACxB,OAAO,WAAW;EACnB;EAEA,OAAO,IAAI;AACZ,CAAC;AAED,MAAMC,oBAAoB,GAAGA,CAC5BC,KAAwB,EACxBC,OAA4B,EAC5BH,eAAuB,KACnB;EACJ,SAAS;;EACT,MAAMI,cAAc,GAAGL,qBAAqB,CAACC,eAAe,CAAC;EAC7D,MAAMK,cAAc,GAAGF,OAAO,CAACG,MAAM,CAACD,cAAc;EAEpD,IAAI,CAACD,cAAc,IAAI,CAACC,cAAc,EAAE;IACvC,OAAO,CAAC;EACT;EAEA,OAAOA,cAAc,CAACE,QAAQ,KAAKH,cAAc,GAC9CI,IAAI,CAACC,GAAG,CAACP,KAAK,CAACQ,QAAQ,CAAC,GACxB,CAACF,IAAI,CAACC,GAAG,CAACP,KAAK,CAACQ,QAAQ,CAAC;AAC7B,CAAC;AAED,MAAMC,2BAA2B,GAAGA,CAAC;EACpCR,OAAO;EACPH,eAAe;EACfY,YAAY;EACZC;AAMD,CAAC,KAAK;EACL,SAAS;;EACT,MAAMT,cAAc,GAAGL,qBAAqB,CAACC,eAAe,CAAC;EAC7D,MAAMK,cAAc,GAAGF,OAAO,CAACG,MAAM,CAACD,cAAc;EAEpD,IAAI,CAACD,cAAc,IAAI,CAACC,cAAc,EAAE;IACvC,OAAOF,OAAO,CAACW,MAAM,CAACC,UAAU,CAACC,QAAQ,CAACC,GAAG,CAAC,CAAC;EAChD;EAEA,MAAMC,aAAa,GAClBb,cAAc,CAACE,QAAQ,KAAKH,cAAc,GACvC,CAACI,IAAI,CAACC,GAAG,CAACT,eAAe,CAAC,GAC1BQ,IAAI,CAACC,GAAG,CAACT,eAAe,CAAC;EAE7B,OAAOV,KAAK,CACXa,OAAO,CAACgB,uBAAuB,CAACF,GAAG,CAAC,CAAC,GAAGC,aAAa,EACrDN,YAAY,EACZC,YACD,CAAC;AACF,CAAC;AAED,OAAO,MAAMO,qBAAqB,GAAIjB,OAA4B,IAAK;EACtE,SAAS;;EACTP,qBAAqB,CAACO,OAAO,CAAC;AAC/B,CAAC;AAED,OAAO,MAAMkB,mBAAmB,GAAGA,CAClCnB,KAAwB,EACxBC,OAA4B,KACJ;EACxB,SAAS;;EACT,MAAM;IACLmB,aAAa;IACbhB,MAAM;IACNa,uBAAuB;IACvBL,MAAM,EAAE;MAAEC;IAAW;EACtB,CAAC,GAAGZ,OAAO;EACX,MAAMH,eAAe,GAAGV,KAAK,CAACE,mBAAmB,CAACU,KAAK,CAACqB,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;EACtE,MAAMC,eAAe,GAAGT,UAAU,CAACC,QAAQ,CAACC,GAAG,CAAC,CAAC;EACjD,MAAMQ,aAAa,GAClBH,aAAa,CAACI,UAAU,IACxBjC,sBAAsB,CACrBO,eAAe,EACfM,MAAM,CAACqB,cAAc,EACrBrB,MAAM,CAACsB,eACR,CAAC;EACF,MAAMC,MAAM,GAAGJ,aAAa,GAAG,CAAC,GAAGN,uBAAuB,CAACF,GAAG,CAAC,CAAC;EAEhE,OAAO;IACNY,MAAM;IACNJ,aAAa;IACbK,eAAe,EAAEpC,+BAA+B,CAAC;MAChDqC,eAAe,EAAExC,8BAA8B,CAC9CW,KAAK,CAACQ,QAAQ,EACdJ,MAAM,CAAC0B,2BACR,CAAC;MACDH,MAAM;MACNL;IACD,CAAC,CAAC;IACFS,cAAc,EAAE3B,MAAM,CAAC2B,cAAc;IACrCC,SAAS,EAAET,aAAa,GACrBnB,MAAM,CAAC2B,cAAc,EAAEE,KAAK,GAC5B7B,MAAM,CAAC2B,cAAc,EAAEG;EAC3B,CAAC;AACF,CAAC;AAED,OAAO,MAAMC,uBAAuB,GAAGA,CACtCnC,KAAwB,EACxBC,OAA4B,KACJ;EACxB,SAAS;;EACT,MAAM;IAAEmB,aAAa;IAAEhB,MAAM;IAAEgC;EAAgB,CAAC,GAAGnC,OAAO;EAC1D,MAAMH,eAAe,GAAGV,KAAK,CAACE,mBAAmB,CAACU,KAAK,CAACqB,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;EAEtE,MAAM;IAAEgB,kBAAkB;IAAEC,oBAAoB;IAAEC;EAAqB,CAAC,GACvE5C,+BAA+B,CAACM,OAAO,CAAC;EACzC,MAAMqB,eAAe,GAAGb,2BAA2B,CAAC;IACnDR,OAAO;IACPH,eAAe;IACfY,YAAY,EAAE4B,oBAAoB;IAClC3B,YAAY,EAAE4B;EACf,CAAC,CAAC;EAEF,MAAMC,MAAM,GAAG5C,mBAAmB,CAAC;IAClC0B,eAAe;IACfmB,UAAU,EAAErC,MAAM,CAACsC,iBAAiB,GACjC,CAACN,eAAe,CAACrB,GAAG,CAAC,CAAC,CAAC,GACvBsB,kBAAkB;IACrB7B,QAAQ,EAAET,oBAAoB,CAACC,KAAK,EAAEC,OAAO,EAAEH,eAAe,CAAC;IAC/D6C,SAAS,EAAE,CAAC;IACZC,cAAc,EAAExC,MAAM,CAACyC,yBAAyB;IAChDrB,UAAU,EAAEJ,aAAa,CAACI;EAC3B,CAAC,CAAC;EAEF,MAAMD,aAAa,GAAGH,aAAa,CAACI,UAAU,IAAIgB,MAAM,CAACjB,aAAa;EACtE,MAAMI,MAAM,GAAGJ,aAAa,GAAG,CAAC,GAAGiB,MAAM,CAACM,cAAc;EAExD,OAAO;IACNnB,MAAM;IACNJ,aAAa;IACbK,eAAe,EAAEpC,+BAA+B,CAAC;MAChDqC,eAAe,EAAExC,8BAA8B,CAC9CW,KAAK,CAACQ,QAAQ,EACdJ,MAAM,CAAC0B,2BACR,CAAC;MACDH,MAAM;MACNL;IACD,CAAC,CAAC;IACFyB,cAAc,EAAEzB,eAAe;IAC/B0B,sBAAsB,EAAE5C,MAAM,CAAC6C,mBAAmB,KAAK,iBAAiB;IACxElB,cAAc,EAAEtC,gCAAgC,CAAC;MAChDsC,cAAc,EAAE3B,MAAM,CAAC2B,cAAc;MACrCR,aAAa;MACbI,MAAM;MACNL;IACD,CAAC,CAAC;IACFU,SAAS,EAAET,aAAa,GACrBnB,MAAM,CAAC2B,cAAc,EAAEE,KAAK,GAC5B7B,MAAM,CAAC2B,cAAc,EAAEG;EAC3B,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["clamp","getPinchReleaseHandoffVelocity","normalizePinchScale","resolveGestureVelocityMagnitude","shouldDismissFromPinch","getProgressVelocityTowardTarget","resolveGestureSnapTransitionSpec","primeRuntimeSnapPoint","resolveRuntimeGestureSnapPoints","determineSnapTarget","getPinchSnapDirection","normalizedScale","getPinchSnapVelocity","event","runtime","pinchDirection","snapDirections","policy","collapse","Math","abs","velocity","getPinchSnapReleaseProgress","minSnapPoint","maxSnapPoint","stores","animations","transitionProgress","get","progressDelta","gestures","internal","progressBaseline","primeSnapPinchRelease","resolvePinchRelease","participation","scale","currentProgress","shouldDismiss","canDismiss","pinchInEnabled","pinchOutEnabled","target","progressVelocity","handoffVelocity","gestureReleaseVelocityScale","initialVelocity","transitionSpec","resetSpec","close","open","resolveSnapPinchRelease","resolvedSnapPoints","resolvedMinSnapPoint","resolvedMaxSnapPoint","result","snapPoints","gestureSnapLocked","lockedSnapPoint","dimension","velocityFactor","gestureSnapVelocityImpact","targetProgress","commitProgress","resetValuesImmediately"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/behavior/pinch-release.ts"],"mappings":"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","ignoreList":[]}