Merge branch 'next' into @mbert/docs-state-manager

Author: m-bert

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

@@ -9,6 +9,7 @@ import android.view.MotionEvent
 import android.view.MotionEvent.PointerCoords
 import android.view.MotionEvent.PointerProperties
 import android.view.View
+import androidx.core.view.isNotEmpty
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReadableMap
@@ -384,18 +385,37 @@ open class GestureHandler {
       }
     }
 
-    x = adaptedTransformedEvent.x
-    y = adaptedTransformedEvent.y
     numberOfPointers = adaptedTransformedEvent.pointerCount
-    isWithinBounds = isWithinBounds(view, x, y)
-    if (shouldCancelWhenOutside && !isWithinBounds) {
-      if (state == STATE_ACTIVE) {
-        cancel()
-      } else if (state == STATE_BEGAN) {
+
+    // TODO: this is likely wrong, and the transformed event itself should be
+    // in the coordinate system of the child view, but I'm not sure of the
+    // consequences
+    if (view is RNGestureHandlerDetectorView && (view as RNGestureHandlerDetectorView).isNotEmpty()) {
+      val detector = view as RNGestureHandlerDetectorView
+      val outPoint = PointF()
+      GestureHandlerOrchestrator.transformPointToChildViewCoords(
+        adaptedTransformedEvent.x,
+        adaptedTransformedEvent.y,
+        detector,
+        detector.getChildAt(0),
+        outPoint,
+      )
+      x = outPoint.x
+      y = outPoint.y
+      isWithinBounds = isWithinBounds(detector.getChildAt(0), x, y)
+    } else {
+      x = adaptedTransformedEvent.x
+      y = adaptedTransformedEvent.y
+      isWithinBounds = isWithinBounds(view, x, y)
+    }
+
+    if (shouldCancelWhenOutside) {
+      if (!isWithinBounds && (state == STATE_ACTIVE || state == STATE_BEGAN)) {
         fail()
+        return
       }
-      return
     }
+
     lastAbsolutePositionX = GestureUtils.getLastPointerX(adaptedTransformedEvent, true)
     lastAbsolutePositionY = GestureUtils.getLastPointerY(adaptedTransformedEvent, true)
     lastEventOffsetX = adaptedTransformedEvent.rawX - adaptedTransformedEvent.x
@@ -595,6 +615,16 @@ open class GestureHandler {
       // generated faster than they can be treated by JS thread
       eventCoalescingKey = nextEventCoalescingKey++
     }
+
+    check(hostDetectorView != null || orchestrator != null) {
+      "Manually handled gesture had not been assigned to any detector"
+    }
+
+    if (orchestrator == null) {
+      // If the state is set manually, the handler may not have been fully recorded by the orchestrator.
+      hostDetectorView?.recordHandlerIfNotPresent(this)
+    }
+
     orchestrator!!.onHandlerStateChange(this, newState, oldState)
     onStateChange(newState, oldState)
   }
@@ -753,6 +783,10 @@ open class GestureHandler {
   protected open fun onCancel() {}
   protected open fun onFail() {}
 
+  fun recordHandlerIfNotPresent() {
+    hostDetectorView?.recordHandlerIfNotPresent(this)
+  }
+
   private fun isButtonInConfig(clickedButton: Int): Boolean {
     if (mouseButton == 0) {
       return clickedButton == MotionEvent.BUTTON_PRIMARY

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

@@ -442,7 +442,7 @@ class GestureHandlerOrchestrator(
     }
   }
 
-  private fun recordHandlerIfNotPresent(handler: GestureHandler, view: View) {
+  fun recordHandlerIfNotPresent(handler: GestureHandler, view: View?) {
     if (gestureHandlers.contains(handler)) {
       return
     }
@@ -750,13 +750,7 @@ class GestureHandlerOrchestrator(
       return isLeafOrTransparent && isTransformedTouchPointInView(coords[0], coords[1], view)
     }
 
-    private fun transformPointToChildViewCoords(
-      x: Float,
-      y: Float,
-      parent: ViewGroup,
-      child: View,
-      outLocalPoint: PointF,
-    ) {
+    fun transformPointToChildViewCoords(x: Float, y: Float, parent: ViewGroup, child: View, outLocalPoint: PointF) {
       var localX = x + parent.scrollX - child.left
       var localY = y + parent.scrollY - child.top
       val matrix = child.matrix

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

@@ -21,12 +21,13 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.View.OnClickListener
 import android.view.ViewGroup
-import android.view.ViewParent
 import android.view.accessibility.AccessibilityNodeInfo
 import androidx.core.view.children
 import com.facebook.react.R
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.PixelUtil
+import com.facebook.react.uimanager.PointerEvents
+import com.facebook.react.uimanager.ReactPointerEventsView
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
@@ -132,6 +133,17 @@ class RNGestureHandlerButtonViewManager :
     view.isSoundEffectsEnabled = !touchSoundDisabled
   }
 
+  @ReactProp(name = ViewProps.POINTER_EVENTS)
+  override fun setPointerEvents(view: ButtonViewGroup, pointerEvents: String?) {
+    view.pointerEvents = when (pointerEvents) {
+      "none" -> PointerEvents.NONE
+      "box-none" -> PointerEvents.BOX_NONE
+      "box-only" -> PointerEvents.BOX_ONLY
+      "auto", null -> PointerEvents.AUTO
+      else -> PointerEvents.AUTO
+    }
+  }
+
   override fun onAfterUpdateTransaction(view: ButtonViewGroup) {
     super.onAfterUpdateTransaction(view)
 
@@ -142,7 +154,8 @@ class RNGestureHandlerButtonViewManager :
 
   class ButtonViewGroup(context: Context?) :
     ViewGroup(context),
-    NativeViewGestureHandler.NativeViewGestureHandlerHook {
+    NativeViewGestureHandler.NativeViewGestureHandlerHook,
+    ReactPointerEventsView {
     // Using object because of handling null representing no value set.
     var rippleColor: Int? = null
       set(color) = withBackgroundUpdate {
@@ -200,6 +213,8 @@ class RNGestureHandlerButtonViewManager :
 
     var exclusive = true
 
+    override var pointerEvents: PointerEvents = PointerEvents.AUTO
+
     private var buttonBackgroundColor = Color.TRANSPARENT
     private var needBackgroundUpdate = false
     private var lastEventTime = -1L
@@ -497,9 +512,9 @@ class RNGestureHandlerButtonViewManager :
       // a parent button from playing)
       return if (!isChildTouched()) {
         if (context.isScreenReaderOn()) {
-          findGestureHandlerRootView()?.activateNativeHandlers(this)
+          RNGestureHandlerRootView.findGestureHandlerRootView(this)?.activateNativeHandlers(this)
         } else if (receivedKeyEvent) {
-          findGestureHandlerRootView()?.activateNativeHandlers(this)
+          RNGestureHandlerRootView.findGestureHandlerRootView(this)?.activateNativeHandlers(this)
           receivedKeyEvent = false
         }
 
@@ -538,20 +553,6 @@ class RNGestureHandlerButtonViewManager :
       // by default Viewgroup would pass hotspot change events
     }
 
-    private fun findGestureHandlerRootView(): RNGestureHandlerRootView? {
-      var parent: ViewParent? = this.parent
-      var gestureHandlerRootView: RNGestureHandlerRootView? = null
-
-      while (parent != null) {
-        if (parent is RNGestureHandlerRootView) {
-          gestureHandlerRootView = parent
-        }
-        parent = parent.parent
-      }
-
-      return gestureHandlerRootView
-    }
-
     companion object {
       var resolveOutValue = TypedValue()
       var touchResponder: ButtonViewGroup? = null

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

@@ -11,6 +11,7 @@ import com.facebook.react.uimanager.events.Event
 import com.facebook.react.views.swiperefresh.ReactSwipeRefreshLayout
 import com.facebook.react.views.view.ReactViewGroup
 import com.swmansion.gesturehandler.core.GestureHandler
+import com.swmansion.gesturehandler.react.RNGestureHandlerRootView
 
 class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
   private val reactContext: ThemedReactContext
@@ -208,6 +209,10 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
     }
   }
 
+  fun recordHandlerIfNotPresent(handler: GestureHandler) {
+    RNGestureHandlerRootView.findGestureHandlerRootView(this)?.recordHandlerIfNotPresent(handler)
+  }
+
   private fun ReadableArray.mapVirtualChildren(): List<VirtualChildren> = List(size()) { i ->
     val child = getMap(i) ?: return@List null
     val handlerTags = child.getArray("handlerTags")?.toIntList().orEmpty()

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

@@ -155,6 +155,10 @@ class RNGestureHandlerModule(reactContext: ReactApplicationContext?) :
         }
       }
 
+      if (newState == GestureHandler.STATE_ACTIVE || newState == GestureHandler.STATE_BEGAN) {
+        handler.recordHandlerIfNotPresent()
+      }
+
       when (newState) {
         GestureHandler.STATE_ACTIVE -> handler.activate(force = true)
         GestureHandler.STATE_BEGAN -> handler.begin()

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

@@ -141,6 +141,10 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
     orchestrator?.activateNativeHandlersForView(view)
   }
 
+  fun recordHandlerIfNotPresent(handler: GestureHandler) {
+    orchestrator?.recordHandlerIfNotPresent(handler, null)
+  }
+
   companion object {
     private const val MIN_ALPHA_FOR_TOUCH = 0.1f
     private fun findRootViewTag(viewGroup: ViewGroup): ViewGroup {

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

@@ -5,11 +5,13 @@ import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewParent
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.UiThreadUtil
 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
 
 class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
   private var moduleId: Int = -1
@@ -39,6 +41,10 @@ class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
     rootHelper?.tearDown()
   }
 
+  fun recordHandlerIfNotPresent(handler: GestureHandler) {
+    rootHelper?.recordHandlerIfNotPresent(handler)
+  }
+
   override fun dispatchTouchEvent(event: MotionEvent) = if (rootViewEnabled && rootHelper!!.dispatchTouchEvent(event)) {
     true
   } else {
@@ -87,5 +93,19 @@ class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
       }
       return false
     }
+
+    fun findGestureHandlerRootView(viewGroup: ViewGroup): RNGestureHandlerRootView? {
+      var parent: ViewParent? = viewGroup.parent
+      var gestureHandlerRootView: RNGestureHandlerRootView? = null
+
+      while (parent != null) {
+        if (parent is RNGestureHandlerRootView) {
+          gestureHandlerRootView = parent
+        }
+        parent = parent.parent
+      }
+
+      return gestureHandlerRootView
+    }
   }
 }

packages/react-native-gesture-handler/apple/Handlers/RNFlingHandler.m

@@ -30,6 +30,12 @@ - (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
   _lastPoint = [[[touches allObjects] objectAtIndex:0] locationInView:_gestureHandler.recognizer.view];
   [_gestureHandler reset];
   [super touchesBegan:touches withEvent:event];
+
+  if (self.state == UIGestureRecognizerStatePossible && ![self.delegate gestureRecognizerShouldBegin:self]) {
+    self.state = UIGestureRecognizerStateFailed;
+    return;
+  }
+
   [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
 
   // self.numberOfTouches doesn't work for this because in case than one finger is required,

packages/react-native-gesture-handler/apple/Handlers/RNLongPressHandler.m

@@ -81,6 +81,12 @@ - (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [_gestureHandler setCurrentPointerType:event];
   [super touchesBegan:touches withEvent:event];
+
+  if (self.state == UIGestureRecognizerStatePossible && ![self.delegate gestureRecognizerShouldBegin:self]) {
+    self.state = UIGestureRecognizerStateFailed;
+    return;
+  }
+
   [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
 
   self.state = UIGestureRecognizerStatePossible;

packages/react-native-gesture-handler/apple/Handlers/RNManualHandler.m

@@ -26,6 +26,11 @@ - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 
 - (void)interactionsBegan:(NSSet *)touches withEvent:(UIEvent *)event
 {
+  if (self.state == UIGestureRecognizerStatePossible && ![self.delegate gestureRecognizerShouldBegin:self]) {
+    self.state = UIGestureRecognizerStateFailed;
+    return;
+  }
+
   [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
 
   if (_shouldSendBeginEvent) {