Merge branch 'main' into @mbert/dont-duplicate-events-ios

Author: m-bert

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

@@ -493,7 +493,9 @@ class RNGestureHandlerButtonViewManager :
               if (inside != isPointerInsideBounds) {
                 isPointerInsideBounds = inside
                 if (inside) {
-                  animatePressIn()
+                  // Re-establish View's pressed flag to restore ripple and the
+                  // UP handler runs its normal release cleanup.
+                  setPressed(true)
                 } else {
                   animatePressOut()
                 }

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

@@ -49,7 +49,7 @@ class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
     // When starting a new event stream, dispatch CANCEL event so the subtree
     // can clean up its internal state that may be stale due to Gesture Handler
     // starting to intercept events mid-stream.
-    if (event.actionMasked == MotionEvent.ACTION_DOWN) {
+    if (rootViewEnabled && event.actionMasked == MotionEvent.ACTION_DOWN) {
       val cancelEvent = MotionEvent.obtain(event).apply { action = MotionEvent.ACTION_CANCEL }
       super.dispatchTouchEvent(cancelEvent)
       cancelEvent.recycle()

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

@@ -61,6 +61,9 @@ function getIosStatesConfig(
       eventName: StateMachineEvent.NATIVE_BEGIN,
       callback: handlePressIn,
     },
+    {
+      eventName: StateMachineEvent.NATIVE_START,
+    },
     {
       eventName: StateMachineEvent.FINALIZE,
       callback: handlePressOut,

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

@@ -23,7 +23,7 @@ export const RawButton = createNativeWrapper<
   RawButtonProps
 >(GestureHandlerButton, {
   shouldCancelWhenOutside: false,
-  shouldActivateOnStart: true,
+  shouldActivateOnStart: false,
 });
 
 /**

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

@@ -308,7 +308,7 @@ const Pressable = (props: PressableProps) => {
       stateMachine.handleEvent(StateMachineEvent.NATIVE_BEGIN);
     },
     onActivate: () => {
-      if (Platform.OS !== 'android' && Platform.OS !== 'ios') {
+      if (Platform.OS !== 'android') {
         // Native.onActivate is broken with Android + hitSlop
         stateMachine.handleEvent(StateMachineEvent.NATIVE_START);
       }

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

@@ -8,7 +8,11 @@ import type {
   FlingHandlerData,
 } from './FlingTypes';
 
-export function useFlingGesture(config: FlingGestureConfig): FlingGesture {
+const EMPTY_FLING_CONFIG: FlingGestureConfig = {};
+
+export function useFlingGesture(
+  config: FlingGestureConfig = EMPTY_FLING_CONFIG
+): FlingGesture {
   const flingConfig = useClonedAndRemappedConfig<
     FlingGestureProperties,
     FlingHandlerData

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

@@ -44,7 +44,11 @@ function transformHoverProps(
 
 const HoverPropsMapping = new Map<string, string>([['effect', 'hoverEffect']]);
 
-export function useHoverGesture(config: HoverGestureConfig): HoverGesture {
+const EMPTY_HOVER_CONFIG: HoverGestureConfig = {};
+
+export function useHoverGesture(
+  config: HoverGestureConfig = EMPTY_HOVER_CONFIG
+): HoverGesture {
   const hoverConfig = useClonedAndRemappedConfig<
     HoverGestureProperties,
     HoverHandlerData,

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

@@ -28,8 +28,10 @@ function transformLongPressProps(
   return config;
 }
 
+const EMPTY_LONG_PRESS_CONFIG: LongPressGestureConfig = {};
+
 export function useLongPressGesture(
-  config: LongPressGestureConfig
+  config: LongPressGestureConfig = EMPTY_LONG_PRESS_CONFIG
 ): LongPressGesture {
   const longPressConfig = useClonedAndRemappedConfig<
     LongPressGestureProperties,

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

@@ -8,7 +8,11 @@ import type {
   ManualHandlerData,
 } from './ManualTypes';
 
-export function useManualGesture(config: ManualGestureConfig): ManualGesture {
+const EMPTY_MANUAL_CONFIG: ManualGestureConfig = {};
+
+export function useManualGesture(
+  config: ManualGestureConfig = EMPTY_MANUAL_CONFIG
+): ManualGesture {
   const manualConfig = useClonedAndRemappedConfig<
     ManualGestureProperties,
     ManualHandlerData

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

@@ -8,7 +8,11 @@ import type {
   NativeHandlerData,
 } from './NativeTypes';
 
-export function useNativeGesture(config: NativeGestureConfig): NativeGesture {
+const EMPTY_NATIVE_CONFIG: NativeGestureConfig = {};
+
+export function useNativeGesture(
+  config: NativeGestureConfig = EMPTY_NATIVE_CONFIG
+): NativeGesture {
   const nativeConfig = useClonedAndRemappedConfig<
     NativeGestureProperties,
     NativeHandlerData