pass onJSResponderCancelListener to the orchestrator, move shouldIntercept to onCancell

Author: coado

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

@@ -19,6 +19,7 @@ class GestureHandlerOrchestrator(
   private val handlerRegistry: GestureHandlerRegistry,
   private val viewConfigHelper: ViewConfigurationHelper,
   private val rootView: ViewGroup,
+  private val onJSResponderCancelListener: OnJSResponderCancelListener? = null,
 ) {
   /**
    * Minimum alpha (value from 0 to 1) that should be set to a view so that it can be treated as a
@@ -42,9 +43,6 @@ class GestureHandlerOrchestrator(
   private var finishedHandlersCleanupScheduled = false
   private var activationIndex = 0
 
-  var onCancelJSResponderRequested: ((GestureHandler) -> Unit)? = null
-  var onCancelJSResponderReleased: ((GestureHandler) -> Unit)? = null
-
   /**
    * Should be called from the view wrapper
    */
@@ -150,7 +148,7 @@ class GestureHandlerOrchestrator(
     if (isFinished(newState) && handler.isActive && handler.cancelsJSResponder) {
       // Check if there are any other active handlers that still request the JS responder to be cancelled.
       if (gestureHandlers.none { it !== handler && it.isActive && it.cancelsJSResponder }) {
-        onCancelJSResponderReleased?.invoke(handler)
+        onJSResponderCancelListener?.onCancelJSResponderReleased(handler)
       }
     }
 
@@ -253,7 +251,7 @@ class GestureHandlerOrchestrator(
     }
 
     if (handler.cancelsJSResponder) {
-      onCancelJSResponderRequested?.invoke(handler)
+      onJSResponderCancelListener?.onCancelJSResponderRequested(handler)
     }
 
     handler.dispatchStateChange(GestureHandler.STATE_ACTIVE, GestureHandler.STATE_BEGAN)

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

@@ -0,0 +1,6 @@
+package com.swmansion.gesturehandler.core
+
+interface OnJSResponderCancelListener {
+  fun onCancelJSResponderRequested(handler: GestureHandler)
+  fun onCancelJSResponderReleased(handler: GestureHandler)
+}

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

@@ -13,6 +13,7 @@ import com.facebook.react.uimanager.RootView
 import com.facebook.react.uimanager.ThemedReactContext
 import com.swmansion.gesturehandler.core.GestureHandler
 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?
@@ -34,26 +35,29 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
       ReactConstants.TAG,
       "[GESTURE HANDLER] Initialize gesture handler for root view $rootView",
     )
-    orchestrator = GestureHandlerOrchestrator(
-      wrappedView,
-      registry,
-      RNViewConfigurationHelper(),
-      rootView,
-    ).apply {
-      minimumAlphaForTraversal = MIN_ALPHA_FOR_TOUCH
-      onCancelJSResponderRequested = { _ ->
-        shouldIntercept = true
+    val onJSResponderCancelListener = object : OnJSResponderCancelListener {
+      override fun onCancelJSResponderRequested(handler: GestureHandler) {
         val time = SystemClock.uptimeMillis()
         val event = MotionEvent.obtain(time, time, MotionEvent.ACTION_CANCEL, 0f, 0f, 0)
         if (rootView is RootView) {
           rootView.onChildStartedNativeGesture(rootView, event)
         }
         event.recycle()
       }
-      onCancelJSResponderReleased = { _ ->
+
+      override fun onCancelJSResponderReleased(handler: GestureHandler) {
         shouldIntercept = false
       }
     }
+    orchestrator = GestureHandlerOrchestrator(
+      wrappedView,
+      registry,
+      RNViewConfigurationHelper(),
+      rootView,
+      onJSResponderCancelListener,
+    ).apply {
+      minimumAlphaForTraversal = MIN_ALPHA_FOR_TOUCH
+    }
     jsGestureHandler = RootViewGestureHandler(handlerTag = -wrappedViewTag)
     registry.registerHandler(jsGestureHandler)
     registry.attachHandlerToView(jsGestureHandler.tag, wrappedViewTag, GestureHandler.ACTION_TYPE_JS_FUNCTION_OLD_API)
@@ -104,6 +108,10 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
     override fun onHandle(event: MotionEvent, sourceEvent: MotionEvent) = handleEvent(event)
 
     override fun onHandleHover(event: MotionEvent, sourceEvent: MotionEvent) = handleEvent(event)
+
+    override fun onCancel() {
+      shouldIntercept = true
+    }
   }
 
   fun requestDisallowInterceptTouchEvent() {