react-native-screen-transitions 4.0.0-alpha.1 → 4.0.0-alpha.10

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

@@ -7,8 +7,8 @@ exports.trackPanGesture = exports.startPanBase = exports.finalizePanRelease = vo
 var _reactNativeReanimated = require("react-native-reanimated");
 var _reactNativeWorklets = require("react-native-worklets");
 var _constants = require("../../../../../constants");
+var _animation = require("../../../../../stores/animation.store");
 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");
@@ -23,11 +23,7 @@ const startPanBase = runtime => {
       animations
     }
   } = runtime;
-  const wasSettling = gestures.settling.get();
-  const hasResidualGesture = Math.abs(gestures.normX.get()) > _constants.EPSILON || Math.abs(gestures.normY.get()) > _constants.EPSILON || Math.abs(gestures.normScale.get()) > _constants.EPSILON || Math.abs(gestures.rotation.get()) > _constants.EPSILON;
-  if (!wasSettling || !hasResidualGesture) {
-    (0, _emit.emit)(animations.willAnimate, _constants.TRUE, _constants.FALSE);
-  }
+  (0, _animation.emitMotionStart)(animations);
   gestures.dragging.set(_constants.TRUE);
   gestures.dismissing.set(0);
   gestures.settling.set(0);
@@ -79,7 +75,7 @@ const trackPanGesture = (event, rawEvent, gestures, dimensions) => {
   };
 };
 exports.trackPanGesture = trackPanGesture;
