Fix buttons in a hacky way to work with the new detector

Author: j-piasecki

apps/basic-example/ios/Podfile.lock

@@ -2919,7 +2919,7 @@ SPEC CHECKSUMS:
   FBLazyVector: a293a88992c4c33f0aee184acab0b64a08ff9458
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
   glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
-  hermes-engine: db854ab6e74b584dc130d3ed0be3425726bac226
+  hermes-engine: eec912f8a125ae0d3ad67b2e7b81a227319aa13b
   RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
   RCTDeprecation: 2b70c6e3abe00396cefd8913efbf6a2db01a2b36
   RCTRequired: f3540eee8094231581d40c5c6d41b0f170237a81
@@ -2993,7 +2993,7 @@ SPEC CHECKSUMS:
   RNReanimated: 987d0b9af435441cc2ebc2a32ad06cafe8777d4e
   RNWorklets: 12b2d7cdcb48acbdd0b324d1fa810f849089bd7b
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
-  Yoga: 6ca93c8c13f56baeec55eb608577619b17a4d64e
+  Yoga: 7a9f26c70daf0b08d82ec2f862e9a8872442129e
 
 PODFILE CHECKSUM: ecce038d8e4749ee17b7dea28be0590cdc8b4836
 

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

@@ -2,6 +2,8 @@ package com.swmansion.gesturehandler.react
 
 import android.content.Context
 import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isNotEmpty
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
@@ -160,6 +162,14 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
     // Note: RefreshControl is wrapped with a VirtualDetector, and native gestures for it are attached in `attachVirtualChildren`.
     val id = if (child is ReactSwipeRefreshLayout) {
       child.getChildAt(0).id
+      // TODO: figure out how to do it correctly
+    } else if (child is ViewGroup && child.isNotEmpty()) {
+      val grandChild = child.getChildAt(0)
+      if (grandChild is RNGestureHandlerButtonViewManager.ButtonViewGroup) {
+        grandChild.id
+      } else {
+        child.id
+      }
     } else {
       child.id
     }

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

@@ -9,6 +9,7 @@
 #import <react/renderer/components/rngesturehandler_codegen/Props.h>
 #import <react/renderer/components/rngesturehandler_codegen/RCTComponentViewHelpers.h>
 
+#import <React/RCTScrollViewComponentView.h>
 #include <unordered_map>
 
 @interface RNGestureHandlerDetector () <RCTRNGestureHandlerDetectorViewProtocol>
@@ -295,10 +296,19 @@ - (void)tryAttachNativeHandlersToChildView
 
   RNGHUIView *view = self.subviews[0];
 
-  if ([view isKindOfClass:[RCTViewComponentView class]]) {
+  // TODO: figure out how to do it correctly
+  if ([view isKindOfClass:[RCTViewComponentView class]] && ![view isKindOfClass:[RCTScrollViewComponentView class]]) {
     RCTViewComponentView *componentView = (RCTViewComponentView *)view;
     if (componentView.contentView != nil) {
       view = componentView.contentView;
+    } else if (componentView.subviews.count > 0) {
+      view = componentView.subviews[0];
+      if ([view isKindOfClass:[RCTViewComponentView class]]) {
+        RCTViewComponentView *componentView = (RCTViewComponentView *)view;
+        if (componentView.contentView != nil) {
+          view = componentView.contentView;
+        }
+      }
     }
   }