react-native-gesture-handler 2.30.0 → 2.31.0-nightly-20260122-b776a8137

package/android/paper/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerDelegate.java

@@ -54,6 +54,9 @@ public class RNGestureHandlerButtonManagerDelegate<T extends View, U extends Bas
       case "borderStyle":
         mViewManager.setBorderStyle(view, value == null ? "solid" : (String) value);
         break;
+      case "pointerEvents":
+        mViewManager.setPointerEvents(view, (String) value);
+        break;
       default:
         super.setProperty(view, propName, value);
     }

package/android/paper/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerInterface.java

@@ -24,4 +24,5 @@ public interface RNGestureHandlerButtonManagerInterface<T extends View> extends
   void setBorderWidth(T view, float value);
   void setBorderColor(T view, @Nullable Integer value);
   void setBorderStyle(T view, @Nullable String value);
+  void setPointerEvents(T view, @Nullable String value);
 }

package/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerButtonViewManager.kt

@@ -27,6 +27,8 @@ import androidx.core.view.children
 import com.facebook.react.R
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.PixelUtil
+import com.facebook.react.uimanager.PointerEvents
+import com.facebook.react.uimanager.ReactPointerEventsView
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
@@ -132,6 +134,17 @@ class RNGestureHandlerButtonViewManager :
     view.isSoundEffectsEnabled = !touchSoundDisabled
   }
 
