Always assign hostDetectorView

Author: m-bert

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

@@ -16,7 +16,6 @@ import com.facebook.react.bridge.ReadableType
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.uimanager.PixelUtil
-import com.facebook.react.views.swiperefresh.ReactSwipeRefreshLayout
 import com.swmansion.gesturehandler.BuildConfig
 import com.swmansion.gesturehandler.RNSVGHitTester
 import com.swmansion.gesturehandler.react.RNGestureHandlerDetectorView
@@ -37,36 +36,6 @@ open class GestureHandler {
   // Virtual Detector to which the gesture is assigned.
   var hostDetectorView: RNGestureHandlerDetectorView? = null
 
-  val viewForEvents: RNGestureHandlerDetectorView
-    get() {
-      assert(usesNativeOrVirtualDetector(actionType)) {
-        "[react-native-gesture-handler] `viewForEvents` can only be used with NativeDetector."
-      }
-
-      val detector = if (actionType ==
-        ACTION_TYPE_VIRTUAL_DETECTOR
-      ) {
-        this.hostDetectorView
-      } else if (this is NativeViewGestureHandler) {
-        val parent = this.view?.parent
-
-        if (parent is ReactSwipeRefreshLayout) {
-          parent.parent
-        } else {
-          parent
-        }
-      } else {
-        view
-      }
-
-      if (detector !is RNGestureHandlerDetectorView) {
-        throw Error(
-          "[react-native-gesture-handler] Expected RNGestureHandlerDetectorView to be the target for the event.",
-        )
-      }
-
-      return detector
-    }
   var state = STATE_UNDETERMINED
     private set
   var x = 0f

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

@@ -96,7 +96,7 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
           // attach `NativeViewGestureHandlers` here and we have to do it in `addView` method.
           nativeHandlers.add(tag)
         } else {
-          registry.attachHandlerToView(tag, viewTag, actionType)
+          registry.attachHandlerToView(tag, viewTag, actionType, this)
           if (actionType == GestureHandler.ACTION_TYPE_VIRTUAL_DETECTOR) {
             registry.getHandler(tag)?.hostDetectorView = this
           }
@@ -161,7 +161,7 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
     }
 
     for (tag in nativeHandlers) {
-      registry.attachHandlerToView(tag, id, GestureHandler.ACTION_TYPE_NATIVE_DETECTOR)
+      registry.attachHandlerToView(tag, id, GestureHandler.ACTION_TYPE_NATIVE_DETECTOR, this)
 
       attachedHandlers.add(tag)
     }

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

@@ -21,11 +21,17 @@ class RNGestureHandlerRegistry : GestureHandlerRegistry {
   fun getHandler(handlerTag: Int): GestureHandler? = handlers[handlerTag]
 
   @Synchronized
-  fun attachHandlerToView(handlerTag: Int, viewTag: Int, actionType: Int): Boolean {
+  fun attachHandlerToView(
+    handlerTag: Int,
+    viewTag: Int,
+    actionType: Int,
+    hostDetectorView: RNGestureHandlerDetectorView? = null,
+  ): Boolean {
     val handler = handlers[handlerTag]
     return handler?.let {
       detachHandlerInternal(handler)
       handler.actionType = actionType
+      handler.hostDetectorView = hostDetectorView
       registerHandlerForViewWithTag(viewTag, handler)
       true
     } ?: false

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

@@ -21,7 +21,7 @@ class RNGestureHandlerEvent private constructor() : Event<RNGestureHandlerEvent>
     eventHandlerType: EventHandlerType,
   ) {
     val view = if (GestureHandler.usesNativeOrVirtualDetector(handler.actionType)) {
-      handler.viewForEvents
+      handler.hostDetectorView!!
     } else {
       handler.view!!
     }

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

@@ -87,7 +87,7 @@ class RNGestureHandlerEventDispatcher(private val reactApplicationContext: React
           eventHandlerType,
         )
 
-        handler.viewForEvents.dispatchEvent(event)
+        handler.hostDetectorView?.dispatchEvent(event)
       }
     }
   }
@@ -152,7 +152,7 @@ class RNGestureHandlerEventDispatcher(private val reactApplicationContext: React
           eventHandlerType,
         )
 
-        handler.viewForEvents.dispatchEvent(event)
+        handler.hostDetectorView?.dispatchEvent(event)
       }
     }
   }
@@ -196,7 +196,7 @@ class RNGestureHandlerEventDispatcher(private val reactApplicationContext: React
         }
         val event = RNGestureHandlerTouchEvent.obtain(handler, handler.actionType, eventHandlerType)
 
-        handler.viewForEvents.dispatchEvent(event)
+        handler.hostDetectorView?.dispatchEvent(event)
       }
     }
   }

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

@@ -24,7 +24,7 @@ class RNGestureHandlerStateChangeEvent private constructor() : Event<RNGestureHa
     eventHandlerType: EventHandlerType,
   ) {
     val view = if (GestureHandler.usesNativeOrVirtualDetector(handler.actionType)) {
-      handler.viewForEvents
+      handler.hostDetectorView!!
     } else {
       handler.view!!
     }

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

@@ -15,7 +15,7 @@ class RNGestureHandlerTouchEvent private constructor() : Event<RNGestureHandlerT
 
   private fun <T : GestureHandler> init(handler: T, actionType: Int, eventHandlerType: EventHandlerType) {
     val view = if (GestureHandler.usesNativeOrVirtualDetector(handler.actionType)) {
-      handler.viewForEvents
+      handler.hostDetectorView!!
     } else {
       handler.view!!
     }