[Android] Properly handle requestDisallowInterceptTouchEvent for v3

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

@@ -52,7 +52,8 @@ class GestureHandlerOrchestrator(
   // `contains` method on HashSet has O(1) complexity, so calling it inside for loop won't result in O(n^2) (contrary to ArrayList)
   private val awaitingHandlersTags = HashSet<Int>()
 
-  private var isHandlingTouch = false
+  var isHandlingTouch = false
+    private set
   private var handlingChangeSemaphore = 0
   private var finishedHandlersCleanupScheduled = false
   private var activationIndex = 0
@@ -358,6 +359,30 @@ class GestureHandlerOrchestrator(
     event.recycle()
   }
 
+  /**
+   * Cancels all handlers created using API v1 and v2
+   */
+  fun cancelAllLegacyHandlers() {
+    val handlersToProcess = obtainHandlerList()
+    handlersToProcess.addAll(gestureHandlers)
+
+    try {
+      handlersToProcess.forEach {
+        if (it.actionType == GestureHandler.ACTION_TYPE_JS_FUNCTION_OLD_API ||
+          it.actionType == GestureHandler.ACTION_TYPE_JS_FUNCTION_NEW_API ||
+          it.actionType == GestureHandler.ACTION_TYPE_REANIMATED_WORKLET ||
+          it.actionType == GestureHandler.ACTION_TYPE_NATIVE_ANIMATED_EVENT
+        ) {
+          it.cancel()
+        }
+      }
+
+      scheduleFinishedHandlersCleanup()
+    } finally {
+      recycleHandlerList(handlersToProcess)
+    }
+  }
+
   /**
    * isViewAttachedUnderWrapper checks whether all of parents for view related to handler
    * view are attached. Since there might be an issue rarely observed when view

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

@@ -783,6 +783,24 @@ class RNGestureHandlerButtonViewManager :
       }
     }
 
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
+      super.requestDisallowInterceptTouchEvent(disallowIntercept)
+      if (!disallowIntercept) {
+        return
+      }
+
+      val moduleId = moduleId ?: return
+      val managedHandlerTag = managedHandlerTag ?: return
+
+      val orchestrator =
+        RNGestureHandlerRootView.findGestureHandlerRootView(this)?.orchestrator ?: return
+      val handler = RNGestureHandlerModule.registries[moduleId]?.getHandler(managedHandlerTag) ?: return
+
+      if (!orchestrator.isHandlingTouch && handler.view != null) {
+        handler.cancel()
+      }
+    }
+
     override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
       if (super.onInterceptTouchEvent(event)) {
         return true

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

@@ -46,6 +46,28 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
     super.onDetachedFromWindow()
   }
 
+  override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
+    super.requestDisallowInterceptTouchEvent(disallowIntercept)
+    if (!disallowIntercept) {
+      return
+    }
+
+    val orchestrator = RNGestureHandlerRootView.findGestureHandlerRootView(this)?.orchestrator ?: return
+
+    if (!orchestrator.isHandlingTouch) {
+      val currentHandlers = attachedHandlers.mapNotNull { tag ->
+        RNGestureHandlerModule.registries[this.moduleId]?.getHandler(tag)
+      }.filter {
+        // The handler has been recorded
+        it.view != null
+      }
+
+      currentHandlers.forEach {
+        it.cancel()
+      }
+    }
+  }
+
   fun setModuleId(id: Int) {
     if (this.moduleId == id) {
       return

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

@@ -16,7 +16,7 @@ import com.swmansion.gesturehandler.core.GestureHandlerOrchestrator
 import com.swmansion.gesturehandler.core.OnJSResponderCancelListener
 
 class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView: ViewGroup, private val moduleId: Int) {
-  private val orchestrator: GestureHandlerOrchestrator?
+  val orchestrator: GestureHandlerOrchestrator?
   private val jsGestureHandler: GestureHandler?
   val rootView: ViewGroup
   private var shouldIntercept = false
@@ -57,7 +57,7 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
     }
     jsGestureHandler = RootViewGestureHandler(handlerTag = -wrappedViewTag)
     registry.registerHandler(jsGestureHandler)
-    registry.attachHandlerToView(jsGestureHandler.tag, wrappedViewTag, GestureHandler.ACTION_TYPE_JS_FUNCTION_OLD_API)
+    registry.attachHandlerToView(jsGestureHandler.tag, wrappedViewTag, GestureHandler.ACTION_TYPE_NONE)
     module.registerRootHelper(this)
   }
 
@@ -120,7 +120,7 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
     if (orchestrator != null && !passingTouch) {
       // if we are in the process of delivering touch events via GH orchestrator, we don't want to
       // treat it as a native gesture capturing the lock
-      tryCancelAllHandlers()
+      orchestrator.cancelAllLegacyHandlers()
     }
   }
 
@@ -142,17 +142,6 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
     return shouldIntercept
   }
 
-  private fun tryCancelAllHandlers() {
-    // In order to cancel handlers we activate handler that is hooked to the root view
-    jsGestureHandler?.apply {
-      if (state == GestureHandler.STATE_BEGAN) {
-        // Try activate main JS handler
-        activate()
-        end()
-      }
-    }
-  }
-
   fun activateNativeHandlers(view: View) {
     orchestrator?.activateNativeHandlersForView(view)
   }

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

@@ -12,13 +12,17 @@ import com.facebook.react.common.ReactConstants
 import com.facebook.react.uimanager.RootView
 import com.facebook.react.views.view.ReactViewGroup
 import com.swmansion.gesturehandler.core.GestureHandler
+import com.swmansion.gesturehandler.core.GestureHandlerOrchestrator
 
 class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
   private var moduleId: Int = -1
   private var rootViewEnabled = false
   private var unstableForceActive = false
   private var rootHelper: RNGestureHandlerRootHelper? = null // TODO: resettable lateinit
 
+  val orchestrator: GestureHandlerOrchestrator?
+    get() = rootHelper?.orchestrator
+
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
     rootViewEnabled = unstableForceActive || !hasGestureHandlerEnabledRootView(this)
@@ -72,7 +76,7 @@ class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
   }
 
   override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
-    if (rootViewEnabled) {
+    if (rootViewEnabled && disallowIntercept) {
       rootHelper!!.requestDisallowInterceptTouchEvent()
     }
     super.requestDisallowInterceptTouchEvent(disallowIntercept)
@@ -114,6 +118,10 @@ class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
       while (parent != null) {
         if (parent is RNGestureHandlerRootView) {
           gestureHandlerRootView = parent
+
+          if (parent.rootViewEnabled) {
+            return parent
+          }
         }
         parent = parent.parent
       }