Pass moduleId to the button

Author: j-piasecki

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

@@ -152,6 +152,11 @@ class RNGestureHandlerButtonViewManager :
     view.hasLongPressHandler = hasLongPressHandler
   }
 
+  // No-op — only iOS needs the module id to resolve the handler manager, Android
+  // gets the module from the view's context.
+  @ReactProp(name = "moduleId")
+  override fun setModuleId(view: ButtonViewGroup, moduleId: Int) = Unit
+
   @ReactProp(name = "foreground")
   override fun setForeground(view: ButtonViewGroup, useDrawableOnForeground: Boolean) {
     view.useDrawableOnForeground = useDrawableOnForeground

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

@@ -35,6 +35,7 @@ @interface RNGestureHandlerButtonComponentView () <RCTRNGestureHandlerButtonView
 @implementation RNGestureHandlerButtonComponentView {
   RNGestureHandlerButton *_buttonView;
   BOOL _needsAnimationStateReset;
+  int _moduleId;
 }
 
 #if TARGET_OS_OSX
@@ -59,6 +60,7 @@ - (instancetype)initWithFrame:(CGRect)frame
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const RNGestureHandlerButtonProps>();
     _props = defaultProps;
+    _moduleId = -1;
     _buttonView = [[RNGestureHandlerButton alloc] initWithFrame:self.bounds];
     _buttonView.animationTarget = self;
 
@@ -367,6 +369,7 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
         oldButtonProps.defaultUnderlayOpacity != newProps.defaultUnderlayOpacity;
   }
 
+  _moduleId = newProps.moduleId;
   _buttonView.userEnabled = newProps.enabled;
   _buttonView.tapAnimationInDuration = newProps.tapAnimationInDuration > 0 ? newProps.tapAnimationInDuration : 0;
   _buttonView.tapAnimationOutDuration = newProps.tapAnimationOutDuration > 0 ? newProps.tapAnimationOutDuration : 0;

packages/react-native-gesture-handler/src/components/GestureHandlerButton.tsx

@@ -22,6 +22,7 @@ export interface ButtonProps extends ViewProps, AccessibilityProps {
   enabled?: boolean | undefined;
 
   hasLongPressHandler?: boolean | undefined;
+  moduleId?: number | undefined;
   handlerTag?: number | undefined;
   cancelOnLeave?: boolean | undefined;
   gestureTestID?: string | undefined;

packages/react-native-gesture-handler/src/specs/RNGestureHandlerButtonNativeComponent.ts

@@ -27,6 +27,10 @@ interface NativeProps extends ViewProps {
     | undefined;
 
   hasLongPressHandler?: CodegenTypes.WithDefault<boolean, false>;
+  // Used on iOS to resolve the gesture handler module instance managing the
+  // handler created for `handlerTag`. Android resolves the module from the
+  // view's context instead.
+  moduleId?: CodegenTypes.WithDefault<CodegenTypes.Int32, -1>;
   handlerTag?: CodegenTypes.Double | undefined;
   cancelOnLeave?: CodegenTypes.WithDefault<boolean, true>;
   gestureTestID?: string;

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

@@ -179,6 +179,7 @@ export const Touchable = (props: TouchableProps) => {
       {...resolvedDurations}
       ref={ref ?? null}
       enabled={!disabled}
+      moduleId={globalThis._RNGH_MODULE_ID}
       handlerTag={handlerTag}
       cancelOnLeave={cancelOnLeave}
       gestureTestID={props.testID}