-const finalizePanRelease = (release, runtime, dismissScreen, dimensions, rawEvent, requestDismiss, gestureCompositionOwner) => {
+const finalizePanRelease = (release, runtime, dimensions, rawEvent, requestDismiss, gestureCompositionOwner) => {
   "worklet";
 
   const {
@@ -102,6 +98,7 @@ const finalizePanRelease = (release, runtime, dismissScreen, dimensions, rawEven
     animations.transitionProgress.set(plan.commitProgress);
     system.targetProgress.set(plan.commitProgress);
   }
+  const progressAlreadyAtTarget = Math.abs(animations.transitionProgress.get() - plan.target) <= _constants.EPSILON;
   if (canDriveRelease && plan.shouldDismiss) {
     (0, _snapshot.snapshotGestureHandoff)(gestures, {
       velocity: plan.handoffVelocity
@@ -110,30 +107,30 @@ const finalizePanRelease = (release, runtime, dismissScreen, dimensions, rawEven
   (0, _panReset.resetPanGestureValues)({
     plan,
     gestures,
+    animations,
+    completeMotion: !plan.shouldDismiss && progressAlreadyAtTarget,
     updateLifecycle: canDriveRelease
   });
   if (!canDriveRelease) {
     return;
   }
-  const progressAlreadyAtTarget = Math.abs(animations.transitionProgress.get() - plan.target) <= _constants.EPSILON;
   if (!plan.shouldDismiss && progressAlreadyAtTarget) {
     system.targetProgress.set(plan.target);
-    animations.progressAnimating.set(_constants.FALSE);
     return;
   }
-  if (plan.shouldDismiss && requestDismiss) {
-    (0, _reactNativeWorklets.scheduleOnRN)(requestDismiss);
-  }
   (0, _animateToProgress.animateToProgress)({
     target: plan.target,
-    onAnimationFinish: plan.shouldDismiss ? dismissScreen : undefined,
     spec: plan.transitionSpec,
     emitWillAnimate: false,
     markEntering: false,
     targetProgress: system.targetProgress,
+    animationProgress: system.animationProgress,
     animations,
     initialVelocity: plan.progressVelocity
   });
+  if (plan.shouldDismiss && requestDismiss) {
+    (0, _reactNativeWorklets.scheduleOnRN)(requestDismiss);
+  }
 };
 exports.finalizePanRelease = finalizePanRelease;
 //# sourceMappingURL=pan-lifecycle.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_reactNativeWorklets","_constants","_animateToProgress","_emit","_physics","_snapshot","_values","_panRelease","_panReset","startPanBase","runtime","stores","gestures","animations","wasSettling","settling","get","hasResidualGesture","Math","abs","normX","EPSILON","normY","normScale","rotation","emit","willAnimate","TRUE","FALSE","dragging","set","dismissing","clearPanTrackingValues","clearTransformTrackingValues","clearFocalPoint","internal","progressBaseline","transitionProgress","exports","trackPanGesture","event","rawEvent","dimensions","translationX","x","translationY","y","rawX","rawY","velocityX","velocityY","width","height","clamp","normalizeGestureTranslation","rawNormX","rawNormY","velocity","resolveGestureVelocity","max","progressDeltaX","progressDeltaY","raw","finalizePanRelease","release","dismissScreen","requestDismiss","gestureCompositionOwner","policy","system","canDriveRelease","plan","buildPanReleasePlan","target","shouldDismiss","initialVelocity","transitionSpec","undefined","resetSpec","open","commitProgress","targetProgress","snapshotGestureHandoff","handoffVelocity","resetPanGestureValues","updateLifecycle","progressAlreadyAtTarget","progressAnimating","scheduleOnRN","animateToProgress","onAnimationFinish","spec","emitWillAnimate","markEntering","progressVelocity"],"sourceRoot":"../../../../../../../src","sources":["providers/screen/gestures/pan/behavior/pan-lifecycle.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_reactNativeWorklets","_constants","_animation","_animateToProgress","_physics","_snapshot","_values","_panRelease","_panReset","startPanBase","runtime","stores","gestures","animations","emitMotionStart","dragging","set","TRUE","dismissing","settling","clearPanTrackingValues","clearTransformTrackingValues","clearFocalPoint","internal","progressBaseline","transitionProgress","get","exports","trackPanGesture","event","rawEvent","dimensions","translationX","x","translationY","y","rawX","rawY","velocityX","velocityY","width","height","normX","clamp","normalizeGestureTranslation","normY","rawNormX","rawNormY","velocity","resolveGestureVelocity","Math","max","progressDeltaX","progressDeltaY","raw","finalizePanRelease","release","requestDismiss","gestureCompositionOwner","policy","system","canDriveRelease","plan","buildPanReleasePlan","target","shouldDismiss","initialVelocity","transitionSpec","undefined","resetSpec","open","commitProgress","targetProgress","progressAlreadyAtTarget","abs","EPSILON","snapshotGestureHandoff","handoffVelocity","resetPanGestureValues","completeMotion","updateLifecycle","animateToProgress","spec","emitWillAnimate","markEntering","animationProgress","progressVelocity","scheduleOnRN"],"sourceRoot":"../../../../../../../src","sources":["providers/screen/gestures/pan/behavior/pan-lifecycle.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/providers/screen/gestures/pan/behavior/pan-release.js

@@ -13,7 +13,7 @@ var _targets = require("../../shared/targets");
 const resolvePanReleaseVelocity = (runtime, velocityNormX, velocityNormY) => {
   "worklet";
 
-  const activeGesture = runtime.stores.gestures.active.get();
+  const activeGesture = runtime.stores.gestures.initiator.get();
   switch (activeGesture) {
     case "horizontal":
     case "horizontal-inverted":
@@ -28,7 +28,7 @@ const resolvePanReleaseVelocity = (runtime, velocityNormX, velocityNormY) => {
 const resolveActivePanSnapAxis = runtime => {
   "worklet";
 
-  const activeGesture = runtime.stores.gestures.active.get();
+  const activeGesture = runtime.stores.gestures.initiator.get();
   return (0, _directions.isResolvedPanGestureDirection)(activeGesture) ? (0, _directions.getPanSnapAxisConfigForDirection)(runtime.policy.snapAxisDirections, activeGesture) : null;
 };
 const getPanSnapAxisMotion = (event, dimensions, activeAxis) => {
@@ -50,7 +50,9 @@ const getPanSnapReleaseProgress = ({
   dimensions,
   activeAxis,
   minSnapPoint,
-  maxSnapPoint
+  maxSnapPoint,
+  snapPoints,
+  sheetSnapBehavior
 }) => {
   "worklet";
 
@@ -58,7 +60,15 @@ const getPanSnapReleaseProgress = ({
   const axisTranslation = isHorizontal ? event.translationX : event.translationY;
   const axisDimension = isHorizontal ? dimensions.width : dimensions.height;
   const axisProgress = axisTranslation / Math.max(1, axisDimension);
-  const progress = runtime.stores.gestures.internal.progressBaseline.get() + activeAxis.config.progressSign * axisProgress;
+  const signedProgressDelta = activeAxis.config.progressSign * axisProgress;
+  if (sheetSnapBehavior === "step") {
+    return (0, _snapPoints.resolveStepSnapProgress)({
+      baseline: runtime.stores.gestures.internal.progressBaseline.get(),
+      normalizedDelta: signedProgressDelta,
+      snapPoints
+    });
+  }
+  const progress = runtime.stores.gestures.internal.progressBaseline.get() + signedProgressDelta;
   return (0, _reactNativeReanimated.clamp)(progress, minSnapPoint, maxSnapPoint);
 };
 const buildInactivePanSnapRelease = runtime => {
@@ -135,29 +145,41 @@ const resolveSnapPanRelease = (event, runtime, dimensions) => {
     resolvedMinSnapPoint,
     resolvedMaxSnapPoint
   } = (0, _snapPoints.resolveRuntimeGestureSnapPoints)(runtime);
+  const allSnapTargets = (0, _snapPoints.resolveRuntimeGestureSnapTargets)(runtime);
+  const axisTranslation = activeAxis.axis === "horizontal" ? event.translationX : event.translationY;
+  const progressDirection = activeAxis.config.progressSign * axisTranslation || -snapVelocity;
+  const releaseSnapPoints = policy.sheetSnapBehavior === "step" ? (0, _snapPoints.resolveStepSnapTargets)({
+    baseline: runtime.stores.gestures.internal.progressBaseline.get(),
+    direction: progressDirection,
+    snapPoints: allSnapTargets
+  }) : resolvedSnapPoints;
+  const canDismissToReleaseTarget = participation.canDismiss && (policy.gestureSnapLocked || policy.sheetSnapBehavior === "continuous" || releaseSnapPoints.includes(0));
   const currentProgress = getPanSnapReleaseProgress({
     runtime,
     event,
     dimensions,
     activeAxis,
     minSnapPoint: resolvedMinSnapPoint,
-    maxSnapPoint: resolvedMaxSnapPoint
+    maxSnapPoint: resolvedMaxSnapPoint,
+    snapPoints: allSnapTargets,
+    sheetSnapBehavior: policy.sheetSnapBehavior
   });
   const result = (0, _targets.determineSnapTarget)({
     currentProgress,
-    snapPoints: policy.gestureSnapLocked ? [runtime.stores.gestures.internal.lockedSnapPoint.get() ?? resolvedMaxSnapPoint] : resolvedSnapPoints,
+    snapPoints: policy.gestureSnapLocked ? [runtime.stores.gestures.internal.lockedSnapPoint.get() ?? resolvedMaxSnapPoint] : releaseSnapPoints,
     velocity: snapVelocity,
     dimension: axisDimension,
     velocityFactor: policy.gestureSnapVelocityImpact,
-    canDismiss: participation.canDismiss
+    canDismiss: canDismissToReleaseTarget
   });
   const shouldDismiss = participation.canDismiss && result.shouldDismiss;
   const target = shouldDismiss ? 0 : result.targetProgress;
+  const progressVelocityScale = policy.sheetSnapBehavior === "step" && !policy.gestureSnapLocked ? (0, _snapPoints.getStepSnapProgressVelocityScale)(releaseSnapPoints) : 1;
   return {
     target,
     shouldDismiss,
     initialVelocity: (0, _release.getProgressVelocityTowardTarget)({
-      handoffVelocity: (0, _physics.getPanReleaseHandoffVelocity)(axisVelocity, axisDimension),
+      handoffVelocity: (0, _physics.getPanReleaseHandoffVelocity)(axisVelocity, axisDimension) * progressVelocityScale,
       target,
       currentProgress
     }),

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_directions","_physics","_release","_snapPoints","_targets","resolvePanReleaseVelocity","runtime","velocityNormX","velocityNormY","activeGesture","stores","gestures","active","get","resolveGestureVelocity","resolveActivePanSnapAxis","isResolvedPanGestureDirection","getPanSnapAxisConfigForDirection","policy","snapAxisDirections","getPanSnapAxisMotion","event","dimensions","activeAxis","isHorizontal","axis","axisVelocity","velocityX","velocityY","axisDimension","width","height","snapVelocity","config","inverted","getPanSnapReleaseProgress","minSnapPoint","maxSnapPoint","axisTranslation","translationX","translationY","axisProgress","Math","max","progress","internal","progressBaseline","progressSign","clamp","buildInactivePanSnapRelease","target","animations","transitionProgress","shouldDismiss","initialVelocity","transitionSpec","resetSpec","open","primeSnapPanRelease","primeRuntimeSnapPoint","exports","resolvePanRelease","participation","result","determineDismissal","directions","panActivationDirections","gestureVelocityImpact","canDismiss","getPanReleaseProgressVelocity","close","resolveSnapPanRelease","resolvedSnapPoints","resolvedMinSnapPoint","resolvedMaxSnapPoint","resolveRuntimeGestureSnapPoints","currentProgress","determineSnapTarget","snapPoints","gestureSnapLocked","lockedSnapPoint","velocity","dimension","velocityFactor","gestureSnapVelocityImpact","targetProgress","getProgressVelocityTowardTarget","handoffVelocity","getPanReleaseHandoffVelocity","commitProgress","resolveGestureSnapTransitionSpec","buildPanReleasePlan","release","rawEvent","releaseVelocityScale","gestureReleaseVelocityScale","resetVelocityScale","resetVelocityX","resetVelocityY","handoffVelocityNormX","handoffVelocityNormY","progressVelocity","resetVelocityNormX","resetVelocityNormY"],"sourceRoot":"../../../../../../../src","sources":["providers/screen/gestures/pan/behavior/pan-release.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_directions","_physics","_release","_snapPoints","_targets","resolvePanReleaseVelocity","runtime","velocityNormX","velocityNormY","activeGesture","stores","gestures","initiator","get","resolveGestureVelocity","resolveActivePanSnapAxis","isResolvedPanGestureDirection","getPanSnapAxisConfigForDirection","policy","snapAxisDirections","getPanSnapAxisMotion","event","dimensions","activeAxis","isHorizontal","axis","axisVelocity","velocityX","velocityY","axisDimension","width","height","snapVelocity","config","inverted","getPanSnapReleaseProgress","minSnapPoint","maxSnapPoint","snapPoints","sheetSnapBehavior","axisTranslation","translationX","translationY","axisProgress","Math","max","signedProgressDelta","progressSign","resolveStepSnapProgress","baseline","internal","progressBaseline","normalizedDelta","progress","clamp","buildInactivePanSnapRelease","target","animations","transitionProgress","shouldDismiss","initialVelocity","transitionSpec","resetSpec","open","primeSnapPanRelease","primeRuntimeSnapPoint","exports","resolvePanRelease","participation","result","determineDismissal","directions","panActivationDirections","gestureVelocityImpact","canDismiss","getPanReleaseProgressVelocity","close","resolveSnapPanRelease","resolvedSnapPoints","resolvedMinSnapPoint","resolvedMaxSnapPoint","resolveRuntimeGestureSnapPoints","allSnapTargets","resolveRuntimeGestureSnapTargets","progressDirection","releaseSnapPoints","resolveStepSnapTargets","direction","canDismissToReleaseTarget","gestureSnapLocked","includes","currentProgress","determineSnapTarget","lockedSnapPoint","velocity","dimension","velocityFactor","gestureSnapVelocityImpact","targetProgress","progressVelocityScale","getStepSnapProgressVelocityScale","getProgressVelocityTowardTarget","handoffVelocity","getPanReleaseHandoffVelocity","commitProgress","resolveGestureSnapTransitionSpec","buildPanReleasePlan","release","rawEvent","releaseVelocityScale","gestureReleaseVelocityScale","resetVelocityScale","resetVelocityX","resetVelocityY","handoffVelocityNormX","handoffVelocityNormY","progressVelocity","resetVelocityNormX","resetVelocityNormY"],"sourceRoot":"../../../../../../../src","sources":["providers/screen/gestures/pan/behavior/pan-release.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAIA,IAAAE,QAAA,GAAAF,OAAA;AAKA,IAAAG,QAAA,GAAAH,OAAA;AAIA,IAAAI,WAAA,GAAAJ,OAAA;AAQA,IAAAK,QAAA,GAAAL,OAAA;AASA,MAAMM,yBAAyB,GAAGA,CACjCC,OAA0B,EAC1BC,aAAqB,EACrBC,aAAqB,KACjB;EACJ,SAAS;;EACT,MAAMC,aAAa,GAAGH,OAAO,CAACI,MAAM,CAACC,QAAQ,CAACC,SAAS,CAACC,GAAG,CAAC,CAAC;EAE7D,QAAQJ,aAAa;IACpB,KAAK,YAAY;IACjB,KAAK,qBAAqB;MACzB,OAAO,IAAAK,+BAAsB,EAACP,aAAa,EAAE,CAAC,CAAC;IAChD,KAAK,UAAU;IACf,KAAK,mBAAmB;MACvB,OAAO,IAAAO,+BAAsB,EAAC,CAAC,EAAEN,aAAa,CAAC;IAChD;MACC,OAAO,IAAAM,+BAAsB,EAACP,aAAa,EAAEC,aAAa,CAAC;EAC7D;AACD,CAAC;AAED,MAAMO,wBAAwB,GAAIT,OAA0B,IAAK;EAChE,SAAS;;EACT,MAAMG,aAAa,GAAGH,OAAO,CAACI,MAAM,CAACC,QAAQ,CAACC,SAAS,CAACC,GAAG,CAAC,CAAC;EAE7D,OAAO,IAAAG,yCAA6B,EAACP,aAAa,CAAC,GAChD,IAAAQ,4CAAgC,EAChCX,OAAO,CAACY,MAAM,CAACC,kBAAkB,EACjCV,aACD,CAAC,GACA,IAAI;AACR,CAAC;AAED,MAAMW,oBAAoB,GAAGA,CAC5BC,KAAsB,EACtBC,UAA6B,EAC7BC,UAAoE,KAChE;EACJ,SAAS;;EACT,MAAMC,YAAY,GAAGD,UAAU,CAACE,IAAI,KAAK,YAAY;EACrD,MAAMC,YAAY,GAAGF,YAAY,GAAGH,KAAK,CAACM,SAAS,GAAGN,KAAK,CAACO,SAAS;EACrE,MAAMC,aAAa,GAAGL,YAAY,GAAGF,UAAU,CAACQ,KAAK,GAAGR,UAAU,CAACS,MAAM;EACzE,MAAMC,YAAY,GAAGT,UAAU,CAACU,MAAM,CAACC,QAAQ,GAC5C,CAACR,YAAY,GACbA,YAAY;EAEf,OAAO;IAAEA,YAAY;IAAEG,aAAa;IAAEG;EAAa,CAAC;AACrD,CAAC;AAED,MAAMG,yBAAyB,GAAGA,CAAC;EAClC7B,OAAO;EACPe,KAAK;EACLC,UAAU;EACVC,UAAU;EACVa,YAAY;EACZC,YAAY;EACZC,UAAU;EACVC;AAUD,CAAC,KAAK;EACL,SAAS;;EACT,MAAMf,YAAY,GAAGD,UAAU,CAACE,IAAI,KAAK,YAAY;EACrD,MAAMe,eAAe,GAAGhB,YAAY,GACjCH,KAAK,CAACoB,YAAY,GAClBpB,KAAK,CAACqB,YAAY;EACrB,MAAMb,aAAa,GAAGL,YAAY,GAAGF,UAAU,CAACQ,KAAK,GAAGR,UAAU,CAACS,MAAM;EACzE,MAAMY,YAAY,GAAGH,eAAe,GAAGI,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEhB,aAAa,CAAC;EACjE,MAAMiB,mBAAmB,GAAGvB,UAAU,CAACU,MAAM,CAACc,YAAY,GAAGJ,YAAY;EACzE,IAAIJ,iBAAiB,KAAK,MAAM,EAAE;IACjC,OAAO,IAAAS,mCAAuB,EAAC;MAC9BC,QAAQ,EAAE3C,OAAO,CAACI,MAAM,CAACC,QAAQ,CAACuC,QAAQ,CAACC,gBAAgB,CAACtC,GAAG,CAAC,CAAC;MACjEuC,eAAe,EAAEN,mBAAmB;MACpCR;IACD,CAAC,CAAC;EACH;EACA,MAAMe,QAAQ,GACb/C,OAAO,CAACI,MAAM,CAACC,QAAQ,CAACuC,QAAQ,CAACC,gBAAgB,CAACtC,GAAG,CAAC,CAAC,GACvDiC,mBAAmB;EAEpB,OAAO,IAAAQ,4BAAK,EAACD,QAAQ,EAAEjB,YAAY,EAAEC,YAAY,CAAC;AACnD,CAAC;AAED,MAAMkB,2BAA2B,GAChCjD,OAA0B,IACJ;EACtB,SAAS;;EACT,MAAM;IAAEY,MAAM;IAAER;EAAO,CAAC,GAAGJ,OAAO;EAElC,OAAO;IACNkD,MAAM,EAAE9C,MAAM,CAAC+C,UAAU,CAACC,kBAAkB,CAAC7C,GAAG,CAAC,CAAC;IAClD8C,aAAa,EAAE,KAAK;IACpBC,eAAe,EAAE,CAAC;IAClBC,cAAc,EAAE3C,MAAM,CAAC2C,cAAc;IACrCC,SAAS,EAAE5C,MAAM,CAAC2C,cAAc,EAAEE;EACnC,CAAC;AACF,CAAC;AAEM,MAAMC,mBAAmB,GAAI1D,OAA0B,IAAK;EAClE,SAAS;;EACT,IAAA2D,iCAAqB,EAAC3D,OAAO,CAAC;AAC/B,CAAC;AAAC4D,OAAA,CAAAF,mBAAA,GAAAA,mBAAA;AAEK,MAAMG,iBAAiB,GAAGA,CAChC9C,KAAsB,EACtBf,OAA0B,EAC1BgB,UAA6B,KACP;EACtB,SAAS;;EACT,MAAM;IACL8C,aAAa;IACblD,MAAM;IACNR,MAAM,EAAE;MAAE+C;IAAW;EACtB,CAAC,GAAGnD,OAAO;EAEX,MAAM+D,MAAM,GAAG,IAAAC,2BAAkB,EAAC;IACjCjD,KAAK;IACLkD,UAAU,EAAErD,MAAM,CAACsD,uBAAuB;IAC1ClD,UAAU;IACVmD,qBAAqB,EAAEvD,MAAM,CAACuD;EAC/B,CAAC,CAAC;EAEF,MAAMd,aAAa,GAAGS,aAAa,CAACM,UAAU,IAAIL,MAAM,CAACV,aAAa;EAEtE,OAAO;IACNH,MAAM,EAAEG,aAAa,GAAG,CAAC,GAAG,CAAC;IAC7BA,aAAa;IACbC,eAAe,EAAE,IAAAe,sCAA6B,EAAC;MAC9ClB,UAAU;MACVE,aAAa;MACbtC,KAAK;MACLC,UAAU;MACViD,UAAU,EAAErD,MAAM,CAACsD;IACpB,CAAC,CAAC;IACFX,cAAc,EAAE3C,MAAM,CAAC2C,cAAc;IACrCC,SAAS,EAAEH,aAAa,GACrBzC,MAAM,CAAC2C,cAAc,EAAEe,KAAK,GAC5B1D,MAAM,CAAC2C,cAAc,EAAEE;EAC3B,CAAC;AACF,CAAC;AAACG,OAAA,CAAAC,iBAAA,GAAAA,iBAAA;AAEK,MAAMU,qBAAqB,GAAGA,CACpCxD,KAAsB,EACtBf,OAA0B,EAC1BgB,UAA6B,KACP;EACtB,SAAS;;EACT,MAAM;IAAE8C,aAAa;IAAElD;EAAO,CAAC,GAAGZ,OAAO;EACzC,MAAMiB,UAAU,GAAGR,wBAAwB,CAACT,OAAO,CAAC;EAEpD,IAAI,CAACiB,UAAU,EAAE;IAChB,OAAOgC,2BAA2B,CAACjD,OAAO,CAAC;EAC5C;EAEA,MAAM;IAAEoB,YAAY;IAAEG,aAAa;IAAEG;EAAa,CAAC,GAAGZ,oBAAoB,CACzEC,KAAK,EACLC,UAAU,EACVC,UACD,CAAC;EACD,MAAM;IAAEuD,kBAAkB;IAAEC,oBAAoB;IAAEC;EAAqB,CAAC,GACvE,IAAAC,2CAA+B,EAAC3E,OAAO,CAAC;EACzC,MAAM4E,cAAc,GAAG,IAAAC,4CAAgC,EAAC7E,OAAO,CAAC;EAChE,MAAMkC,eAAe,GACpBjB,UAAU,CAACE,IAAI,KAAK,YAAY,GAAGJ,KAAK,CAACoB,YAAY,GAAGpB,KAAK,CAACqB,YAAY;EAC3E,MAAM0C,iBAAiB,GACtB7D,UAAU,CAACU,MAAM,CAACc,YAAY,GAAGP,eAAe,IAAI,CAACR,YAAY;EAClE,MAAMqD,iBAAiB,GACtBnE,MAAM,CAACqB,iBAAiB,KAAK,MAAM,GAChC,IAAA+C,kCAAsB,EAAC;IACvBrC,QAAQ,EAAE3C,OAAO,CAACI,MAAM,CAACC,QAAQ,CAACuC,QAAQ,CAACC,gBAAgB,CAACtC,GAAG,CAAC,CAAC;IACjE0E,SAAS,EAAEH,iBAAiB;IAC5B9C,UAAU,EAAE4C;EACb,CAAC,CAAC,GACDJ,kBAAkB;EACtB,MAAMU,yBAAyB,GAC9BpB,aAAa,CAACM,UAAU,KACvBxD,MAAM,CAACuE,iBAAiB,IACxBvE,MAAM,CAACqB,iBAAiB,KAAK,YAAY,IACzC8C,iBAAiB,CAACK,QAAQ,CAAC,CAAC,CAAC,CAAC;EAChC,MAAMC,eAAe,GAAGxD,yBAAyB,CAAC;IACjD7B,OAAO;IACPe,KAAK;IACLC,UAAU;IACVC,UAAU;IACVa,YAAY,EAAE2C,oBAAoB;IAClC1C,YAAY,EAAE2C,oBAAoB;IAClC1C,UAAU,EAAE4C,cAAc;IAC1B3C,iBAAiB,EAAErB,MAAM,CAACqB;EAC3B,CAAC,CAAC;EACF,MAAM8B,MAAM,GAAG,IAAAuB,4BAAmB,EAAC;IAClCD,eAAe;IACfrD,UAAU,EAAEpB,MAAM,CAACuE,iBAAiB,GACjC,CACAnF,OAAO,CAACI,MAAM,CAACC,QAAQ,CAACuC,QAAQ,CAAC2C,eAAe,CAAChF,GAAG,CAAC,CAAC,IACrDmE,oBAAoB,CACrB,GACAK,iBAAiB;IACpBS,QAAQ,EAAE9D,YAAY;IACtB+D,SAAS,EAAElE,aAAa;IACxBmE,cAAc,EAAE9E,MAAM,CAAC+E,yBAAyB;IAChDvB,UAAU,EAAEc;EACb,CAAC,CAAC;EAEF,MAAM7B,aAAa,GAAGS,aAAa,CAACM,UAAU,IAAIL,MAAM,CAACV,aAAa;EACtE,MAAMH,MAAM,GAAGG,aAAa,GAAG,CAAC,GAAGU,MAAM,CAAC6B,cAAc;EACxD,MAAMC,qBAAqB,GAC1BjF,MAAM,CAACqB,iBAAiB,KAAK,MAAM,IAAI,CAACrB,MAAM,CAACuE,iBAAiB,GAC7D,IAAAW,4CAAgC,EAACf,iBAAiB,CAAC,GACnD,CAAC;EAEL,OAAO;IACN7B,MAAM;IACNG,aAAa;IACbC,eAAe,EAAE,IAAAyC,wCAA+B,EAAC;MAChDC,eAAe,EACd,IAAAC,qCAA4B,EAAC7E,YAAY,EAAEG,aAAa,CAAC,GACzDsE,qBAAqB;MACtB3C,MAAM;MACNmC;IACD,CAAC,CAAC;IACFa,cAAc,EAAEb,eAAe;IAC/B9B,cAAc,EAAE,IAAA4C,yCAAgC,EAAC;MAChD5C,cAAc,EAAE3C,MAAM,CAAC2C,cAAc;MACrCF,aAAa;MACbH,MAAM;MACNmC;IACD,CAAC,CAAC;IACF7B,SAAS,EAAEH,aAAa,GACrBzC,MAAM,CAAC2C,cAAc,EAAEe,KAAK,GAC5B1D,MAAM,CAAC2C,cAAc,EAAEE;EAC3B,CAAC;AACF,CAAC;AAACG,OAAA,CAAAW,qBAAA,GAAAA,qBAAA;AAEK,MAAM6B,mBAAmB,GAAGA,CAClCC,OAAyB,EACzBrG,OAA0B,EAC1BgB,UAA6B,EAC7BsF,QAAyB,KACL;EACpB,SAAS;;EACT,MAAM;IAAE1F;EAAO,CAAC,GAAGZ,OAAO;EAC1B,MAAMuG,oBAAoB,GAAGjE,IAAI,CAACC,GAAG,CAAC,CAAC,EAAE3B,MAAM,CAAC4F,2BAA2B,CAAC;EAC5E,MAAMC,kBAAkB,GAAGF,oBAAoB;EAC/C,MAAMG,cAAc,GACnBD,kBAAkB,KAAK,CAAC,GAAG,CAAC,GAAGH,QAAQ,CAACjF,SAAS,GAAGoF,kBAAkB;EACvE,MAAME,cAAc,GACnBF,kBAAkB,KAAK,CAAC,GAAG,CAAC,GAAGH,QAAQ,CAAChF,SAAS,GAAGmF,kBAAkB;EACvE,MAAMG,oBAAoB,GAAG,IAAAX,qCAA4B,EACxDK,QAAQ,CAACjF,SAAS,EAClBL,UAAU,CAACQ,KAAK,EAChB+E,oBACD,CAAC;EACD,MAAMM,oBAAoB,GAAG,IAAAZ,qCAA4B,EACxDK,QAAQ,CAAChF,SAAS,EAClBN,UAAU,CAACS,MAAM,EACjB8E,oBACD,CAAC;EACD,MAAMP,eAAe,GAAGK,OAAO,CAAChD,aAAa,GAC1CtD,yBAAyB,CACzBC,OAAO,EACP4G,oBAAoB,EACpBC,oBACD,CAAC,GACA,CAAC;EAEJ,OAAO;IACN3D,MAAM,EAAEmD,OAAO,CAACnD,MAAM;IACtBG,aAAa,EAAEgD,OAAO,CAAChD,aAAa;IACpCyD,gBAAgB,EAAET,OAAO,CAAC/C,eAAe;IACzCoD,cAAc;IACdC,cAAc;IACdI,kBAAkB,EAAEL,cAAc,GAAGpE,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEvB,UAAU,CAACQ,KAAK,CAAC;IAClEwF,kBAAkB,EAAEL,cAAc,GAAGrE,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEvB,UAAU,CAACS,MAAM,CAAC;IACnEuE,eAAe;IACfE,cAAc,EAAEG,OAAO,CAACH,cAAc;IACtC3C,cAAc,EAAE8C,OAAO,CAAC9C,cAAc;IACtCC,SAAS,EAAE6C,OAAO,CAAC7C;EACpB,CAAC;AACF,CAAC;AAACI,OAAA,CAAAwC,mBAAA,GAAAA,mBAAA","ignoreList":[]}

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

@@ -10,6 +10,8 @@ var _values = require("../../shared/values");
 const resetPanGestureValues = ({
   plan,
   gestures,
+  animations,
+  completeMotion = false,
   updateLifecycle = true
 }) => {
   "worklet";
@@ -20,10 +22,17 @@ const resetPanGestureValues = ({
     if (!updateLifecycle || plan.shouldDismiss) {
       return;
     }
-    gestures.active.set(null);
-    gestures.direction.set(null);
+    gestures.initiator.set(null);
     gestures.settling.set(_constants.FALSE);
+    if (completeMotion) {
+      animations?.progressAnimating.set(_constants.FALSE);
+      animations?.progressSettled.set(_constants.TRUE);
+    }
   };
+  if (animations && updateLifecycle && !plan.shouldDismiss) {
+    animations.progressAnimating.set(_constants.TRUE);
+    animations.progressSettled.set(_constants.FALSE);
+  }
   (0, _values.clearRawPanValues)(gestures);
   if (updateLifecycle) {
     gestures.dragging.set(_constants.FALSE);

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

@@ -1 +1 @@
-{"version":3,"names":["_constants","require","_reset","_values","resetPanGestureValues","plan","gestures","updateLifecycle","finishPanReset","shouldDismiss","active","set","direction","settling","FALSE","clearRawPanValues","dragging","dismissing","TRUE","velocity","progressDeltaWasCommitted","commitProgress","clearPanProgressDeltaValues","animateMany","value","x","toValue","resetVelocityX","y","resetVelocityY","normX","resetVelocityNormX","normY","resetVelocityNormY","internal","progressDeltaX","progressDeltaY","resetSpec","exports"],"sourceRoot":"../../../../../../../src","sources":["providers/screen/gestures/pan/behavior/pan-reset.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAYO,MAAMG,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,CAACG,gBAAK,CAAC;EAC7B,CAAC;EAED,IAAAC,yBAAiB,EAACT,QAAQ,CAAC;EAE3B,IAAIC,eAAe,EAAE;IACpBD,QAAQ,CAACU,QAAQ,CAACL,GAAG,CAACG,gBAAK,CAAC;IAC5BR,QAAQ,CAACW,UAAU,CAACN,GAAG,CAACN,IAAI,CAACI,aAAa,GAAGS,eAAI,GAAGJ,gBAAK,CAAC;IAC1DR,QAAQ,CAACO,QAAQ,CAACF,GAAG,CAACN,IAAI,CAACI,aAAa,GAAGK,gBAAK,GAAGI,eAAI,CAAC;EACzD;EAEAZ,QAAQ,CAACa,QAAQ,CAACR,GAAG,CAAC,CAAC,CAAC;EAExB,MAAMS,yBAAyB,GAAG,OAAOf,IAAI,CAACgB,cAAc,KAAK,QAAQ;EAEzE,IAAID,yBAAyB,EAAE;IAC9B,IAAAE,mCAA2B,EAAChB,QAAQ,CAAC;EACtC;EAEA,IAAAiB,kBAAW,EACV,CACC;IAAEC,KAAK,EAAElB,QAAQ,CAACmB,CAAC;IAAEC,OAAO,EAAE,CAAC;IAAEP,QAAQ,EAAEd,IAAI,CAACsB;EAAe,CAAC,EAChE;IAAEH,KAAK,EAAElB,QAAQ,CAACsB,CAAC;IAAEF,OAAO,EAAE,CAAC;IAAEP,QAAQ,EAAEd,IAAI,CAACwB;EAAe,CAAC,EAChE;IAAEL,KAAK,EAAElB,QAAQ,CAACwB,KAAK;IAAEJ,OAAO,EAAE,CAAC;IAAEP,QAAQ,EAAEd,IAAI,CAAC0B;EAAmB,CAAC,EACxE;IAAEP,KAAK,EAAElB,QAAQ,CAAC0B,KAAK;IAAEN,OAAO,EAAE,CAAC;IAAEP,QAAQ,EAAEd,IAAI,CAAC4B;EAAmB,CAAC,EACxE,IAAIb,yBAAyB,GAC1B,EAAE,GACF,CACA;IACCI,KAAK,EAAElB,QAAQ,CAAC4B,QAAQ,CAACC,cAAc;IACvCT,OAAO,EAAE,CAAC;IACVP,QAAQ,EAAEd,IAAI,CAAC0B;EAChB,CAAC,EACD;IACCP,KAAK,EAAElB,QAAQ,CAAC4B,QAAQ,CAACE,cAAc;IACvCV,OAAO,EAAE,CAAC;IACVP,QAAQ,EAAEd,IAAI,CAAC4B;EAChB,CAAC,CACD,CAAC,CACJ,EACD5B,IAAI,CAACgC,SAAS,EACd7B,cACD,CAAC;AACF,CAAC;AAAC8B,OAAA,CAAAlC,qBAAA,GAAAA,qBAAA","ignoreList":[]}
+{"version":3,"names":["_constants","require","_reset","_values","resetPanGestureValues","plan","gestures","animations","completeMotion","updateLifecycle","finishPanReset","shouldDismiss","initiator","set","settling","FALSE","progressAnimating","progressSettled","TRUE","clearRawPanValues","dragging","dismissing","velocity","progressDeltaWasCommitted","commitProgress","clearPanProgressDeltaValues","animateMany","value","x","toValue","resetVelocityX","y","resetVelocityY","normX","resetVelocityNormX","normY","resetVelocityNormY","internal","progressDeltaX","progressDeltaY","resetSpec","exports"],"sourceRoot":"../../../../../../../src","sources":["providers/screen/gestures/pan/behavior/pan-reset.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAGA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAcO,MAAMG,qBAAqB,GAAGA,CAAC;EACrCC,IAAI;EACJC,QAAQ;EACRC,UAAU;EACVC,cAAc,GAAG,KAAK;EACtBC,eAAe,GAAG;AACS,CAAC,KAAK;EACjC,SAAS;;EACT,MAAMC,cAAc,GAAGA,CAAA,KAAM;IAC5B,SAAS;;IACT,IAAI,CAACD,eAAe,IAAIJ,IAAI,CAACM,aAAa,EAAE;MAC3C;IACD;IAEAL,QAAQ,CAACM,SAAS,CAACC,GAAG,CAAC,IAAI,CAAC;IAC5BP,QAAQ,CAACQ,QAAQ,CAACD,GAAG,CAACE,gBAAK,CAAC;IAC5B,IAAIP,cAAc,EAAE;MACnBD,UAAU,EAAES,iBAAiB,CAACH,GAAG,CAACE,gBAAK,CAAC;MACxCR,UAAU,EAAEU,eAAe,CAACJ,GAAG,CAACK,eAAI,CAAC;IACtC;EACD,CAAC;EAED,IAAIX,UAAU,IAAIE,eAAe,IAAI,CAACJ,IAAI,CAACM,aAAa,EAAE;IACzDJ,UAAU,CAACS,iBAAiB,CAACH,GAAG,CAACK,eAAI,CAAC;IACtCX,UAAU,CAACU,eAAe,CAACJ,GAAG,CAACE,gBAAK,CAAC;EACtC;EAEA,IAAAI,yBAAiB,EAACb,QAAQ,CAAC;EAE3B,IAAIG,eAAe,EAAE;IACpBH,QAAQ,CAACc,QAAQ,CAACP,GAAG,CAACE,gBAAK,CAAC;IAC5BT,QAAQ,CAACe,UAAU,CAACR,GAAG,CAACR,IAAI,CAACM,aAAa,GAAGO,eAAI,GAAGH,gBAAK,CAAC;IAC1DT,QAAQ,CAACQ,QAAQ,CAACD,GAAG,CAACR,IAAI,CAACM,aAAa,GAAGI,gBAAK,GAAGG,eAAI,CAAC;EACzD;EAEAZ,QAAQ,CAACgB,QAAQ,CAACT,GAAG,CAAC,CAAC,CAAC;EAExB,MAAMU,yBAAyB,GAAG,OAAOlB,IAAI,CAACmB,cAAc,KAAK,QAAQ;EAEzE,IAAID,yBAAyB,EAAE;IAC9B,IAAAE,mCAA2B,EAACnB,QAAQ,CAAC;EACtC;EAEA,IAAAoB,kBAAW,EACV,CACC;IAAEC,KAAK,EAAErB,QAAQ,CAACsB,CAAC;IAAEC,OAAO,EAAE,CAAC;IAAEP,QAAQ,EAAEjB,IAAI,CAACyB;EAAe,CAAC,EAChE;IAAEH,KAAK,EAAErB,QAAQ,CAACyB,CAAC;IAAEF,OAAO,EAAE,CAAC;IAAEP,QAAQ,EAAEjB,IAAI,CAAC2B;EAAe,CAAC,EAChE;IAAEL,KAAK,EAAErB,QAAQ,CAAC2B,KAAK;IAAEJ,OAAO,EAAE,CAAC;IAAEP,QAAQ,EAAEjB,IAAI,CAAC6B;EAAmB,CAAC,EACxE;IAAEP,KAAK,EAAErB,QAAQ,CAAC6B,KAAK;IAAEN,OAAO,EAAE,CAAC;IAAEP,QAAQ,EAAEjB,IAAI,CAAC+B;EAAmB,CAAC,EACxE,IAAIb,yBAAyB,GAC1B,EAAE,GACF,CACA;IACCI,KAAK,EAAErB,QAAQ,CAAC+B,QAAQ,CAACC,cAAc;IACvCT,OAAO,EAAE,CAAC;IACVP,QAAQ,EAAEjB,IAAI,CAAC6B;EAChB,CAAC,EACD;IACCP,KAAK,EAAErB,QAAQ,CAAC+B,QAAQ,CAACE,cAAc;IACvCV,OAAO,EAAE,CAAC;IACVP,QAAQ,EAAEjB,IAAI,CAAC+B;EAChB,CAAC,CACD,CAAC,CACJ,EACD/B,IAAI,CAACmC,SAAS,EACd9B,cACD,CAAC;AACF,CAAC;AAAC+B,OAAA,CAAArC,qBAAA,GAAAA,qBAAA","ignoreList":[]}

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

@@ -13,7 +13,6 @@ var _panLifecycle = require("./pan-lifecycle");
 var _panRelease = require("./pan-release");
 const usePanBehavior = (runtime, screenOptions, dimensions, gestureCompositionOwner, pendingDirection) => {
   const {
-    dismissScreen,
     requestDismiss
   } = (0, _useNavigationHelpers.useNavigationHelpers)();
   const {
@@ -32,8 +31,7 @@ const usePanBehavior = (runtime, screenOptions, dimensions, gestureCompositionOw
     }
     const direction = pendingDirection.get();
     if (direction) {
-      latestRuntime.stores.gestures.active.set(direction);
-      latestRuntime.stores.gestures.direction.set(direction);
+      latestRuntime.stores.gestures.initiator.set(direction);
     }
     pendingDirection.set(null);
     gestureCompositionOwner.set("pan");
@@ -63,11 +61,11 @@ const usePanBehavior = (runtime, screenOptions, dimensions, gestureCompositionOw
       resetSpec: latestRuntime.policy.transitionSpec?.open
     } : latestRuntime.participation.effectiveSnapPoints.hasSnapPoints ? (0, _panRelease.resolveSnapPanRelease)(event, latestRuntime, dimensions) : (0, _panRelease.resolvePanRelease)(event, latestRuntime, dimensions);
     const isPanCompositionOwner = gestureCompositionOwner.get() === "pan";
-    (0, _panLifecycle.finalizePanRelease)(release, latestRuntime, dismissScreen, dimensions, rawEvent, requestDismiss, gestureCompositionOwner);
+    (0, _panLifecycle.finalizePanRelease)(release, latestRuntime, dimensions, rawEvent, requestDismiss, gestureCompositionOwner);
     if (isPanCompositionOwner) {
       gestureCompositionOwner.set(null);
     }
-  }, [runtime, screenOptions, dimensions, dismissScreen, requestDismiss, withSensitivity, gestureCompositionOwner]);
+  }, [runtime, screenOptions, dimensions, requestDismiss, withSensitivity, gestureCompositionOwner]);
   return (0, _react.useMemo)(() => ({
     onStart,
     onUpdate,

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_useNavigationHelpers","_useGestureSensitivity","_runtime","_values","_panLifecycle","_panRelease","usePanBehavior","runtime","screenOptions","dimensions","gestureCompositionOwner","pendingDirection","dismissScreen","requestDismiss","useNavigationHelpers","withSensitivity","resetSensitivity","usePanGestureSensitivity","onStart","useCallback","latestRuntime","resolvePanRuntime","get","clearPanTrackingValues","stores","gestures","set","direction","active","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","useMemo","exports"],"sourceRoot":"../../../../../../../src","sources":["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","pendingDirection","requestDismiss","useNavigationHelpers","withSensitivity","resetSensitivity","usePanGestureSensitivity","onStart","useCallback","latestRuntime","resolvePanRuntime","get","clearPanTrackingValues","stores","gestures","set","direction","initiator","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","useMemo","exports"],"sourceRoot":"../../../../../../../src","sources":["providers/screen/gestures/pan/behavior/use-pan-behavior.ts"],"mappings":"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","ignoreList":[]}

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

@@ -22,7 +22,7 @@ const useBuildPanGesture = ({
     participation,
     pan: policy
   } = gestureConfig;
-  const screenOptions = (0, _options.useScreenOptionsContext)();
+  const screenOptions = (0, _options.useScreenOptionsStore)();
   const runtime = (0, _useStableRuntimeConfig.useStableRuntimeConfig)({
     participation,
     policy

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

@@ -1 +1 @@
-{"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","pendingDirection","panGesture","useMemo","Gesture","Pan","enabled","manualActivation","averageTouches","onTouchesDown","onTouchesMove","onStart","onUpdate","onEnd","exports"],"sourceRoot":"../../../../../../src","sources":["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,uBAAuB,EACvBU,UAAU,CAACI,gBACZ,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,CAACZ,UAAU,CAACY,aAAa,CAAC,CACvCC,aAAa,CAACb,UAAU,CAACa,aAAa,CAAC,CACvCC,OAAO,CAACZ,QAAQ,CAACY,OAAO,CAAC,CACzBC,QAAQ,CAACb,QAAQ,CAACa,QAAQ,CAAC,CAC3BC,KAAK,CAACd,QAAQ,CAACc,KAAK,CAAC;EACxB,CAAC,EAAE,CAAChB,UAAU,EAAEE,QAAQ,CAAC,CAAC;EAE1B,OAAOG,UAAU;AAClB,CAAC;AAACY,OAAA,CAAA/B,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","useScreenOptionsStore","runtime","useStableRuntimeConfig","activation","usePanActivation","behavior","usePanBehavior","pendingDirection","panGesture","useMemo","Gesture","Pan","enabled","manualActivation","averageTouches","onTouchesDown","onTouchesMove","onStart","onUpdate","onEnd","exports"],"sourceRoot":"../../../../../../src","sources":["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,8BAAqB,EAAC,CAAC;EAE7C,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,uBAAuB,EACvBU,UAAU,CAACI,gBACZ,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,CAACZ,UAAU,CAACY,aAAa,CAAC,CACvCC,aAAa,CAACb,UAAU,CAACa,aAAa,CAAC,CACvCC,OAAO,CAACZ,QAAQ,CAACY,OAAO,CAAC,CACzBC,QAAQ,CAACb,QAAQ,CAACa,QAAQ,CAAC,CAC3BC,KAAK,CAACd,QAAQ,CAACc,KAAK,CAAC;EACxB,CAAC,EAAE,CAAChB,UAAU,EAAEE,QAAQ,CAAC,CAAC;EAE1B,OAAOG,UAAU;AAClB,CAAC;AAACY,OAAA,CAAA/B,kBAAA,GAAAA,kBAAA","ignoreList":[]}

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

@@ -3,8 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.usePinchActivation = exports.updateAbsolutePinchFocalPoint = void 0;
+exports.usePinchActivation = exports.updatePinchRotation = exports.updateAbsolutePinchFocalPoint = void 0;
 var _react = require("react");
+var _reactNativeReanimated = require("react-native-reanimated");
 var _runtime = require("../../shared/runtime");
 const updateAbsolutePinchFocalPoint = (event, gestures, captureOrigin) => {
   "worklet";
@@ -24,11 +25,42 @@ const updateAbsolutePinchFocalPoint = (event, gestures, captureOrigin) => {
   }
 };
 exports.updateAbsolutePinchFocalPoint = updateAbsolutePinchFocalPoint;
+const updatePinchRotation = (event, gestures, lastAngle, accumulatedRotation, captureOrigin) => {
+  "worklet";
+
+  const firstTouch = event.allTouches[0];
+  const secondTouch = event.allTouches[1];
+  if (!firstTouch || !secondTouch) {
+    return;
+  }
+  const angle = Math.atan2(secondTouch.absoluteY - firstTouch.absoluteY, secondTouch.absoluteX - firstTouch.absoluteX);
+  if (captureOrigin) {
+    lastAngle.set(angle);
+    accumulatedRotation.set(0);
+    gestures.rotation.set(0);
+    gestures.raw.rotation.set(0);
+    return;
+  }
+  let angleDelta = angle - lastAngle.get();
+  if (angleDelta > Math.PI) {
+    angleDelta -= 2 * Math.PI;
+  } else if (angleDelta < -Math.PI) {
+    angleDelta += 2 * Math.PI;
+  }
+  const rotation = accumulatedRotation.get() + angleDelta;
+  lastAngle.set(angle);
+  accumulatedRotation.set(rotation);
+  gestures.rotation.set(rotation);
+  gestures.raw.rotation.set(rotation);
+};
+exports.updatePinchRotation = updatePinchRotation;
 const usePinchActivation = ({
   runtime,
   screenOptions,
   gestureCompositionOwner
 }) => {
+  const lastAngle = (0, _reactNativeReanimated.useSharedValue)(0);
+  const accumulatedRotation = (0, _reactNativeReanimated.useSharedValue)(0);
   const onTouchesDown = (0, _react.useCallback)((event, stateManager) => {
     "worklet";
 
@@ -43,6 +75,7 @@ const usePinchActivation = ({
     }
     if (event.numberOfTouches === 2) {
       updateAbsolutePinchFocalPoint(event, latestRuntime.stores.gestures, true);
+      updatePinchRotation(event, latestRuntime.stores.gestures, lastAngle, accumulatedRotation, true);
       if (gestureCompositionOwner.get() === null) {
         gestureCompositionOwner.set("pinch");
       }
@@ -52,7 +85,7 @@ const usePinchActivation = ({
     if (event.numberOfTouches > 2) {
       stateManager?.fail();
     }
-  }, [runtime, screenOptions, gestureCompositionOwner]);
+  }, [runtime, screenOptions, gestureCompositionOwner, lastAngle, accumulatedRotation]);
   const onTouchesMove = (0, _react.useCallback)((event, stateManager) => {
     "worklet";
 
@@ -67,6 +100,7 @@ const usePinchActivation = ({
     }
     if (event.numberOfTouches === 2) {
       updateAbsolutePinchFocalPoint(event, latestRuntime.stores.gestures, false);
+      updatePinchRotation(event, latestRuntime.stores.gestures, lastAngle, accumulatedRotation, false);
       if (gestureCompositionOwner.get() === null) {
         gestureCompositionOwner.set("pinch");
       }
@@ -76,7 +110,7 @@ const usePinchActivation = ({
     if (event.numberOfTouches > 2) {
       stateManager.fail();
     }
-  }, [runtime, screenOptions, gestureCompositionOwner]);
+  }, [runtime, screenOptions, gestureCompositionOwner, lastAngle, accumulatedRotation]);
   return (0, _react.useMemo)(() => ({
     onTouchesDown,
     onTouchesMove

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_runtime","updateAbsolutePinchFocalPoint","event","gestures","captureOrigin","firstTouch","allTouches","secondTouch","focalX","absoluteX","focalY","absoluteY","set","pinchOriginX","pinchOriginY","exports","usePinchActivation","runtime","screenOptions","gestureCompositionOwner","onTouchesDown","useCallback","stateManager","latestRuntime","resolvePinchRuntime","get","participation","policy","canTrackGesture","enabled","fail","numberOfTouches","stores","activate","onTouchesMove","useMemo"],"sourceRoot":"../../../../../../../src","sources":["providers/screen/gestures/pinch/activation/use-pinch-activation.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_runtime","updateAbsolutePinchFocalPoint","event","gestures","captureOrigin","firstTouch","allTouches","secondTouch","focalX","absoluteX","focalY","absoluteY","set","pinchOriginX","pinchOriginY","exports","updatePinchRotation","lastAngle","accumulatedRotation","angle","Math","atan2","rotation","raw","angleDelta","get","PI","usePinchActivation","runtime","screenOptions","gestureCompositionOwner","useSharedValue","onTouchesDown","useCallback","stateManager","latestRuntime","resolvePinchRuntime","participation","policy","canTrackGesture","enabled","fail","numberOfTouches","stores","activate","onTouchesMove","useMemo"],"sourceRoot":"../../../../../../../src","sources":["providers/screen/gestures/pinch/activation/use-pinch-activation.ts"],"mappings":"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","ignoreList":[]}

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

@@ -7,8 +7,8 @@ exports.trackPinchGesture = exports.startPinchBase = exports.finalizePinchReleas
 var _reactNativeReanimated = require("react-native-reanimated");
 var _reactNativeWorklets = require("react-native-worklets");
 var _constants = require("../../../../../constants");
+var _animation = require("../../../../../stores/animation.store");
 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");
@@ -22,16 +22,11 @@ const startPinchBase = runtime => {
       animations
     }
   } = runtime;
-  const wasSettling = gestures.settling.get();
-  const hasResidualGesture = Math.abs(gestures.normScale.get()) > _constants.EPSILON || Math.abs(gestures.rotation.get()) > _constants.EPSILON;
-  if (!wasSettling || !hasResidualGesture) {
-    (0, _emit.emit)(animations.willAnimate, _constants.TRUE, _constants.FALSE);
-  }
+  (0, _animation.emitMotionStart)(animations);
   gestures.dragging.set(_constants.TRUE);
   gestures.dismissing.set(0);
   gestures.settling.set(0);
-  gestures.active.set(null);
-  gestures.direction.set(null);
+  gestures.initiator.set(null);
   gestures.velocity.set(0);
   (0, _values.clearTransformTrackingValues)(gestures);
   gestures.internal.progressBaseline.set(animations.transitionProgress.get());
@@ -48,8 +43,8 @@ const trackPinchGesture = (event, rawEvent, gestures) => {
   gestures.normScale.set(normScale);
   gestures.raw.scale.set(rawScale);
   gestures.raw.normScale.set(rawNormScale);
-  if (gestures.active.get() === null) {
-    gestures.active.set(normScale < 0 ? "pinch-in" : normScale > 0 ? "pinch-out" : null);
+  if (gestures.initiator.get() === null) {
+    gestures.initiator.set(normScale < 0 ? "pinch-in" : normScale > 0 ? "pinch-out" : null);
   }
   return {
     scale,
@@ -57,7 +52,7 @@ const trackPinchGesture = (event, rawEvent, gestures) => {
   };
 };
 exports.trackPinchGesture = trackPinchGesture;
-const finalizePinchRelease = (release, runtime, dismissScreen, requestDismiss) => {
+const finalizePinchRelease = (release, runtime, requestDismiss) => {
   "worklet";
 
   const {
@@ -71,6 +66,7 @@ const finalizePinchRelease = (release, runtime, dismissScreen, requestDismiss) =
     animations.transitionProgress.set(release.commitProgress);
     system.targetProgress.set(release.commitProgress);
   }
+  const progressAlreadyAtTarget = Math.abs(animations.transitionProgress.get() - release.target) <= _constants.EPSILON;
   if (release.shouldDismiss) {
     (0, _snapshot.snapshotGestureHandoff)(gestures, {
       velocity: release.handoffVelocity
@@ -79,22 +75,27 @@ const finalizePinchRelease = (release, runtime, dismissScreen, requestDismiss) =
   (0, _pinchReset.resetPinchGestureValues)({
     spec: release.resetSpec,
     gestures,
+    animations,
     shouldDismiss: release.shouldDismiss,
     resetValuesImmediately: release.resetValuesImmediately
   });
-  if (release.shouldDismiss && requestDismiss) {
-    (0, _reactNativeWorklets.scheduleOnRN)(requestDismiss);
+  if (!release.shouldDismiss && progressAlreadyAtTarget) {
+    system.targetProgress.set(release.target);
+    return;
   }
   (0, _animateToProgress.animateToProgress)({
     target: release.target,
-    onAnimationFinish: release.shouldDismiss ? dismissScreen : undefined,
     spec: release.transitionSpec,
     emitWillAnimate: false,
     markEntering: false,
     animations,
     targetProgress: system.targetProgress,
+    animationProgress: system.animationProgress,
     initialVelocity: release.initialVelocity
   });
+  if (release.shouldDismiss && requestDismiss) {
+    (0, _reactNativeWorklets.scheduleOnRN)(requestDismiss);
+  }
 };
 exports.finalizePinchRelease = finalizePinchRelease;
 //# sourceMappingURL=pinch-lifecycle.js.map