Merge branch 'main' into @akwasniewski/remove-begin-from-sm

Author: akwasniewski

packages/react-native-gesture-handler/apple/Handlers/RNTapHandler.m

@@ -148,6 +148,8 @@ - (void)interactionsCancelled:(NSSet *)touches withEvent:(UIEvent *)event
 {
   [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
   self.state = UIGestureRecognizerStateCancelled;
+
+  [self triggerAction];
 }
 
 #if TARGET_OS_OSX

packages/react-native-gesture-handler/src/v3/components/GestureButtons.tsx

@@ -39,6 +39,8 @@ export const BaseButton = (props: BaseButtonProps) => {
       if (onLongPress) {
         longPressTimeout.current = setTimeout(wrappedLongPress, delayLongPress);
       }
+
+      props.onBegin?.(e);
     }
   };
 
@@ -50,27 +52,35 @@ export const BaseButton = (props: BaseButtonProps) => {
       if (onLongPress) {
         longPressTimeout.current = setTimeout(wrappedLongPress, delayLongPress);
       }
+
+      props.onBegin?.(e);
     }
 
     if (!e.pointerInside && longPressTimeout.current !== undefined) {
       clearTimeout(longPressTimeout.current);
       longPressTimeout.current = undefined;
     }
+
+    props.onActivate?.(e);
   };
 
-  const onDeactivate = (e: CallbackEventType, success: boolean) => {
+  const onDeactivate = (e: CallbackEventType, didSucceed: boolean) => {
     onActiveStateChange?.(false);
 
-    if (success && !longPressDetected.current) {
+    if (didSucceed && !longPressDetected.current) {
       onPress?.(e.pointerInside);
     }
+
+    props.onDeactivate?.(e, didSucceed);
   };
 
-  const onFinalize = (_e: CallbackEventType) => {
+  const onFinalize = (e: CallbackEventType, didSucceed: boolean) => {
     if (longPressTimeout.current !== undefined) {
       clearTimeout(longPressTimeout.current);
       longPressTimeout.current = undefined;
     }
+
+    props.onFinalize?.(e, didSucceed);
   };
 
   return (

packages/react-native-gesture-handler/src/v3/hooks/gestures/native/NativeTypes.ts

@@ -1,5 +1,5 @@
 import {
-  BaseDiscreteGestureConfig,
+  BaseGestureConfig,
   ExcludeInternalConfigProps,
   GestureEvent,
   SingleGesture,
@@ -33,7 +33,7 @@ export type NativeHandlerData = {
 export type NativeGestureProperties =
   WithSharedValue<NativeGestureNativeProperties>;
 
-export type NativeGestureInternalConfig = BaseDiscreteGestureConfig<
+export type NativeGestureInternalConfig = BaseGestureConfig<
   NativeGestureProperties,
   NativeHandlerData
 >;