Attach native gesture directly to button on the native side on iOS

Author: j-piasecki

packages/react-native-gesture-handler/apple/RNGestureHandlerActionType.h

@@ -1,6 +1,7 @@
 #import <Foundation/Foundation.h>
 
 typedef NS_ENUM(NSInteger, RNGestureHandlerActionType) {
+  RNGestureHandlerActionTypeNone = 0, // Handler managed by a native component, doesn't dispatch events to JS
   RNGestureHandlerActionTypeReanimatedWorklet = 1, // Reanimated worklet
   RNGestureHandlerActionTypeNativeAnimatedEvent, // Animated.event with useNativeDriver: true
   RNGestureHandlerActionTypeJSFunctionOldAPI, // JS function or Animated.event with useNativeDriver: false using old

packages/react-native-gesture-handler/apple/RNGestureHandlerButtonComponentView.mm

@@ -11,6 +11,7 @@
 #import <react/renderer/components/view/ViewProps.h>
 
 #import "RNGestureHandlerButton.h"
+#import "RNGestureHandlerModule.h"
 
 using namespace facebook::react;
 
@@ -36,6 +37,7 @@ @implementation RNGestureHandlerButtonComponentView {
   RNGestureHandlerButton *_buttonView;
   BOOL _needsAnimationStateReset;
   int _moduleId;
+  NSNumber *_managedHandlerTag;
 }
 
 #if TARGET_OS_OSX
@@ -122,6 +124,8 @@ - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context
 
 - (void)prepareForRecycle
 {
+  [self dropManagedHandler];
+
   [self.layer removeAnimationForKey:@"transform"];
   self.layer.transform = CATransform3DIdentity;
 
@@ -254,6 +258,105 @@ - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
                                          left:borderMetrics.borderWidths.left];
 }
 
+#pragma mark - Managed gesture handler
+
+- (NSDictionary *)buildManagedHandlerConfig:(const RNGestureHandlerButtonProps &)props
+{
+  NSMutableDictionary *config = [NSMutableDictionary new];
+  config[@"shouldActivateOnStart"] = @NO;
+  config[@"disallowInterruption"] = @YES;
+  config[@"yieldsToContinuousGestures"] = @YES;
+  config[@"enabled"] = @(props.enabled);
+  config[@"shouldCancelWhenOutside"] = @(props.cancelOnLeave);
+
+  if (!props.gestureTestID.empty()) {
+    config[@"testID"] = RCTNSStringFromString(props.gestureTestID);
+  }
+
+  if (props.gestureHitSlop.top != 0 || props.gestureHitSlop.left != 0 || props.gestureHitSlop.bottom != 0 ||
+      props.gestureHitSlop.right != 0) {
+    config[@"hitSlop"] = @{
+      @"top" : @(props.gestureHitSlop.top),
+      @"left" : @(props.gestureHitSlop.left),
+      @"bottom" : @(props.gestureHitSlop.bottom),
+      @"right" : @(props.gestureHitSlop.right),
+    };
+  }
+
+  return config;
+}
+
+- (void)updateManagedHandler:(const RNGestureHandlerButtonProps &)newProps
+                    oldProps:(const RNGestureHandlerButtonProps *)oldProps
+{
+  if (newProps.handlerTag <= 0) {
+    [self dropManagedHandler];
+    return;
+  }
+
+  RNGestureHandlerManager *manager = [RNGestureHandlerModule handlerManagerForModuleId:_moduleId];
+  if (manager == nil) {
+    return;
+  }
+
+  BOOL tagChanged = _managedHandlerTag == nil || [_managedHandlerTag doubleValue] != newProps.handlerTag;
+
+  if (tagChanged) {
+    [self dropManagedHandler];
+
+    NSNumber *handlerTag = @(newProps.handlerTag);
+    [manager createGestureHandler:@"NativeViewGestureHandler"
+                              tag:handlerTag
+                           config:[self buildManagedHandlerConfig:newProps]];
+
+    // Events dispatched by the handler carry the view's reactTag; without it the
+    // dispatch is skipped (see `handleGesture:fromReset:fromManualStateChange:`).
+    _buttonView.reactTag = @(self.tag);
+    // The cast is needed on macOS, where the button is an NSControl and outside
+    // of the RCTUIView hierarchy.
+    [manager attachHandlerForDetectorWithTag:handlerTag
+                                      toView:(RNGHUIView *)_buttonView
+                              withActionType:RNGestureHandlerActionTypeNone
+                            withHostDetector:nil];
+
+    _managedHandlerTag = handlerTag;
+    _buttonView.managedHandlerTag = handlerTag;
+    return;
+  }
+
+  BOOL configChanged = oldProps == nullptr || oldProps->enabled != newProps.enabled ||
+      oldProps->cancelOnLeave != newProps.cancelOnLeave || oldProps->gestureTestID != newProps.gestureTestID ||
+      oldProps->gestureHitSlop.top != newProps.gestureHitSlop.top ||
+      oldProps->gestureHitSlop.left != newProps.gestureHitSlop.left ||
+      oldProps->gestureHitSlop.bottom != newProps.gestureHitSlop.bottom ||
+      oldProps->gestureHitSlop.right != newProps.gestureHitSlop.right;
+
+  if (configChanged) {
+    // `setConfig:` resets to defaults before applying, so keys omitted from the
+    // dictionary (e.g. `hitSlop`, `testID`) get cleared rather than kept.
+    [manager setGestureHandlerConfig:_managedHandlerTag config:[self buildManagedHandlerConfig:newProps]];
+  }
+}
+
+- (void)dropManagedHandler
+{
+  if (_managedHandlerTag == nil) {
+    return;
+  }
+
+  RNGestureHandlerManager *manager = [RNGestureHandlerModule handlerManagerForModuleId:_moduleId];
+  [manager dropGestureHandler:_managedHandlerTag];
+
+  _managedHandlerTag = nil;
+  _buttonView.managedHandlerTag = nil;
+}
+
+- (void)dealloc
+{
+  // On macOS the buttons are not recycled, `prepareForRecycle` may never run.
+  [self dropManagedHandler];
+}
+
 #pragma mark - RNGHButtonPressEventDelegate
 
 - (void)dispatchButtonEvent:(RNGHButtonEventType)type withExtraData:(RNGestureHandlerEventExtraData *)extraData
@@ -475,6 +578,10 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
   if (shouldApplyStartAnimationState) {
     [_buttonView applyStartAnimationState];
   }
+
+  const auto *oldButtonPropsPtr =
+      treatAsFirstMount ? nullptr : std::static_pointer_cast<const RNGestureHandlerButtonProps>(oldProps).get();
+  [self updateManagedHandler:newProps oldProps:oldButtonPropsPtr];
 }
 
 #if !TARGET_OS_OSX

packages/react-native-gesture-handler/apple/RNGestureHandlerManager.mm

@@ -443,6 +443,10 @@ - (void)sendEvent:(RNGestureHandlerStateChange *)event
     case RNGestureHandlerActionTypeJSFunctionNewAPI:
       [self sendEventForJSFunctionNewAPI:event];
       break;
+
+    case RNGestureHandlerActionTypeNone:
+      // Consumed on the native side (e.g. by the button), no events are sent to JS.
+      break;
   }
 }