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

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_useNavigationHelpers","_useGestureSensitivity","_runtime","_panLifecycle","_panRelease","usePanBehavior","runtime","screenOptions","dimensions","gestureCompositionActivation","dismissScreen","requestDismiss","useNavigationHelpers","withSensitivity","resetSensitivity","usePanGestureSensitivity","onStart","useCallback","latestRuntime","resolvePanRuntime","get","gestures","stores","x","set","y","normX","normY","velocity","raw","participation","effectiveSnapPoints","hasSnapPoints","primeSnapPanRelease","startPanBase","onUpdate","rawEvent","event","trackPanGesture","onEnd","release","policy","enabled","target","animations","progress","shouldDismiss","initialVelocity","transitionSpec","undefined","resetSpec","open","resolveSnapPanRelease","resolvePanRelease","isPanComposition","finalizePanRelease","useMemo","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pan/behavior/use-pan-behavior.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_useNavigationHelpers","_useGestureSensitivity","_runtime","_values","_panLifecycle","_panRelease","usePanBehavior","runtime","screenOptions","dimensions","gestureCompositionOwner","dismissScreen","requestDismiss","useNavigationHelpers","withSensitivity","resetSensitivity","usePanGestureSensitivity","onStart","useCallback","latestRuntime","resolvePanRuntime","get","clearPanTrackingValues","stores","gestures","participation","effectiveSnapPoints","hasSnapPoints","primeSnapPanRelease","startPanBase","onUpdate","rawEvent","event","trackPanGesture","onEnd","release","policy","enabled","target","animations","transitionProgress","shouldDismiss","initialVelocity","transitionSpec","undefined","resetSpec","open","resolveSnapPanRelease","resolvePanRelease","isPanCompositionOwner","finalizePanRelease","set","useMemo","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pan/behavior/use-pan-behavior.ts"],"mappings":"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","ignoreList":[]}

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

@@ -8,7 +8,6 @@ var _react = require("react");
 var _reactNative = require("react-native");
 var _reactNativeGestureHandler = require("react-native-gesture-handler");
 var _options = require("../../options");
-var _useGestureBuilderState = require("../hooks/use-gesture-builder-state");
 var _useStableRuntimeConfig = require("../hooks/use-stable-runtime-config");
 var _usePanActivation = require("./activation/use-pan-activation");
 var _usePanBehavior = require("./behavior/use-pan-behavior");