+  @ReactProp(name = ViewProps.POINTER_EVENTS)
+  override fun setPointerEvents(view: ButtonViewGroup, pointerEvents: String?) {
+    view.pointerEvents = when (pointerEvents) {
+      "none" -> PointerEvents.NONE
+      "box-none" -> PointerEvents.BOX_NONE
+      "box-only" -> PointerEvents.BOX_ONLY
+      "auto", null -> PointerEvents.AUTO
+      else -> PointerEvents.AUTO
+    }
+  }
+
   override fun onAfterUpdateTransaction(view: ButtonViewGroup) {
     super.onAfterUpdateTransaction(view)
 
@@ -142,7 +155,8 @@ class RNGestureHandlerButtonViewManager :
 
   class ButtonViewGroup(context: Context?) :
     ViewGroup(context),
-    NativeViewGestureHandler.NativeViewGestureHandlerHook {
+    NativeViewGestureHandler.NativeViewGestureHandlerHook,
+    ReactPointerEventsView {
     // Using object because of handling null representing no value set.
     var rippleColor: Int? = null
       set(color) = withBackgroundUpdate {
@@ -200,6 +214,8 @@ class RNGestureHandlerButtonViewManager :
 
     var exclusive = true
 
+    override var pointerEvents: PointerEvents = PointerEvents.AUTO
+
     private var buttonBackgroundColor = Color.TRANSPARENT
     private var needBackgroundUpdate = false
     private var lastEventTime = -1L

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,40 @@ using namespace facebook::react;
   _buttonView.hitTestEdgeInsets = UIEdgeInsetsMake(
       -newProps.hitSlop.top, -newProps.hitSlop.left, -newProps.hitSlop.bottom, -newProps.hitSlop.right);
 
+  // We need to cast to ViewProps to access the pointerEvents property with the correct type.
+  // This is necessary because pointerEvents is redefined in the spec,
+  // which shadows the base property with a different, incompatible type.
+  const auto &newViewProps = static_cast<const ViewProps &>(newProps);
+  if (!oldProps) {
+    _buttonView.pointerEvents = RCTPointerEventsToEnum(newViewProps.pointerEvents);
+  } else {
+    const auto &oldButtonProps = *std::static_pointer_cast<const RNGestureHandlerButtonProps>(oldProps);
+    const auto &oldViewProps = static_cast<const ViewProps &>(oldButtonProps);
+    if (oldViewProps.pointerEvents != newViewProps.pointerEvents) {
+      _buttonView.pointerEvents = RCTPointerEventsToEnum(newViewProps.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/lib/commonjs/specs/RNGestureHandlerButtonNativeComponent.ts

@@ -6,6 +6,7 @@ import type {
 } from 'react-native/Libraries/Types/CodegenTypes';
 import type { ViewProps, ColorValue } from 'react-native';
 
+// @ts-ignore - Redefining pointerEvents with WithDefault for codegen, conflicts with ViewProps type but codegen needs it
 interface NativeProps extends ViewProps {
   exclusive?: WithDefault<boolean, true>;
   foreground?: boolean;
@@ -17,6 +18,10 @@ interface NativeProps extends ViewProps {
   borderWidth?: Float;
   borderColor?: ColorValue;
   borderStyle?: WithDefault<string, 'solid'>;
+  pointerEvents?: WithDefault<
+    'box-none' | 'none' | 'box-only' | 'auto',
+    'auto'
+  >;
 }
 
 export default codegenNativeComponent<NativeProps>('RNGestureHandlerButton');

package/lib/module/specs/RNGestureHandlerButtonNativeComponent.ts

@@ -6,6 +6,7 @@ import type {
 } from 'react-native/Libraries/Types/CodegenTypes';
 import type { ViewProps, ColorValue } from 'react-native';
 
+// @ts-ignore - Redefining pointerEvents with WithDefault for codegen, conflicts with ViewProps type but codegen needs it
 interface NativeProps extends ViewProps {
   exclusive?: WithDefault<boolean, true>;
   foreground?: boolean;
@@ -17,6 +18,10 @@ interface NativeProps extends ViewProps {
   borderWidth?: Float;
   borderColor?: ColorValue;
   borderStyle?: WithDefault<string, 'solid'>;
+  pointerEvents?: WithDefault<
+    'box-none' | 'none' | 'box-only' | 'auto',
+    'auto'
+  >;
 }
 
 export default codegenNativeComponent<NativeProps>('RNGestureHandlerButton');

package/lib/typescript/specs/RNGestureHandlerButtonNativeComponent.d.ts

@@ -11,6 +11,7 @@ interface NativeProps extends ViewProps {
     borderWidth?: Float;
     borderColor?: ColorValue;
     borderStyle?: WithDefault<string, 'solid'>;
+    pointerEvents?: WithDefault<'box-none' | 'none' | 'box-only' | 'auto', 'auto'>;
 }
 declare const _default: import("react-native/Libraries/Utilities/codegenNativeComponent").NativeComponentType<NativeProps>;
 export default _default;

package/lib/typescript/specs/RNGestureHandlerButtonNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RNGestureHandlerButtonNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/specs/RNGestureHandlerButtonNativeComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,KAAK,EACL,WAAW,EACX,KAAK,EACN,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1D,UAAU,WAAY,SAAQ,SAAS;IACrC,SAAS,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrC,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,kBAAkB,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,WAAW,CAAC,EAAE,KAAK,CAAC;IACpB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C;;AAED,wBAA6E"}
+{"version":3,"file":"RNGestureHandlerButtonNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/specs/RNGestureHandlerButtonNativeComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,KAAK,EACL,WAAW,EACX,KAAK,EACN,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1D,UAAU,WAAY,SAAQ,SAAS;IACrC,SAAS,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrC,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,kBAAkB,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,WAAW,CAAC,EAAE,KAAK,CAAC;IACpB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,WAAW,CACzB,UAAU,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,EACzC,MAAM,CACP,CAAC;CACH;;AAED,wBAA6E"}

package/package.json

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

package/src/specs/RNGestureHandlerButtonNativeComponent.ts

@@ -6,6 +6,7 @@ import type {
 } from 'react-native/Libraries/Types/CodegenTypes';
 import type { ViewProps, ColorValue } from 'react-native';
 
+// @ts-ignore - Redefining pointerEvents with WithDefault for codegen, conflicts with ViewProps type but codegen needs it
 interface NativeProps extends ViewProps {
   exclusive?: WithDefault<boolean, true>;
   foreground?: boolean;
@@ -17,6 +18,10 @@ interface NativeProps extends ViewProps {
   borderWidth?: Float;
   borderColor?: ColorValue;
   borderStyle?: WithDefault<string, 'solid'>;
+  pointerEvents?: WithDefault<
+    'box-none' | 'none' | 'box-only' | 'auto',
+    'auto'
+  >;
 }
 
 export default codegenNativeComponent<NativeProps>('RNGestureHandlerButton');