Merge branch 'next' into @mbert/add-event-calculators

Author: m-bert

apps/basic-example/metro.config.js

@@ -2,7 +2,7 @@ const { getDefaultConfig } = require('@react-native/metro-config');
 const { mergeConfig } = require('metro-config');
 
 const path = require('path');
-const exclusionList = require('metro-config/private/defaults/exclusionList');
+const exclusionList = require('metro-config/private/defaults/exclusionList').default;
 const escape = require('escape-string-regexp');
 
 // Gesture handler tries to require 'react-native-reanimated' inside a try...catch

apps/expo-example/metro.config.js

@@ -1,7 +1,7 @@
 const { getDefaultConfig } = require('expo/metro-config');
 const path = require('path');
 
-const exclusionList = require('metro-config/private/defaults/exclusionList');
+const exclusionList = require('metro-config/private/defaults/exclusionList').default;
 const escape = require('escape-string-regexp');
 const pack = require('./package.json');
 

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerButtonViewManager.kt

@@ -262,13 +262,13 @@ class RNGestureHandlerButtonViewManager :
       }
     }
 
-    override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
-      if (super.onInterceptTouchEvent(ev)) {
+    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
+      if (super.onInterceptTouchEvent(event)) {
         return true
       }
       // We call `onTouchEvent` and wait until button changes state to `pressed`, if it's pressed
       // we return true so that the gesture handler can activate.
-      onTouchEvent(ev)
+      onTouchEvent(event)
       return isPressed
     }
 

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootHelper.kt

@@ -115,12 +115,12 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
     }
   }
 
-  fun dispatchTouchEvent(ev: MotionEvent): Boolean {
+  fun dispatchTouchEvent(event: MotionEvent): Boolean {
     // We mark `mPassingTouch` before we get into `mOrchestrator.onTouchEvent` so that we can tell
     // if `requestDisallow` has been called as a result of a normal gesture handling process or
     // as a result of one of the gesture handlers activating
     passingTouch = true
-    orchestrator!!.onTouchEvent(ev)
+    orchestrator!!.onTouchEvent(event)
     passingTouch = false
     return shouldIntercept
   }

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootView.kt

@@ -37,10 +37,10 @@ class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
     rootHelper?.tearDown()
   }
 
-  override fun dispatchTouchEvent(ev: MotionEvent) = if (rootViewEnabled && rootHelper!!.dispatchTouchEvent(ev)) {
+  override fun dispatchTouchEvent(event: MotionEvent) = if (rootViewEnabled && rootHelper!!.dispatchTouchEvent(event)) {
     true
   } else {
-    super.dispatchTouchEvent(ev)
+    super.dispatchTouchEvent(event)
   }
 
   override fun dispatchGenericMotionEvent(event: MotionEvent) =

packages/react-native-gesture-handler/src/components/Pressable/Pressable.tsx

@@ -270,9 +270,13 @@ const Pressable = (props: PressableProps) => {
           stateMachine.reset();
           handlePressOut(pressableEvent, false);
         })
-        .onFinalize(() => {
+        .onFinalize((_event, success) => {
           if (Platform.OS === 'web') {
-            stateMachine.handleEvent(StateMachineEvent.FINALIZE);
+            if (success) {
+              stateMachine.handleEvent(StateMachineEvent.FINALIZE);
+            } else {
+              stateMachine.handleEvent(StateMachineEvent.CANCEL);
+            }
             handleFinalize();
           }
         }),
@@ -301,11 +305,15 @@ const Pressable = (props: PressableProps) => {
             stateMachine.handleEvent(StateMachineEvent.NATIVE_START);
           }
         })
-        .onFinalize(() => {
+        .onFinalize((_event, success) => {
           if (Platform.OS !== 'web') {
             // On Web we use LongPress().onFinalize() instead of Native().onFinalize(),
             // as Native cancels on mouse move, and LongPress does not.
-            stateMachine.handleEvent(StateMachineEvent.FINALIZE);
+            if (success) {
+              stateMachine.handleEvent(StateMachineEvent.FINALIZE);
+            } else {
+              stateMachine.handleEvent(StateMachineEvent.CANCEL);
+            }
             handleFinalize();
           }
         }),

packages/react-native-gesture-handler/src/components/Pressable/stateDefinitions.ts

@@ -7,6 +7,7 @@ export enum StateMachineEvent {
   NATIVE_START = 'nativeStart',
   FINALIZE = 'finalize',
   LONG_PRESS_TOUCHES_DOWN = 'longPressTouchesDown',
+  CANCEL = 'cancel',
 }
 
 function getAndroidStatesConfig(

packages/react-native-gesture-handler/src/components/ReanimatedSwipeable/ReanimatedSwipeable.tsx

@@ -11,7 +11,11 @@ import Animated, {
   runOnUI,
   useAnimatedStyle,
 } from 'react-native-reanimated';
-import { SwipeableProps, SwipeableMethods, SwipeDirection } from '.';
+import {
+  SwipeableProps,
+  SwipeableMethods,
+  SwipeDirection,
+} from './ReanimatedSwipeableProps';
 import { Gesture } from '../..';
 import {
   GestureStateChangeEvent,