@@ -16,7 +15,7 @@ const useBuildPanGesture = ({
   scrollState,
   gestureConfig,
   childDirectionClaims,
-  gestureCompositionActivation
+  gestureCompositionOwner
 }) => {
   const dimensions = (0, _reactNative.useWindowDimensions)();
   const {
@@ -24,15 +23,9 @@ const useBuildPanGesture = ({
     pan: policy
   } = gestureConfig;
   const screenOptions = (0, _options.useScreenOptionsContext)();
-  const {
-    gestureProgressBaseline,
-    lockedSnapPoint
-  } = (0, _useGestureBuilderState.useGestureBuilderState)(participation);
   const runtime = (0, _useStableRuntimeConfig.useStableRuntimeConfig)({
     participation,
-    policy,
-    gestureProgressBaseline,
-    lockedSnapPoint
+    policy
   });
   const activation = (0, _usePanActivation.usePanActivation)({
     scrollState,
@@ -40,9 +33,9 @@ const useBuildPanGesture = ({
     runtime,
     screenOptions,
     dimensions,
-    gestureCompositionActivation
+    gestureCompositionOwner
   });
-  const behavior = (0, _usePanBehavior.usePanBehavior)(runtime, screenOptions, dimensions, gestureCompositionActivation);
+  const behavior = (0, _usePanBehavior.usePanBehavior)(runtime, screenOptions, dimensions, gestureCompositionOwner);
   const panGesture = (0, _react.useMemo)(() => {
     return _reactNativeGestureHandler.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/commonjs/shared/providers/screen/gestures/pan/use-build-pan-gesture.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeGestureHandler","_options","_useGestureBuilderState","_useStableRuntimeConfig","_usePanActivation","_usePanBehavior","useBuildPanGesture","scrollState","gestureConfig","childDirectionClaims","gestureCompositionActivation","dimensions","useWindowDimensions","participation","pan","policy","screenOptions","useScreenOptionsContext","gestureProgressBaseline","lockedSnapPoint","useGestureBuilderState","runtime","useStableRuntimeConfig","activation","usePanActivation","behavior","usePanBehavior","panGesture","useMemo","Gesture","Pan","enabled","manualActivation","averageTouches","onTouchesDown","onTouchesMove","onStart","onUpdate","onEnd","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/pan/use-build-pan-gesture.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,0BAAA,GAAAF,OAAA;AAEA,IAAAG,QAAA,GAAAH,OAAA;AACA,IAAAI,uBAAA,GAAAJ,OAAA;AACA,IAAAK,uBAAA,GAAAL,OAAA;AAQA,IAAAM,iBAAA,GAAAN,OAAA;AACA,IAAAO,eAAA,GAAAP,OAAA;AASO,MAAMQ,kBAAkB,GAAGA,CAAC;EAClCC,WAAW;EACXC,aAAa;EACbC,oBAAoB;EACpBC;AACwB,CAAC,KAAiB;EAC1C,MAAMC,UAAU,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EACxC,MAAM;IAAEC,aAAa;IAAEC,GAAG,EAAEC;EAAO,CAAC,GAAGP,aAAa;EACpD,MAAMQ,aAAa,GAAG,IAAAC,gCAAuB,EAAC,CAAC;EAE/C,MAAM;IAAEC,uBAAuB;IAAEC;EAAgB,CAAC,GACjD,IAAAC,8CAAsB,EAACP,aAAa,CAAC;EAEtC,MAAMQ,OAAO,GAAG,IAAAC,8CAAsB,EAAC;IACtCT,aAAa;IACbE,MAAM;IACNG,uBAAuB;IACvBC;EACD,CAAC,CAAC;EAEF,MAAMI,UAAU,GAAG,IAAAC,kCAAgB,EAAC;IACnCjB,WAAW;IACXE,oBAAoB;IACpBY,OAAO;IACPL,aAAa;IACbL,UAAU;IACVD;EACD,CAAC,CAAC;EAEF,MAAMe,QAAQ,GAAG,IAAAC,8BAAc,EAC9BL,OAAO,EACPL,aAAa,EACbL,UAAU,EACVD,4BACD,CAAC;EAED,MAAMiB,UAAU,GAAG,IAAAC,cAAO,EAAC,MAAM;IAChC,OAAOC,kCAAO,CAACC,GAAG,CAAC,CAAC,CAClBC,OAAO,CAAC,IAAI,CAAC,CACbC,gBAAgB,CAAC,IAAI,CAAC,CACtBC,cAAc,CAAC,IAAI,CAAC,CACpBC,aAAa,CAACX,UAAU,CAACW,aAAa,CAAC,CACvCC,aAAa,CAACZ,UAAU,CAACY,aAAa,CAAC,CACvCC,OAAO,CAACX,QAAQ,CAACW,OAAO,CAAC,CACzBC,QAAQ,CAACZ,QAAQ,CAACY,QAAQ,CAAC,CAC3BC,KAAK,CAACb,QAAQ,CAACa,KAAK,CAAC;EACxB,CAAC,EAAE,CAACf,UAAU,EAAEE,QAAQ,CAAC,CAAC;EAE1B,OAAOE,UAAU;AAClB,CAAC;AAACY,OAAA,CAAAjC,kBAAA,GAAAA,kBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeGestureHandler","_options","_useStableRuntimeConfig","_usePanActivation","_usePanBehavior","useBuildPanGesture","scrollState","gestureConfig","childDirectionClaims","gestureCompositionOwner","dimensions","useWindowDimensions","participation","pan","policy","screenOptions","useScreenOptionsContext","runtime","useStableRuntimeConfig","activation","usePanActivation","behavior","usePanBehavior","panGesture","useMemo","Gesture","Pan","enabled","manualActivation","averageTouches","onTouchesDown","onTouchesMove","onStart","onUpdate","onEnd","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/pan/use-build-pan-gesture.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,0BAAA,GAAAF,OAAA;AAEA,IAAAG,QAAA,GAAAH,OAAA;AACA,IAAAI,uBAAA,GAAAJ,OAAA;AAQA,IAAAK,iBAAA,GAAAL,OAAA;AACA,IAAAM,eAAA,GAAAN,OAAA;AASO,MAAMO,kBAAkB,GAAGA,CAAC;EAClCC,WAAW;EACXC,aAAa;EACbC,oBAAoB;EACpBC;AACwB,CAAC,KAAiB;EAC1C,MAAMC,UAAU,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EACxC,MAAM;IAAEC,aAAa;IAAEC,GAAG,EAAEC;EAAO,CAAC,GAAGP,aAAa;EACpD,MAAMQ,aAAa,GAAG,IAAAC,gCAAuB,EAAC,CAAC;EAE/C,MAAMC,OAAO,GAAG,IAAAC,8CAAsB,EAAC;IACtCN,aAAa;IACbE;EACD,CAAC,CAAC;EAEF,MAAMK,UAAU,GAAG,IAAAC,kCAAgB,EAAC;IACnCd,WAAW;IACXE,oBAAoB;IACpBS,OAAO;IACPF,aAAa;IACbL,UAAU;IACVD;EACD,CAAC,CAAC;EAEF,MAAMY,QAAQ,GAAG,IAAAC,8BAAc,EAC9BL,OAAO,EACPF,aAAa,EACbL,UAAU,EACVD,uBACD,CAAC;EAED,MAAMc,UAAU,GAAG,IAAAC,cAAO,EAAC,MAAM;IAChC,OAAOC,kCAAO,CAACC,GAAG,CAAC,CAAC,CAClBC,OAAO,CAAC,IAAI,CAAC,CACbC,gBAAgB,CAAC,IAAI,CAAC,CACtBC,cAAc,CAAC,IAAI,CAAC,CACpBC,aAAa,CAACX,UAAU,CAACW,aAAa,CAAC,CACvCC,aAAa,CAACZ,UAAU,CAACY,aAAa,CAAC,CACvCC,OAAO,CAACX,QAAQ,CAACW,OAAO,CAAC,CACzBC,QAAQ,CAACZ,QAAQ,CAACY,QAAQ,CAAC,CAC3BC,KAAK,CAACb,QAAQ,CAACa,KAAK,CAAC;EACxB,CAAC,EAAE,CAACf,UAAU,EAAEE,QAAQ,CAAC,CAAC;EAE1B,OAAOE,UAAU;AAClB,CAAC;AAACY,OAAA,CAAA9B,kBAAA,GAAAA,kBAAA","ignoreList":[]}

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

@@ -9,7 +9,7 @@ var _runtime = require("../../shared/runtime");
 const usePinchActivation = ({
   runtime,
   screenOptions,
-  gestureCompositionActivation
+  gestureCompositionOwner
 }) => {
   const onTouchesDown = (0, _react.useCallback)((event, stateManager) => {
     "worklet";
@@ -18,23 +18,21 @@ const usePinchActivation = ({
       participation,
       policy
     } = (0, _runtime.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 = (0, _react.useCallback)((event, stateManager) => {
     "worklet";
 
@@ -47,12 +45,16 @@ 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 (0, _react.useMemo)(() => ({
     onTouchesDown,
     onTouchesMove

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_runtime","usePinchActivation","runtime","screenOptions","gestureCompositionActivation","onTouchesDown","useCallback","event","stateManager","participation","policy","resolvePinchRuntime","get","fail","canTrackGesture","enabled","numberOfTouches","set","activate","onTouchesMove","useMemo","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/activation/use-pinch-activation.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAOA,IAAAC,QAAA,GAAAD,OAAA;AAYO,MAAME,kBAAkB,GAAGA,CAAC;EAClCC,OAAO;EACPC,aAAa;EACbC;AACwB,CAAC,KAAK;EAC9B,MAAMC,aAAa,GAAG,IAAAC,kBAAW,EAChC,CACCC,KAAwB,EACxBC,YAA6C,KACzC;IACJ,SAAS;;IACT,MAAM;MAAEC,aAAa;MAAEC;IAAO,CAAC,GAAG,IAAAC,4BAAmB,EACpDT,OAAO,CAACU,GAAG,CAAC,CAAC,EACbT,aAAa,CAACS,GAAG,CAAC,CACnB,CAAC;IAED,IAAIR,4BAA4B,CAACQ,GAAG,CAAC,CAAC,KAAK,KAAK,EAAE;MACjDJ,YAAY,EAAEK,IAAI,CAAC,CAAC;MACpB;IACD;IAEA,IAAI,CAACJ,aAAa,CAACK,eAAe,IAAI,CAACJ,MAAM,CAACK,OAAO,EAAE;MACtDP,YAAY,EAAEK,IAAI,CAAC,CAAC;MACpB;IACD;IAEA,IAAIN,KAAK,CAACS,eAAe,KAAK,CAAC,EAAE;MAChCZ,4BAA4B,CAACa,GAAG,CAAC,OAAO,CAAC;MACzCT,YAAY,EAAEU,QAAQ,CAAC,CAAC;MACxB;IACD;IAEA,IAAIX,KAAK,CAACS,eAAe,GAAG,CAAC,EAAE;MAC9BR,YAAY,EAAEK,IAAI,CAAC,CAAC;IACrB;EACD,CAAC,EACD,CAACX,OAAO,EAAEC,aAAa,EAAEC,4BAA4B,CACtD,CAAC;EAED,MAAMe,aAAa,GAAG,IAAAb,kBAAW,EAChC,CAACC,KAAwB,EAAEC,YAAiC,KAAK;IAChE,SAAS;;IACT,MAAM;MAAEC,aAAa;MAAEC;IAAO,CAAC,GAAG,IAAAC,4BAAmB,EACpDT,OAAO,CAACU,GAAG,CAAC,CAAC,EACbT,aAAa,CAACS,GAAG,CAAC,CACnB,CAAC;IAED,IAAI,CAACH,aAAa,CAACK,eAAe,IAAI,CAACJ,MAAM,CAACK,OAAO,EAAE;MACtDP,YAAY,CAACK,IAAI,CAAC,CAAC;MACnB;IACD;IAEA,IAAIN,KAAK,CAACS,eAAe,KAAK,CAAC,EAAE;MAChCZ,4BAA4B,CAACa,GAAG,CAAC,OAAO,CAAC;MACzCT,YAAY,CAACU,QAAQ,CAAC,CAAC;MACvB;IACD;IAEAV,YAAY,CAACK,IAAI,CAAC,CAAC;EACpB,CAAC,EACD,CAACX,OAAO,EAAEC,aAAa,EAAEC,4BAA4B,CACtD,CAAC;EAED,OAAO,IAAAgB,cAAO,EACb,OAAO;IAAEf,aAAa;IAAEc;EAAc,CAAC,CAAC,EACxC,CAACd,aAAa,EAAEc,aAAa,CAC9B,CAAC;AACF,CAAC;AAACE,OAAA,CAAApB,kBAAA,GAAAA,kBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_runtime","usePinchActivation","runtime","screenOptions","gestureCompositionOwner","onTouchesDown","useCallback","event","stateManager","participation","policy","resolvePinchRuntime","get","canTrackGesture","enabled","fail","numberOfTouches","set","activate","onTouchesMove","useMemo","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/activation/use-pinch-activation.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAOA,IAAAC,QAAA,GAAAD,OAAA;AASO,MAAME,kBAAkB,GAAGA,CAAC;EAClCC,OAAO;EACPC,aAAa;EACbC;AACwB,CAAC,KAAK;EAC9B,MAAMC,aAAa,GAAG,IAAAC,kBAAW,EAChC,CACCC,KAAwB,EACxBC,YAA6C,KACzC;IACJ,SAAS;;IACT,MAAM;MAAEC,aAAa;MAAEC;IAAO,CAAC,GAAG,IAAAC,4BAAmB,EACpDT,OAAO,CAACU,GAAG,CAAC,CAAC,EACbT,aAAa,CAACS,GAAG,CAAC,CACnB,CAAC;IAED,IAAI,CAACH,aAAa,CAACI,eAAe,IAAI,CAACH,MAAM,CAACI,OAAO,EAAE;MACtDN,YAAY,EAAEO,IAAI,CAAC,CAAC;MACpB;IACD;IAEA,IAAIR,KAAK,CAACS,eAAe,KAAK,CAAC,EAAE;MAChC,IAAIZ,uBAAuB,CAACQ,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE;QAC3CR,uBAAuB,CAACa,GAAG,CAAC,OAAO,CAAC;MACrC;MACAT,YAAY,EAAEU,QAAQ,CAAC,CAAC;MACxB;IACD;IAEA,IAAIX,KAAK,CAACS,eAAe,GAAG,CAAC,EAAE;MAC9BR,YAAY,EAAEO,IAAI,CAAC,CAAC;IACrB;EACD,CAAC,EACD,CAACb,OAAO,EAAEC,aAAa,EAAEC,uBAAuB,CACjD,CAAC;EAED,MAAMe,aAAa,GAAG,IAAAb,kBAAW,EAChC,CAACC,KAAwB,EAAEC,YAAiC,KAAK;IAChE,SAAS;;IACT,MAAM;MAAEC,aAAa;MAAEC;IAAO,CAAC,GAAG,IAAAC,4BAAmB,EACpDT,OAAO,CAACU,GAAG,CAAC,CAAC,EACbT,aAAa,CAACS,GAAG,CAAC,CACnB,CAAC;IAED,IAAI,CAACH,aAAa,CAACI,eAAe,IAAI,CAACH,MAAM,CAACI,OAAO,EAAE;MACtDN,YAAY,CAACO,IAAI,CAAC,CAAC;MACnB;IACD;IAEA,IAAIR,KAAK,CAACS,eAAe,KAAK,CAAC,EAAE;MAChC,IAAIZ,uBAAuB,CAACQ,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE;QAC3CR,uBAAuB,CAACa,GAAG,CAAC,OAAO,CAAC;MACrC;MACAT,YAAY,CAACU,QAAQ,CAAC,CAAC;MACvB;IACD;IAEA,IAAIX,KAAK,CAACS,eAAe,GAAG,CAAC,EAAE;MAC9BR,YAAY,CAACO,IAAI,CAAC,CAAC;IACpB;EACD,CAAC,EACD,CAACb,OAAO,EAAEC,aAAa,EAAEC,uBAAuB,CACjD,CAAC;EAED,OAAO,IAAAgB,cAAO,EACb,OAAO;IAAEf,aAAa;IAAEc;EAAc,CAAC,CAAC,EACxC,CAACd,aAAa,EAAEc,aAAa,CAC9B,CAAC;AACF,CAAC;AAACE,OAAA,CAAApB,kBAAA,GAAAA,kBAAA","ignoreList":[]}

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

@@ -9,6 +9,8 @@ var _constants = require("../../../../../constants");
 var _animateToProgress = require("../../../../../utils/animation/animate-to-progress");
 var _emit = require("../../../../../utils/animation/emit");
 var _physics = require("../../shared/physics");
+var _snapshot = require("../../shared/snapshot");
+var _values = require("../../shared/values");
 var _pinchReset = require("./pinch-reset");
 const startPinchBase = (runtime, event) => {
   "worklet";
@@ -17,8 +19,7 @@ const startPinchBase = (runtime, event) => {
     stores: {
       gestures,
       animations
-    },
-    gestureProgressBaseline
+    }
   } = runtime;
   const wasSettling = gestures.settling.get();
   const hasResidualGesture = Math.abs(gestures.normScale.get()) > _constants.EPSILON || Math.abs(gestures.rotation.get()) > _constants.EPSILON;
@@ -31,15 +32,10 @@ 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);
+  (0, _values.clearTransformTrackingValues)(gestures);
   gestures.focalX.set(event.focalX);
   gestures.focalY.set(event.focalY);
-  gestureProgressBaseline.set(animations.progress.get());
+  gestures.internal.progressBaseline.set(animations.transitionProgress.get());
 };
 exports.startPinchBase = startPinchBase;
 const trackPinchGesture = (event, rawEvent, gestures) => {
@@ -51,6 +47,8 @@ const trackPinchGesture = (event, rawEvent, gestures) => {
   const rawScale = (0, _reactNativeReanimated.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);
@@ -71,9 +69,14 @@ const finalizePinchRelease = (release, runtime, dismissScreen, requestDismiss) =
     }
   } = runtime;
   if (typeof release.commitProgress === "number") {
-    animations.progress.set(release.commitProgress);
+    animations.transitionProgress.set(release.commitProgress);
     system.targetProgress.set(release.commitProgress);
   }
+  if (release.shouldDismiss) {
+    (0, _snapshot.snapshotGestureHandoff)(gestures, {
+      velocity: release.handoffVelocity
+    });
+  }
   (0, _pinchReset.resetPinchGestureValues)({
     spec: release.resetSpec,
     gestures,

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_constants","_animateToProgress","_emit","_physics","_pinchReset","startPinchBase","runtime","event","stores","gestures","animations","gestureProgressBaseline","wasSettling","settling","get","hasResidualGesture","Math","abs","normScale","EPSILON","rotation","emit","willAnimate","TRUE","FALSE","dragging","set","dismissing","active","direction","velocity","scale","raw","focalX","focalY","progress","exports","trackPinchGesture","rawEvent","clamp","normalizePinchScale","rawNormScale","rawScale","finalizePinchRelease","release","dismissScreen","requestDismiss","system","commitProgress","targetProgress","resetPinchGestureValues","spec","resetSpec","shouldDismiss","resetValuesImmediately","runOnJS","animateToProgress","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":["_reactNativeReanimated","require","_constants","_animateToProgress","_emit","_physics","_snapshot","_values","_pinchReset","startPinchBase","runtime","event","stores","gestures","animations","wasSettling","settling","get","hasResidualGesture","Math","abs","normScale","EPSILON","rotation","emit","willAnimate","TRUE","FALSE","dragging","set","dismissing","active","direction","velocity","clearTransformTrackingValues","focalX","focalY","internal","progressBaseline","transitionProgress","exports","trackPinchGesture","rawEvent","clamp","normalizePinchScale","scale","rawNormScale","rawScale","raw","finalizePinchRelease","release","dismissScreen","requestDismiss","system","commitProgress","targetProgress","shouldDismiss","snapshotGestureHandoff","handoffVelocity","resetPinchGestureValues","spec","resetSpec","resetValuesImmediately","runOnJS","animateToProgress","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/commonjs/shared/providers/screen/gestures/pinch/behavior/pinch-release.js

@@ -41,10 +41,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 (0, _reactNativeReanimated.clamp)(runtime.gestureProgressBaseline.get() + progressDelta, minSnapPoint, maxSnapPoint);
+  return (0, _reactNativeReanimated.clamp)(runtime.stores.gestures.internal.progressBaseline.get() + progressDelta, minSnapPoint, maxSnapPoint);
 };
 const primeSnapPinchRelease = runtime => {
   "worklet";
@@ -58,23 +58,25 @@ const resolvePinchRelease = (event, runtime) => {
   const {
     participation,
     policy,
-    gestureProgressBaseline,
     stores: {
       animations
     }
   } = runtime;
   const normalizedScale = (0, _reactNativeReanimated.clamp)((0, _physics.normalizePinchScale)(event.scale), -1, 1);
-  const currentProgress = animations.progress.get();
+  const currentProgress = animations.transitionProgress.get();
   const shouldDismiss = participation.canDismiss && (0, _physics.shouldDismissFromPinch)(normalizedScale, policy.pinchInEnabled, policy.pinchOutEnabled);
-  const target = shouldDismiss ? 0 : gestureProgressBaseline.get();
+  const target = shouldDismiss ? 0 : runtime.stores.gestures.internal.progressBaseline.get();
+  const progressVelocity = (0, _physics.getPinchReleaseHandoffVelocity)(event.velocity);
+  const handoffVelocity = (0, _physics.getPinchReleaseHandoffVelocity)(event.velocity, policy.gestureReleaseVelocityScale);
   return {
     target,
     shouldDismiss,
     initialVelocity: (0, _release.getProgressVelocityTowardTarget)({
-      handoffVelocity: (0, _physics.getPinchReleaseHandoffVelocity)(event.velocity, policy.gestureReleaseVelocityScale),
+      handoffVelocity: progressVelocity,
       target,
       currentProgress
     }),
+    handoffVelocity: shouldDismiss ? (0, _physics.resolveGestureVelocityMagnitude)(handoffVelocity) : 0,
     transitionSpec: policy.transitionSpec,
     resetSpec: shouldDismiss ? policy.transitionSpec?.close : policy.transitionSpec?.open
   };
@@ -85,8 +87,7 @@ const resolveSnapPinchRelease = (event, runtime) => {
 
   const {
     participation,
-    policy,
-    lockedSnapPoint
+    policy
   } = runtime;
   const normalizedScale = (0, _reactNativeReanimated.clamp)((0, _physics.normalizePinchScale)(event.scale), -1, 1);
   const {
@@ -102,7 +103,7 @@ const resolveSnapPinchRelease = (event, runtime) => {
   });
   const result = (0, _targets.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,
@@ -110,16 +111,19 @@ const resolveSnapPinchRelease = (event, runtime) => {
   });
   const shouldDismiss = participation.canDismiss && result.shouldDismiss;
   const target = shouldDismiss ? 0 : result.targetProgress;
+  const progressVelocity = (0, _physics.getPinchReleaseHandoffVelocity)(event.velocity);
+  const handoffVelocity = (0, _physics.getPinchReleaseHandoffVelocity)(event.velocity, policy.gestureReleaseVelocityScale);
   return {
     target,
     shouldDismiss,
     initialVelocity: (0, _release.getProgressVelocityTowardTarget)({
-      handoffVelocity: (0, _physics.getPinchReleaseHandoffVelocity)(event.velocity, policy.gestureReleaseVelocityScale),
+      handoffVelocity: progressVelocity,
       target,
       currentProgress
     }),
+    handoffVelocity: shouldDismiss ? (0, _physics.resolveGestureVelocityMagnitude)(handoffVelocity) : 0,
     commitProgress: currentProgress,
-    resetValuesImmediately: policy.gestureProgressMode === "progress-driven",
+    resetValuesImmediately: true,
     transitionSpec: (0, _release.resolveGestureSnapTransitionSpec)({
       transitionSpec: policy.transitionSpec,
       shouldDismiss,

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_physics","_release","_snapPoints","_targets","getPinchSnapDirection","normalizedScale","getPinchSnapVelocity","event","runtime","pinchDirection","snapDirections","policy","collapse","Math","abs","velocity","getPinchSnapReleaseProgress","minSnapPoint","maxSnapPoint","stores","animations","progress","get","progressDelta","clamp","gestureProgressBaseline","primeSnapPinchRelease","primeRuntimeSnapPoint","exports","resolvePinchRelease","participation","normalizePinchScale","scale","currentProgress","shouldDismiss","canDismiss","shouldDismissFromPinch","pinchInEnabled","pinchOutEnabled","target","initialVelocity","getProgressVelocityTowardTarget","handoffVelocity","getPinchReleaseHandoffVelocity","gestureReleaseVelocityScale","transitionSpec","resetSpec","close","open","resolveSnapPinchRelease","lockedSnapPoint","resolvedSnapPoints","resolvedMinSnapPoint","resolvedMaxSnapPoint","resolveRuntimeGestureSnapPoints","result","determineSnapTarget","snapPoints","gestureSnapLocked","dimension","velocityFactor","gestureSnapVelocityImpact","targetProgress","commitProgress","resetValuesImmediately","gestureProgressMode","resolveGestureSnapTransitionSpec"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/behavior/pinch-release.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_physics","_release","_snapPoints","_targets","getPinchSnapDirection","normalizedScale","getPinchSnapVelocity","event","runtime","pinchDirection","snapDirections","policy","collapse","Math","abs","velocity","getPinchSnapReleaseProgress","minSnapPoint","maxSnapPoint","stores","animations","transitionProgress","get","progressDelta","clamp","gestures","internal","progressBaseline","primeSnapPinchRelease","primeRuntimeSnapPoint","exports","resolvePinchRelease","participation","normalizePinchScale","scale","currentProgress","shouldDismiss","canDismiss","shouldDismissFromPinch","pinchInEnabled","pinchOutEnabled","target","progressVelocity","getPinchReleaseHandoffVelocity","handoffVelocity","gestureReleaseVelocityScale","initialVelocity","getProgressVelocityTowardTarget","resolveGestureVelocityMagnitude","transitionSpec","resetSpec","close","open","resolveSnapPinchRelease","resolvedSnapPoints","resolvedMinSnapPoint","resolvedMaxSnapPoint","resolveRuntimeGestureSnapPoints","result","determineSnapTarget","snapPoints","gestureSnapLocked","lockedSnapPoint","dimension","velocityFactor","gestureSnapVelocityImpact","targetProgress","commitProgress","resetValuesImmediately","resolveGestureSnapTransitionSpec"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/behavior/pinch-release.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AAMA,IAAAE,QAAA,GAAAF,OAAA;AAIA,IAAAG,WAAA,GAAAH,OAAA;AAIA,IAAAI,QAAA,GAAAJ,OAAA;AAOA,MAAMK,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,kBAAkB,CAACC,GAAG,CAAC,CAAC;EAC1D;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,OAAO,IAAAmB,4BAAK,EACXhB,OAAO,CAACW,MAAM,CAACM,QAAQ,CAACC,QAAQ,CAACC,gBAAgB,CAACL,GAAG,CAAC,CAAC,GAAGC,aAAa,EACvEN,YAAY,EACZC,YACD,CAAC;AACF,CAAC;AAEM,MAAMU,qBAAqB,GAAIpB,OAA4B,IAAK;EACtE,SAAS;;EACT,IAAAqB,iCAAqB,EAACrB,OAAO,CAAC;AAC/B,CAAC;AAACsB,OAAA,CAAAF,qBAAA,GAAAA,qBAAA;AAEK,MAAMG,mBAAmB,GAAGA,CAClCxB,KAAwB,EACxBC,OAA4B,KACJ;EACxB,SAAS;;EACT,MAAM;IACLwB,aAAa;IACbrB,MAAM;IACNQ,MAAM,EAAE;MAAEC;IAAW;EACtB,CAAC,GAAGZ,OAAO;EACX,MAAMH,eAAe,GAAG,IAAAmB,4BAAK,EAAC,IAAAS,4BAAmB,EAAC1B,KAAK,CAAC2B,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;EACtE,MAAMC,eAAe,GAAGf,UAAU,CAACC,kBAAkB,CAACC,GAAG,CAAC,CAAC;EAC3D,MAAMc,aAAa,GAClBJ,aAAa,CAACK,UAAU,IACxB,IAAAC,+BAAsB,EACrBjC,eAAe,EACfM,MAAM,CAAC4B,cAAc,EACrB5B,MAAM,CAAC6B,eACR,CAAC;EACF,MAAMC,MAAM,GAAGL,aAAa,GACzB,CAAC,GACD5B,OAAO,CAACW,MAAM,CAACM,QAAQ,CAACC,QAAQ,CAACC,gBAAgB,CAACL,GAAG,CAAC,CAAC;EAC1D,MAAMoB,gBAAgB,GAAG,IAAAC,uCAA8B,EAACpC,KAAK,CAACQ,QAAQ,CAAC;EACvE,MAAM6B,eAAe,GAAG,IAAAD,uCAA8B,EACrDpC,KAAK,CAACQ,QAAQ,EACdJ,MAAM,CAACkC,2BACR,CAAC;EAED,OAAO;IACNJ,MAAM;IACNL,aAAa;IACbU,eAAe,EAAE,IAAAC,wCAA+B,EAAC;MAChDH,eAAe,EAAEF,gBAAgB;MACjCD,MAAM;MACNN;IACD,CAAC,CAAC;IACFS,eAAe,EAAER,aAAa,GAC3B,IAAAY,wCAA+B,EAACJ,eAAe,CAAC,GAChD,CAAC;IACJK,cAAc,EAAEtC,MAAM,CAACsC,cAAc;IACrCC,SAAS,EAAEd,aAAa,GACrBzB,MAAM,CAACsC,cAAc,EAAEE,KAAK,GAC5BxC,MAAM,CAACsC,cAAc,EAAEG;EAC3B,CAAC;AACF,CAAC;AAACtB,OAAA,CAAAC,mBAAA,GAAAA,mBAAA;AAEK,MAAMsB,uBAAuB,GAAGA,CACtC9C,KAAwB,EACxBC,OAA4B,KACJ;EACxB,SAAS;;EACT,MAAM;IAAEwB,aAAa;IAAErB;EAAO,CAAC,GAAGH,OAAO;EACzC,MAAMH,eAAe,GAAG,IAAAmB,4BAAK,EAAC,IAAAS,4BAAmB,EAAC1B,KAAK,CAAC2B,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;EAEtE,MAAM;IAAEoB,kBAAkB;IAAEC,oBAAoB;IAAEC;EAAqB,CAAC,GACvE,IAAAC,2CAA+B,EAACjD,OAAO,CAAC;EACzC,MAAM2B,eAAe,GAAGnB,2BAA2B,CAAC;IACnDR,OAAO;IACPH,eAAe;IACfY,YAAY,EAAEsC,oBAAoB;IAClCrC,YAAY,EAAEsC;EACf,CAAC,CAAC;EAEF,MAAME,MAAM,GAAG,IAAAC,4BAAmB,EAAC;IAClCxB,eAAe;IACfyB,UAAU,EAAEjD,MAAM,CAACkD,iBAAiB,GACjC,CACArD,OAAO,CAACW,MAAM,CAACM,QAAQ,CAACC,QAAQ,CAACoC,eAAe,CAACxC,GAAG,CAAC,CAAC,IACrDkC,oBAAoB,CACrB,GACAF,kBAAkB;IACrBvC,QAAQ,EAAET,oBAAoB,CAACC,KAAK,EAAEC,OAAO,EAAEH,eAAe,CAAC;IAC/D0D,SAAS,EAAE,CAAC;IACZC,cAAc,EAAErD,MAAM,CAACsD,yBAAyB;IAChD5B,UAAU,EAAEL,aAAa,CAACK;EAC3B,CAAC,CAAC;EAEF,MAAMD,aAAa,GAAGJ,aAAa,CAACK,UAAU,IAAIqB,MAAM,CAACtB,aAAa;EACtE,MAAMK,MAAM,GAAGL,aAAa,GAAG,CAAC,GAAGsB,MAAM,CAACQ,cAAc;EACxD,MAAMxB,gBAAgB,GAAG,IAAAC,uCAA8B,EAACpC,KAAK,CAACQ,QAAQ,CAAC;EACvE,MAAM6B,eAAe,GAAG,IAAAD,uCAA8B,EACrDpC,KAAK,CAACQ,QAAQ,EACdJ,MAAM,CAACkC,2BACR,CAAC;EAED,OAAO;IACNJ,MAAM;IACNL,aAAa;IACbU,eAAe,EAAE,IAAAC,wCAA+B,EAAC;MAChDH,eAAe,EAAEF,gBAAgB;MACjCD,MAAM;MACNN;IACD,CAAC,CAAC;IACFS,eAAe,EAAER,aAAa,GAC3B,IAAAY,wCAA+B,EAACJ,eAAe,CAAC,GAChD,CAAC;IACJuB,cAAc,EAAEhC,eAAe;IAC/BiC,sBAAsB,EAAE,IAAI;IAC5BnB,cAAc,EAAE,IAAAoB,yCAAgC,EAAC;MAChDpB,cAAc,EAAEtC,MAAM,CAACsC,cAAc;MACrCb,aAAa;MACbK,MAAM;MACNN;IACD,CAAC,CAAC;IACFe,SAAS,EAAEd,aAAa,GACrBzB,MAAM,CAACsC,cAAc,EAAEE,KAAK,GAC5BxC,MAAM,CAACsC,cAAc,EAAEG;EAC3B,CAAC;AACF,CAAC;AAACtB,OAAA,CAAAuB,uBAAA,GAAAA,uBAAA","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/gestures/pinch/behavior/pinch-reset.js

@@ -6,16 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.resetPinchGestureValues = void 0;
 var _constants = require("../../../../../constants");
 var _reset = require("../../shared/reset");
-const clearPinchSettlingIfResting = gestures => {
-  "worklet";
-
-  const isResting = !gestures.dragging.get() && !gestures.dismissing.get() && Math.abs(gestures.scale.get() - 1) <= _constants.EPSILON && Math.abs(gestures.normScale.get()) <= _constants.EPSILON && Math.abs(gestures.rotation.get()) <= _constants.EPSILON;
-  if (isResting) {
-    gestures.focalX.set(0);
-    gestures.focalY.set(0);
-  }
-  (0, _reset.clearGestureSettlingIfResting)(gestures, isResting);
-};
+var _values = require("../../shared/values");
 const resetPinchGestureValues = ({
   spec,
   gestures,
@@ -24,25 +15,39 @@ const resetPinchGestureValues = ({
 }) => {
   "worklet";
 
-  const resetSpec = (0, _reset.getGestureResetSpec)(spec);
-  if (!shouldDismiss) {
-    gestures.raw.scale.set(1);
-    gestures.raw.normScale.set(0);
-    gestures.raw.rotation.set(0);
-  }
+  const finishPinchReset = () => {
+    "worklet";
+
+    if (shouldDismiss) {
+      return;
+    }
+    (0, _values.clearFocalPoint)(gestures);
+    gestures.active.set(null);
+    gestures.direction.set(null);
+    gestures.settling.set(_constants.FALSE);
+  };
+  (0, _values.clearRawTransformValues)(gestures);
   gestures.dragging.set(_constants.FALSE);
   gestures.dismissing.set(shouldDismiss ? _constants.TRUE : _constants.FALSE);
   gestures.settling.set(shouldDismiss ? _constants.FALSE : _constants.TRUE);
+  if (shouldDismiss) {
+    (0, _values.clearFocalPoint)(gestures);
+  }
   if (resetValuesImmediately) {
-    gestures.scale.set(1);
-    gestures.normScale.set(0);
-    gestures.rotation.set(0);
-    clearPinchSettlingIfResting(gestures);
+    (0, _values.clearTransformTrackingValues)(gestures);
+    finishPinchReset();
     return;
   }
-  (0, _reset.animateResetValue)(gestures.scale, 1, resetSpec, () => clearPinchSettlingIfResting(gestures));
-  (0, _reset.animateResetValue)(gestures.normScale, 0, resetSpec, () => clearPinchSettlingIfResting(gestures));
-  (0, _reset.animateResetValue)(gestures.rotation, 0, resetSpec, () => clearPinchSettlingIfResting(gestures));
+  (0, _reset.animateMany)([{
+    value: gestures.scale,
+    toValue: 1
+  }, {
+    value: gestures.normScale,
+    toValue: 0
+  }, {
+    value: gestures.rotation,
+    toValue: 0
+  }], spec, finishPinchReset);
 };
 exports.resetPinchGestureValues = resetPinchGestureValues;
 //# sourceMappingURL=pinch-reset.js.map

package/lib/commonjs/shared/providers/screen/gestures/pinch/behavior/pinch-reset.js.map

@@ -1 +1 @@
-{"version":3,"names":["_constants","require","_reset","clearPinchSettlingIfResting","gestures","isResting","dragging","get","dismissing","Math","abs","scale","EPSILON","normScale","rotation","focalX","set","focalY","clearGestureSettlingIfResting","resetPinchGestureValues","spec","shouldDismiss","resetValuesImmediately","resetSpec","getGestureResetSpec","raw","FALSE","TRUE","settling","animateResetValue","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/behavior/pinch-reset.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAGA,IAAAC,MAAA,GAAAD,OAAA;AAaA,MAAME,2BAA2B,GAAIC,QAAyB,IAAK;EAClE,SAAS;;EAET,MAAMC,SAAS,GACd,CAACD,QAAQ,CAACE,QAAQ,CAACC,GAAG,CAAC,CAAC,IACxB,CAACH,QAAQ,CAACI,UAAU,CAACD,GAAG,CAAC,CAAC,IAC1BE,IAAI,CAACC,GAAG,CAACN,QAAQ,CAACO,KAAK,CAACJ,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAIK,kBAAO,IAC7CH,IAAI,CAACC,GAAG,CAACN,QAAQ,CAACS,SAAS,CAACN,GAAG,CAAC,CAAC,CAAC,IAAIK,kBAAO,IAC7CH,IAAI,CAACC,GAAG,CAACN,QAAQ,CAACU,QAAQ,CAACP,GAAG,CAAC,CAAC,CAAC,IAAIK,kBAAO;EAE7C,IAAIP,SAAS,EAAE;IACdD,QAAQ,CAACW,MAAM,CAACC,GAAG,CAAC,CAAC,CAAC;IACtBZ,QAAQ,CAACa,MAAM,CAACD,GAAG,CAAC,CAAC,CAAC;EACvB;EAEA,IAAAE,oCAA6B,EAACd,QAAQ,EAAEC,SAAS,CAAC;AACnD,CAAC;AAEM,MAAMc,uBAAuB,GAAGA,CAAC;EACvCC,IAAI;EACJhB,QAAQ;EACRiB,aAAa;EACbC,sBAAsB,GAAG;AACI,CAAC,KAAK;EACnC,SAAS;;EACT,MAAMC,SAAS,GAAG,IAAAC,0BAAmB,EAACJ,IAAI,CAAC;EAE3C,IAAI,CAACC,aAAa,EAAE;IACnBjB,QAAQ,CAACqB,GAAG,CAACd,KAAK,CAACK,GAAG,CAAC,CAAC,CAAC;IACzBZ,QAAQ,CAACqB,GAAG,CAACZ,SAAS,CAACG,GAAG,CAAC,CAAC,CAAC;IAC7BZ,QAAQ,CAACqB,GAAG,CAACX,QAAQ,CAACE,GAAG,CAAC,CAAC,CAAC;EAC7B;EAEAZ,QAAQ,CAACE,QAAQ,CAACU,GAAG,CAACU,gBAAK,CAAC;EAC5BtB,QAAQ,CAACI,UAAU,CAACQ,GAAG,CAACK,aAAa,GAAGM,eAAI,GAAGD,gBAAK,CAAC;EACrDtB,QAAQ,CAACwB,QAAQ,CAACZ,GAAG,CAACK,aAAa,GAAGK,gBAAK,GAAGC,eAAI,CAAC;EAEnD,IAAIL,sBAAsB,EAAE;IAC3BlB,QAAQ,CAACO,KAAK,CAACK,GAAG,CAAC,CAAC,CAAC;IACrBZ,QAAQ,CAACS,SAAS,CAACG,GAAG,CAAC,CAAC,CAAC;IACzBZ,QAAQ,CAACU,QAAQ,CAACE,GAAG,CAAC,CAAC,CAAC;IACxBb,2BAA2B,CAACC,QAAQ,CAAC;IACrC;EACD;EAEA,IAAAyB,wBAAiB,EAACzB,QAAQ,CAACO,KAAK,EAAE,CAAC,EAAEY,SAAS,EAAE,MAC/CpB,2BAA2B,CAACC,QAAQ,CACrC,CAAC;EACD,IAAAyB,wBAAiB,EAACzB,QAAQ,CAACS,SAAS,EAAE,CAAC,EAAEU,SAAS,EAAE,MACnDpB,2BAA2B,CAACC,QAAQ,CACrC,CAAC;EACD,IAAAyB,wBAAiB,EAACzB,QAAQ,CAACU,QAAQ,EAAE,CAAC,EAAES,SAAS,EAAE,MAClDpB,2BAA2B,CAACC,QAAQ,CACrC,CAAC;AACF,CAAC;AAAC0B,OAAA,CAAAX,uBAAA,GAAAA,uBAAA","ignoreList":[]}
+{"version":3,"names":["_constants","require","_reset","_values","resetPinchGestureValues","spec","gestures","shouldDismiss","resetValuesImmediately","finishPinchReset","clearFocalPoint","active","set","direction","settling","FALSE","clearRawTransformValues","dragging","dismissing","TRUE","clearTransformTrackingValues","animateMany","value","scale","toValue","normScale","rotation","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/behavior/pinch-reset.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAGA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAaO,MAAMG,uBAAuB,GAAGA,CAAC;EACvCC,IAAI;EACJC,QAAQ;EACRC,aAAa;EACbC,sBAAsB,GAAG;AACI,CAAC,KAAK;EACnC,SAAS;;EACT,MAAMC,gBAAgB,GAAGA,CAAA,KAAM;IAC9B,SAAS;;IACT,IAAIF,aAAa,EAAE;MAClB;IACD;IAEA,IAAAG,uBAAe,EAACJ,QAAQ,CAAC;IACzBA,QAAQ,CAACK,MAAM,CAACC,GAAG,CAAC,IAAI,CAAC;IACzBN,QAAQ,CAACO,SAAS,CAACD,GAAG,CAAC,IAAI,CAAC;IAC5BN,QAAQ,CAACQ,QAAQ,CAACF,GAAG,CAACG,gBAAK,CAAC;EAC7B,CAAC;EAED,IAAAC,+BAAuB,EAACV,QAAQ,CAAC;EAEjCA,QAAQ,CAACW,QAAQ,CAACL,GAAG,CAACG,gBAAK,CAAC;EAC5BT,QAAQ,CAACY,UAAU,CAACN,GAAG,CAACL,aAAa,GAAGY,eAAI,GAAGJ,gBAAK,CAAC;EACrDT,QAAQ,CAACQ,QAAQ,CAACF,GAAG,CAACL,aAAa,GAAGQ,gBAAK,GAAGI,eAAI,CAAC;EAEnD,IAAIZ,aAAa,EAAE;IAClB,IAAAG,uBAAe,EAACJ,QAAQ,CAAC;EAC1B;EAEA,IAAIE,sBAAsB,EAAE;IAC3B,IAAAY,oCAA4B,EAACd,QAAQ,CAAC;IACtCG,gBAAgB,CAAC,CAAC;IAClB;EACD;EAEA,IAAAY,kBAAW,EACV,CACC;IAAEC,KAAK,EAAEhB,QAAQ,CAACiB,KAAK;IAAEC,OAAO,EAAE;EAAE,CAAC,EACrC;IAAEF,KAAK,EAAEhB,QAAQ,CAACmB,SAAS;IAAED,OAAO,EAAE;EAAE,CAAC,EACzC;IAAEF,KAAK,EAAEhB,QAAQ,CAACoB,QAAQ;IAAEF,OAAO,EAAE;EAAE,CAAC,CACxC,EACDnB,IAAI,EACJI,gBACD,CAAC;AACF,CAAC;AAACkB,OAAA,CAAAvB,uBAAA,GAAAA,uBAAA","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/gestures/pinch/behavior/use-pinch-behavior.js

@@ -10,7 +10,7 @@ var _useGestureSensitivity = require("../../hooks/use-gesture-sensitivity");
 var _runtime = require("../../shared/runtime");
 var _pinchLifecycle = require("./pinch-lifecycle");
 var _pinchRelease = require("./pinch-release");
-const usePinchBehavior = (runtime, screenOptions, gestureCompositionActivation) => {
+const usePinchBehavior = (runtime, screenOptions, gestureCompositionOwner) => {
   const {
     dismissScreen,
     requestDismiss
@@ -43,8 +43,8 @@ const usePinchBehavior = (runtime, screenOptions, gestureCompositionActivation)
     const event = withSensitivity(rawEvent);
     const release = latestRuntime.participation.effectiveSnapPoints.hasSnapPoints ? (0, _pinchRelease.resolveSnapPinchRelease)(event, latestRuntime) : (0, _pinchRelease.resolvePinchRelease)(event, latestRuntime);
     (0, _pinchLifecycle.finalizePinchRelease)(release, latestRuntime, dismissScreen, requestDismiss);
-    gestureCompositionActivation.set(null);
-  }, [runtime, screenOptions, dismissScreen, requestDismiss, withSensitivity, gestureCompositionActivation]);
+    gestureCompositionOwner.set(null);
+  }, [runtime, screenOptions, dismissScreen, requestDismiss, withSensitivity, gestureCompositionOwner]);
   return (0, _react.useMemo)(() => ({
     onStart,
     onUpdate,

package/lib/commonjs/shared/providers/screen/gestures/pinch/behavior/use-pinch-behavior.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_useNavigationHelpers","_useGestureSensitivity","_runtime","_pinchLifecycle","_pinchRelease","usePinchBehavior","runtime","screenOptions","gestureCompositionActivation","dismissScreen","requestDismiss","useNavigationHelpers","withSensitivity","resetSensitivity","usePinchGestureSensitivity","onStart","useCallback","event","latestRuntime","resolvePinchRuntime","get","participation","effectiveSnapPoints","hasSnapPoints","primeSnapPinchRelease","startPinchBase","onUpdate","rawEvent","trackPinchGesture","stores","gestures","onEnd","release","resolveSnapPinchRelease","resolvePinchRelease","finalizePinchRelease","set","useMemo","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/behavior/use-pinch-behavior.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,qBAAA,GAAAD,OAAA;AAEA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AAOA,IAAAI,eAAA,GAAAJ,OAAA;AAKA,IAAAK,aAAA,GAAAL,OAAA;AAMO,MAAMM,gBAAgB,GAAGA,CAC/BC,OAAyC,EACzCC,aAAwC,EACxCC,4BAAuE,KACpD;EACnB,MAAM;IAAEC,aAAa;IAAEC;EAAe,CAAC,GAAG,IAAAC,0CAAoB,EAAC,CAAC;EAChE,MAAM;IAAEC,eAAe;IAAEC;EAAiB,CAAC,GAC1C,IAAAC,iDAA0B,EAACP,aAAa,CAAC;EAE1C,MAAMQ,OAAO,GAAG,IAAAC,kBAAW,EACzBC,KAAwB,IAAK;IAC7B,SAAS;;IACT,MAAMC,aAAa,GAAG,IAAAC,4BAAmB,EACxCb,OAAO,CAACc,GAAG,CAAC,CAAC,EACbb,aAAa,CAACa,GAAG,CAAC,CACnB,CAAC;IACD,IAAIF,aAAa,CAACG,aAAa,CAACC,mBAAmB,CAACC,aAAa,EAAE;MAClE,IAAAC,mCAAqB,EAACN,aAAa,CAAC;IACrC;IACA,IAAAO,8BAAc,EAACP,aAAa,EAAED,KAAK,CAAC;IACpCJ,gBAAgB,CAAC,CAAC;EACnB,CAAC,EACD,CAACP,OAAO,EAAEC,aAAa,EAAEM,gBAAgB,CAC1C,CAAC;EAED,MAAMa,QAAQ,GAAG,IAAAV,kBAAW,EAC1BW,QAA2B,IAAK;IAChC,SAAS;;IACT,MAAMT,aAAa,GAAG,IAAAC,4BAAmB,EACxCb,OAAO,CAACc,GAAG,CAAC,CAAC,EACbb,aAAa,CAACa,GAAG,CAAC,CACnB,CAAC;IACD,MAAMH,KAAK,GAAGL,eAAe,CAACe,QAAQ,CAAC;IACvC,IAAAC,iCAAiB,EAACX,KAAK,EAAEU,QAAQ,EAAET,aAAa,CAACW,MAAM,CAACC,QAAQ,CAAC;EAClE,CAAC,EACD,CAACxB,OAAO,EAAEC,aAAa,EAAEK,eAAe,CACzC,CAAC;EAED,MAAMmB,KAAK,GAAG,IAAAf,kBAAW,EACvBW,QAA2B,IAAK;IAChC,SAAS;;IACT,MAAMT,aAAa,GAAG,IAAAC,4BAAmB,EACxCb,OAAO,CAACc,GAAG,CAAC,CAAC,EACbb,aAAa,CAACa,GAAG,CAAC,CACnB,CAAC;IACD,MAAMH,KAAK,GAAGL,eAAe,CAACe,QAAQ,CAAC;IACvC,MAAMK,OAAO,GAAGd,aAAa,CAACG,aAAa,CAACC,mBAAmB,CAC7DC,aAAa,GACZ,IAAAU,qCAAuB,EAAChB,KAAK,EAAEC,aAAa,CAAC,GAC7C,IAAAgB,iCAAmB,EAACjB,KAAK,EAAEC,aAAa,CAAC;IAC5C,IAAAiB,oCAAoB,EACnBH,OAAO,EACPd,aAAa,EACbT,aAAa,EACbC,cACD,CAAC;IACDF,4BAA4B,CAAC4B,GAAG,CAAC,IAAI,CAAC;EACvC,CAAC,EACD,CACC9B,OAAO,EACPC,aAAa,EACbE,aAAa,EACbC,cAAc,EACdE,eAAe,EACfJ,4BAA4B,CAE9B,CAAC;EAED,OAAO,IAAA6B,cAAO,EACb,OAAO;IACNtB,OAAO;IACPW,QAAQ;IACRK;EACD,CAAC,CAAC,EACF,CAAChB,OAAO,EAAEW,QAAQ,EAAEK,KAAK,CAC1B,CAAC;AACF,CAAC;AAACO,OAAA,CAAAjC,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_useNavigationHelpers","_useGestureSensitivity","_runtime","_pinchLifecycle","_pinchRelease","usePinchBehavior","runtime","screenOptions","gestureCompositionOwner","dismissScreen","requestDismiss","useNavigationHelpers","withSensitivity","resetSensitivity","usePinchGestureSensitivity","onStart","useCallback","event","latestRuntime","resolvePinchRuntime","get","participation","effectiveSnapPoints","hasSnapPoints","primeSnapPinchRelease","startPinchBase","onUpdate","rawEvent","trackPinchGesture","stores","gestures","onEnd","release","resolveSnapPinchRelease","resolvePinchRelease","finalizePinchRelease","set","useMemo","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/behavior/use-pinch-behavior.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,qBAAA,GAAAD,OAAA;AAEA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AAOA,IAAAI,eAAA,GAAAJ,OAAA;AAKA,IAAAK,aAAA,GAAAL,OAAA;AAMO,MAAMM,gBAAgB,GAAGA,CAC/BC,OAAyC,EACzCC,aAAwC,EACxCC,uBAA6D,KAC1C;EACnB,MAAM;IAAEC,aAAa;IAAEC;EAAe,CAAC,GAAG,IAAAC,0CAAoB,EAAC,CAAC;EAChE,MAAM;IAAEC,eAAe;IAAEC;EAAiB,CAAC,GAC1C,IAAAC,iDAA0B,EAACP,aAAa,CAAC;EAE1C,MAAMQ,OAAO,GAAG,IAAAC,kBAAW,EACzBC,KAAwB,IAAK;IAC7B,SAAS;;IACT,MAAMC,aAAa,GAAG,IAAAC,4BAAmB,EACxCb,OAAO,CAACc,GAAG,CAAC,CAAC,EACbb,aAAa,CAACa,GAAG,CAAC,CACnB,CAAC;IACD,IAAIF,aAAa,CAACG,aAAa,CAACC,mBAAmB,CAACC,aAAa,EAAE;MAClE,IAAAC,mCAAqB,EAACN,aAAa,CAAC;IACrC;IACA,IAAAO,8BAAc,EAACP,aAAa,EAAED,KAAK,CAAC;IACpCJ,gBAAgB,CAAC,CAAC;EACnB,CAAC,EACD,CAACP,OAAO,EAAEC,aAAa,EAAEM,gBAAgB,CAC1C,CAAC;EAED,MAAMa,QAAQ,GAAG,IAAAV,kBAAW,EAC1BW,QAA2B,IAAK;IAChC,SAAS;;IACT,MAAMT,aAAa,GAAG,IAAAC,4BAAmB,EACxCb,OAAO,CAACc,GAAG,CAAC,CAAC,EACbb,aAAa,CAACa,GAAG,CAAC,CACnB,CAAC;IACD,MAAMH,KAAK,GAAGL,eAAe,CAACe,QAAQ,CAAC;IACvC,IAAAC,iCAAiB,EAACX,KAAK,EAAEU,QAAQ,EAAET,aAAa,CAACW,MAAM,CAACC,QAAQ,CAAC;EAClE,CAAC,EACD,CAACxB,OAAO,EAAEC,aAAa,EAAEK,eAAe,CACzC,CAAC;EAED,MAAMmB,KAAK,GAAG,IAAAf,kBAAW,EACvBW,QAA2B,IAAK;IAChC,SAAS;;IACT,MAAMT,aAAa,GAAG,IAAAC,4BAAmB,EACxCb,OAAO,CAACc,GAAG,CAAC,CAAC,EACbb,aAAa,CAACa,GAAG,CAAC,CACnB,CAAC;IACD,MAAMH,KAAK,GAAGL,eAAe,CAACe,QAAQ,CAAC;IACvC,MAAMK,OAAO,GAAGd,aAAa,CAACG,aAAa,CAACC,mBAAmB,CAC7DC,aAAa,GACZ,IAAAU,qCAAuB,EAAChB,KAAK,EAAEC,aAAa,CAAC,GAC7C,IAAAgB,iCAAmB,EAACjB,KAAK,EAAEC,aAAa,CAAC;IAC5C,IAAAiB,oCAAoB,EACnBH,OAAO,EACPd,aAAa,EACbT,aAAa,EACbC,cACD,CAAC;IACDF,uBAAuB,CAAC4B,GAAG,CAAC,IAAI,CAAC;EAClC,CAAC,EACD,CACC9B,OAAO,EACPC,aAAa,EACbE,aAAa,EACbC,cAAc,EACdE,eAAe,EACfJ,uBAAuB,CAEzB,CAAC;EAED,OAAO,IAAA6B,cAAO,EACb,OAAO;IACNtB,OAAO;IACPW,QAAQ;IACRK;EACD,CAAC,CAAC,EACF,CAAChB,OAAO,EAAEW,QAAQ,EAAEK,KAAK,CAC1B,CAAC;AACF,CAAC;AAACO,OAAA,CAAAjC,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/gestures/pinch/use-build-pinch-gesture.js

@@ -7,35 +7,28 @@ exports.useBuildPinchGesture = void 0;
 var _react = require("react");
 var _reactNativeGestureHandler = require("react-native-gesture-handler");
 var _options = require("../../options");
-var _useGestureBuilderState = require("../hooks/use-gesture-builder-state");
 var _useStableRuntimeConfig = require("../hooks/use-stable-runtime-config");
 var _usePinchActivation = require("./activation/use-pinch-activation");
 var _usePinchBehavior = require("./behavior/use-pinch-behavior");
 const useBuildPinchGesture = ({
   gestureConfig,
-  gestureCompositionActivation
+  gestureCompositionOwner
 }) => {
   const {
     participation,
     pinch: policy
   } = gestureConfig;
   const screenOptions = (0, _options.useScreenOptionsContext)();
-  const {
-    gestureProgressBaseline,
-    lockedSnapPoint
-  } = (0, _useGestureBuilderState.useGestureBuilderState)(participation);
   const runtime = (0, _useStableRuntimeConfig.useStableRuntimeConfig)({
     participation,
-    policy,
-    gestureProgressBaseline,
-    lockedSnapPoint
+    policy
   });
   const activation = (0, _usePinchActivation.usePinchActivation)({
     runtime,
     screenOptions,
-    gestureCompositionActivation
+    gestureCompositionOwner
   });
-  const behavior = (0, _usePinchBehavior.usePinchBehavior)(runtime, screenOptions, gestureCompositionActivation);
+  const behavior = (0, _usePinchBehavior.usePinchBehavior)(runtime, screenOptions, gestureCompositionOwner);
   const pinchGesture = (0, _react.useMemo)(() => {
     return _reactNativeGestureHandler.Gesture.Pinch().enabled(true).manualActivation(true).onTouchesDown(activation.onTouchesDown).onTouchesMove(activation.onTouchesMove).onStart(behavior.onStart).onUpdate(behavior.onUpdate).onEnd(behavior.onEnd);
   }, [activation, behavior]);

package/lib/commonjs/shared/providers/screen/gestures/pinch/use-build-pinch-gesture.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeGestureHandler","_options","_useGestureBuilderState","_useStableRuntimeConfig","_usePinchActivation","_usePinchBehavior","useBuildPinchGesture","gestureConfig","gestureCompositionActivation","participation","pinch","policy","screenOptions","useScreenOptionsContext","gestureProgressBaseline","lockedSnapPoint","useGestureBuilderState","runtime","useStableRuntimeConfig","activation","usePinchActivation","behavior","usePinchBehavior","pinchGesture","useMemo","Gesture","Pinch","enabled","manualActivation","onTouchesDown","onTouchesMove","onStart","onUpdate","onEnd","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/use-build-pinch-gesture.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,0BAAA,GAAAD,OAAA;AAEA,IAAAE,QAAA,GAAAF,OAAA;AACA,IAAAG,uBAAA,GAAAH,OAAA;AACA,IAAAI,uBAAA,GAAAJ,OAAA;AAMA,IAAAK,mBAAA,GAAAL,OAAA;AACA,IAAAM,iBAAA,GAAAN,OAAA;AAOO,MAAMO,oBAAoB,GAAGA,CAAC;EACpCC,aAAa;EACbC;AAC0B,CAAC,KAAmB;EAC9C,MAAM;IAAEC,aAAa;IAAEC,KAAK,EAAEC;EAAO,CAAC,GAAGJ,aAAa;EACtD,MAAMK,aAAa,GAAG,IAAAC,gCAAuB,EAAC,CAAC;EAC/C,MAAM;IAAEC,uBAAuB;IAAEC;EAAgB,CAAC,GACjD,IAAAC,8CAAsB,EAACP,aAAa,CAAC;EAEtC,MAAMQ,OAAO,GAAG,IAAAC,8CAAsB,EAAC;IACtCT,aAAa;IACbE,MAAM;IACNG,uBAAuB;IACvBC;EACD,CAAC,CAAC;EAEF,MAAMI,UAAU,GAAG,IAAAC,sCAAkB,EAAC;IACrCH,OAAO;IACPL,aAAa;IACbJ;EACD,CAAC,CAAC;EAEF,MAAMa,QAAQ,GAAG,IAAAC,kCAAgB,EAChCL,OAAO,EACPL,aAAa,EACbJ,4BACD,CAAC;EAED,MAAMe,YAAY,GAAG,IAAAC,cAAO,EAAC,MAAM;IAClC,OAAOC,kCAAO,CAACC,KAAK,CAAC,CAAC,CACpBC,OAAO,CAAC,IAAI,CAAC,CACbC,gBAAgB,CAAC,IAAI,CAAC,CACtBC,aAAa,CAACV,UAAU,CAACU,aAAa,CAAC,CACvCC,aAAa,CAACX,UAAU,CAACW,aAAa,CAAC,CACvCC,OAAO,CAACV,QAAQ,CAACU,OAAO,CAAC,CACzBC,QAAQ,CAACX,QAAQ,CAACW,QAAQ,CAAC,CAC3BC,KAAK,CAACZ,QAAQ,CAACY,KAAK,CAAC;EACxB,CAAC,EAAE,CAACd,UAAU,EAAEE,QAAQ,CAAC,CAAC;EAE1B,OAAOE,YAAY;AACpB,CAAC;AAACW,OAAA,CAAA5B,oBAAA,GAAAA,oBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeGestureHandler","_options","_useStableRuntimeConfig","_usePinchActivation","_usePinchBehavior","useBuildPinchGesture","gestureConfig","gestureCompositionOwner","participation","pinch","policy","screenOptions","useScreenOptionsContext","runtime","useStableRuntimeConfig","activation","usePinchActivation","behavior","usePinchBehavior","pinchGesture","useMemo","Gesture","Pinch","enabled","manualActivation","onTouchesDown","onTouchesMove","onStart","onUpdate","onEnd","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/pinch/use-build-pinch-gesture.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,0BAAA,GAAAD,OAAA;AAEA,IAAAE,QAAA,GAAAF,OAAA;AACA,IAAAG,uBAAA,GAAAH,OAAA;AAMA,IAAAI,mBAAA,GAAAJ,OAAA;AACA,IAAAK,iBAAA,GAAAL,OAAA;AAOO,MAAMM,oBAAoB,GAAGA,CAAC;EACpCC,aAAa;EACbC;AAC0B,CAAC,KAAmB;EAC9C,MAAM;IAAEC,aAAa;IAAEC,KAAK,EAAEC;EAAO,CAAC,GAAGJ,aAAa;EACtD,MAAMK,aAAa,GAAG,IAAAC,gCAAuB,EAAC,CAAC;EAE/C,MAAMC,OAAO,GAAG,IAAAC,8CAAsB,EAAC;IACtCN,aAAa;IACbE;EACD,CAAC,CAAC;EAEF,MAAMK,UAAU,GAAG,IAAAC,sCAAkB,EAAC;IACrCH,OAAO;IACPF,aAAa;IACbJ;EACD,CAAC,CAAC;EAEF,MAAMU,QAAQ,GAAG,IAAAC,kCAAgB,EAChCL,OAAO,EACPF,aAAa,EACbJ,uBACD,CAAC;EAED,MAAMY,YAAY,GAAG,IAAAC,cAAO,EAAC,MAAM;IAClC,OAAOC,kCAAO,CAACC,KAAK,CAAC,CAAC,CACpBC,OAAO,CAAC,IAAI,CAAC,CACbC,gBAAgB,CAAC,IAAI,CAAC,CACtBC,aAAa,CAACV,UAAU,CAACU,aAAa,CAAC,CACvCC,aAAa,CAACX,UAAU,CAACW,aAAa,CAAC,CACvCC,OAAO,CAACV,QAAQ,CAACU,OAAO,CAAC,CACzBC,QAAQ,CAACX,QAAQ,CAACW,QAAQ,CAAC,CAC3BC,KAAK,CAACZ,QAAQ,CAACY,KAAK,CAAC;EACxB,CAAC,EAAE,CAACd,UAAU,EAAEE,QAAQ,CAAC,CAAC;EAE1B,OAAOE,YAAY;AACpB,CAAC;AAACW,OAAA,CAAAzB,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/gestures/rotation/activation/use-rotation-activation.js

@@ -9,7 +9,7 @@ var _runtime = require("../../shared/runtime");
 const useRotationActivation = ({
   runtime,
   screenOptions,
-  gestureCompositionActivation
+  gestureCompositionOwner
 }) => {
   const onTouchesDown = (0, _react.useCallback)((event, stateManager) => {
     "worklet";
@@ -18,23 +18,21 @@ const useRotationActivation = ({
       participation,
       policy
     } = (0, _runtime.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 = (0, _react.useCallback)((event, stateManager) => {
     "worklet";
 
@@ -47,12 +45,16 @@ const useRotationActivation = ({
       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 (0, _react.useMemo)(() => ({
     onTouchesDown,
     onTouchesMove