New viewForEvents

Author: m-bert

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

@@ -36,6 +36,15 @@ open class GestureHandler {
   // Virtual Detector to which the gesture is assigned.
   var hostDetectorView: RNGestureHandlerDetectorView? = null
 
+  val viewForEvents: View
+    get() {
+      return if (usesNativeOrVirtualDetector(actionType)) {
+        hostDetectorView!!
+      } else {
+        view!!
+      }
+    }
+
   var state = STATE_UNDETERMINED
     private set
   var x = 0f

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

@@ -20,11 +20,7 @@ class RNGestureHandlerEvent private constructor() : Event<RNGestureHandlerEvent>
     dataBuilder: GestureHandlerEventDataBuilder<T>,
     eventHandlerType: EventHandlerType,
   ) {
-    val view = if (GestureHandler.usesNativeOrVirtualDetector(handler.actionType)) {
-      handler.hostDetectorView!!
-    } else {
-      handler.view!!
-    }
+    val view = handler.viewForEvents
 
     super.init(UIManagerHelper.getSurfaceId(view), view.id)
 

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

@@ -23,11 +23,7 @@ class RNGestureHandlerStateChangeEvent private constructor() : Event<RNGestureHa
     dataBuilder: GestureHandlerEventDataBuilder<T>,
     eventHandlerType: EventHandlerType,
   ) {
-    val view = if (GestureHandler.usesNativeOrVirtualDetector(handler.actionType)) {
-      handler.hostDetectorView!!
-    } else {
-      handler.view!!
-    }
+    val view = handler.viewForEvents
 
     super.init(UIManagerHelper.getSurfaceId(view), view.id)
 

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

@@ -14,12 +14,7 @@ class RNGestureHandlerTouchEvent private constructor() : Event<RNGestureHandlerT
   private lateinit var eventHandlerType: EventHandlerType
 
   private fun <T : GestureHandler> init(handler: T, actionType: Int, eventHandlerType: EventHandlerType) {
-    val view = if (GestureHandler.usesNativeOrVirtualDetector(handler.actionType)) {
-      handler.hostDetectorView!!
-    } else {
-      handler.view!!
-    }
-
+    val view = handler.viewForEvents
     super.init(UIManagerHelper.getSurfaceId(view), view.id)
 
     extraData = createEventData(handler)