react-native-gesture-handler 2.30.0 → 2.31.0-nightly-20260121-59a5311e3

package/apple/RNGestureHandler.h

@@ -2,6 +2,7 @@
 #import "RNGestureHandlerActionType.h"
 #import "RNGestureHandlerDirection.h"
 #import "RNGestureHandlerEvents.h"
+#import "RNGestureHandlerPointerEvents.h"
 #import "RNGestureHandlerPointerTracker.h"
 #import "RNGestureHandlerPointerType.h"
 #import "RNGestureHandlerState.h"

package/apple/RNGestureHandlerButton.h

@@ -28,6 +28,7 @@
 @property (nonatomic, assign) UIEdgeInsets hitTestEdgeInsets;
 @property (nonatomic, assign) CGFloat borderRadius;
 @property (nonatomic) BOOL userEnabled;
+@property (nonatomic, assign) RNGestureHandlerPointerEvents pointerEvents;
 
 #if TARGET_OS_OSX && RCT_NEW_ARCH_ENABLED
 - (void)mountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index;

package/apple/RNGestureHandlerButton.mm

@@ -50,6 +50,7 @@
   if (self) {
     _hitTestEdgeInsets = UIEdgeInsetsZero;
     _userEnabled = YES;
+    _pointerEvents = RNGestureHandlerPointerEventsAuto;
 #if !TARGET_OS_TV && !TARGET_OS_OSX
     [self setExclusiveTouch:YES];
 #endif
@@ -93,6 +94,29 @@
 
 - (RNGHUIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {
+  RNGestureHandlerPointerEvents pointerEvents = _pointerEvents;
+  
+  if (pointerEvents == RNGestureHandlerPointerEventsNone) {
+    return nil;
+  }
+  
+  if (pointerEvents == RNGestureHandlerPointerEventsBoxNone) {
+    for (UIView *subview in [self.subviews reverseObjectEnumerator]) {
+      if (!subview.isHidden && subview.alpha > 0) {
+        CGPoint convertedPoint = [subview convertPoint:point fromView:self];
+        UIView *hitView = [subview hitTest:convertedPoint withEvent:event];
+        if (hitView != nil && [self shouldHandleTouch:hitView]) {
+          return hitView;
+        }
+      }
+    }
+    return nil;
+  }
+  
+  if (pointerEvents == RNGestureHandlerPointerEventsBoxOnly) {
+    return [self pointInside:point withEvent:event] ? self : nil;
+  }
+  
   RNGHUIView *inner = [super hitTest:point withEvent:event];
   while (inner && ![self shouldHandleTouch:inner]) {
     inner = inner.superview;

package/apple/RNGestureHandlerButtonComponentView.mm

@@ -9,11 +9,27 @@
 #import <react/renderer/components/rngesturehandler_codegen/EventEmitters.h>
 #import <react/renderer/components/rngesturehandler_codegen/Props.h>
 #import <react/renderer/components/rngesturehandler_codegen/RCTComponentViewHelpers.h>
+#import <react/renderer/components/view/ViewProps.h>
 
 #import "RNGestureHandlerButton.h"
 
 using namespace facebook::react;
 
+static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::PointerEventsMode pointerEvents)
+{
+  switch (pointerEvents) {
+    case facebook::react::PointerEventsMode::None:
+      return RNGestureHandlerPointerEventsNone;
+    case facebook::react::PointerEventsMode::BoxNone:
+      return RNGestureHandlerPointerEventsBoxNone;
+    case facebook::react::PointerEventsMode::BoxOnly:
+      return RNGestureHandlerPointerEventsBoxOnly;
+    case facebook::react::PointerEventsMode::Auto:
+    default:
+      return RNGestureHandlerPointerEventsAuto;
+  }
+}
+
 @interface RNGestureHandlerButtonComponentView () <RCTRNGestureHandlerButtonViewProtocol>
 @end
 
@@ -207,8 +223,35 @@ using namespace facebook::react;
   _buttonView.hitTestEdgeInsets = UIEdgeInsetsMake(
       -newProps.hitSlop.top, -newProps.hitSlop.left, -newProps.hitSlop.bottom, -newProps.hitSlop.right);
 
+  if (!oldProps) {
+    _buttonView.pointerEvents = RCTPointerEventsToEnum(newProps.pointerEvents);
+  } else {
+    const auto &oldButtonProps = *std::static_pointer_cast<const RNGestureHandlerButtonProps>(oldProps);
+    if (oldButtonProps.pointerEvents != newProps.pointerEvents) {
+      _buttonView.pointerEvents = RCTPointerEventsToEnum(newProps.pointerEvents);
+    }
+  }
+
   [super updateProps:props oldProps:oldProps];
 }
+
+#if !TARGET_OS_OSX
+// Override hitTest to forward touches to _buttonView
+// This is necessary because RCTViewComponentView's hitTest might handle pointerEvents
+// from ViewProps and prevent touches from reaching _buttonView (which is the contentView).
+// Since _buttonView has its own pointerEvents handling, we always forward to it.
+- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
+{
+  if (![self pointInside:point withEvent:event]) {
+    return nil;
+  }
+
+  CGPoint buttonPoint = [self convertPoint:point toView:_buttonView];
+
+  return [_buttonView hitTest:buttonPoint withEvent:event];
+}
+#endif
+
 @end
 
 Class<RCTComponentViewProtocol> RNGestureHandlerButtonCls(void)

package/apple/RNGestureHandlerButtonManager.mm

@@ -1,6 +1,20 @@
 #import "RNGestureHandlerButtonManager.h"
 #import "RNGestureHandlerButton.h"
 
+static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(RCTPointerEvents pointerEvents)
+{
+  switch (pointerEvents) {
+    case RCTPointerEventsNone:
+      return RNGestureHandlerPointerEventsNone;
+    case RCTPointerEventsBoxNone:
+      return RNGestureHandlerPointerEventsBoxNone;
+    case RCTPointerEventsBoxOnly:
+      return RNGestureHandlerPointerEventsBoxOnly;
+    default:
+      return RNGestureHandlerPointerEventsAuto;
+  }
+}
+
 @implementation RNGestureHandlerButtonManager
 
 RCT_EXPORT_MODULE(RNGestureHandlerButton)
@@ -28,6 +42,16 @@ RCT_CUSTOM_VIEW_PROPERTY(hitSlop, UIEdgeInsets, RNGestureHandlerButton)
   }
 }
 
+RCT_CUSTOM_VIEW_PROPERTY(pointerEvents, RCTPointerEvents, RNGestureHandlerButton)
+{
+  if (json) {
+    RCTPointerEvents pointerEvents = [RCTConvert RCTPointerEvents:json];
+    view.pointerEvents = RCTPointerEventsToEnum(pointerEvents);
+  } else {
+    view.pointerEvents = RNGestureHandlerPointerEventsAuto;
+  }
+}
+
 - (RNGHUIView *)view
 {
   return (RNGHUIView *)[RNGestureHandlerButton new];

package/apple/RNGestureHandlerPointerEvents.h

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+
+typedef NS_ENUM(NSInteger, RNGestureHandlerPointerEvents) {
+  RNGestureHandlerPointerEventsNone,
+  RNGestureHandlerPointerEventsBoxNone,
+  RNGestureHandlerPointerEventsBoxOnly,
+  RNGestureHandlerPointerEventsAuto
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gesture-handler",
-  "version": "2.30.0",
+  "version": "2.31.0-nightly-20260121-59a5311e3",
   "description": "Declarative API exposing native platform touch and gesture system to React Native",
   "scripts": {
     "test": "jest",