react-native-gesture-handler 3.0.0-beta.1 → 3.0.0-beta.3

package/ReanimatedDrawerLayout/package.json

@@ -1,5 +1,5 @@
 {
-  "main": "../lib/commonjs/components/ReanimatedDrawerLayout",
+  "main": "../lib/module/components/ReanimatedDrawerLayout",
   "module": "../lib/module/components/ReanimatedDrawerLayout",
   "react-native": "../src/components/ReanimatedDrawerLayout",
   "types": "../lib/typescript/components/ReanimatedDrawerLayout.d.ts"

package/ReanimatedSwipeable/package.json

@@ -1,5 +1,5 @@
 {
-  "main": "../lib/commonjs/components/ReanimatedSwipeable/",
+  "main": "../lib/module/components/ReanimatedSwipeable/",
   "module": "../lib/module/components/ReanimatedSwipeable/",
   "react-native": "../src/components/ReanimatedSwipeable/",
   "types": "../lib/typescript/components/ReanimatedSwipeable/"

package/android/src/main/java/com/swmansion/gesturehandler/RNGestureHandlerPackage.kt

@@ -11,7 +11,6 @@ import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 import com.swmansion.gesturehandler.react.RNGestureHandlerButtonViewManager
-import com.swmansion.gesturehandler.react.RNGestureHandlerButtonWrapperViewManager
 import com.swmansion.gesturehandler.react.RNGestureHandlerDetectorViewManager
 import com.swmansion.gesturehandler.react.RNGestureHandlerModule
 import com.swmansion.gesturehandler.react.RNGestureHandlerRootViewManager
@@ -35,9 +34,6 @@ class RNGestureHandlerPackage :
       RNGestureHandlerDetectorViewManager.REACT_CLASS to ModuleSpec.viewManagerSpec {
         RNGestureHandlerDetectorViewManager()
       },
-      RNGestureHandlerButtonWrapperViewManager.REACT_CLASS to ModuleSpec.viewManagerSpec {
-        RNGestureHandlerButtonWrapperViewManager()
-      },
     )
   }
 
@@ -45,7 +41,6 @@ class RNGestureHandlerPackage :
     RNGestureHandlerRootViewManager(),
     RNGestureHandlerButtonViewManager(),
     RNGestureHandlerDetectorViewManager(),
-    RNGestureHandlerButtonWrapperViewManager(),
   )
 
   override fun getViewManagerNames(reactContext: ReactApplicationContext) = viewManagers.keys.toList()

package/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt

@@ -390,19 +390,34 @@ open class GestureHandler {
     // 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 detectorView = hostDetectorView
+    if (detectorView != null && view == detectorView && detectorView.isNotEmpty()) {
       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)
+      var foundChild = false
+
+      for (i in 0 until detectorView.childCount) {
+        val child = detectorView.getChildAt(i)
+        GestureHandlerOrchestrator.transformPointToChildViewCoords(
+          adaptedTransformedEvent.x,
+          adaptedTransformedEvent.y,
+          detectorView,
+          child,
+          outPoint,
+        )
+        if (isWithinBounds(child, outPoint.x, outPoint.y)) {
+          x = outPoint.x
+          y = outPoint.y
+          isWithinBounds = true
+          foundChild = true
+          break
+        }
+      }
+
+      if (!foundChild) {
+        x = adaptedTransformedEvent.x
+        y = adaptedTransformedEvent.y
+        isWithinBounds = false
+      }
     } else {
       x = adaptedTransformedEvent.x
       y = adaptedTransformedEvent.y
@@ -629,11 +644,22 @@ open class GestureHandler {
     onStateChange(newState, oldState)
   }
 
-  fun wantsEvent(event: MotionEvent): Boolean = isEnabled &&
-    state != STATE_FAILED &&
-    state != STATE_CANCELLED &&
-    state != STATE_END &&
-    isTrackingPointer(event.getPointerId(event.actionIndex))
+  fun wantsEvent(event: MotionEvent): Boolean {
+    if (!isEnabled || state == STATE_FAILED || state == STATE_CANCELLED || state == STATE_END) {
+      return false
+    }
+
+    if (event.actionMasked == MotionEvent.ACTION_MOVE) {
+      for (i in 0 until event.pointerCount) {
+        if (isTrackingPointer(event.getPointerId(i))) {
+          return true
+        }
+      }
+      return false
+    } else {
+      return isTrackingPointer(event.getPointerId(event.actionIndex))
+    }
+  }
 
   open fun shouldRequireToWaitForFailure(handler: GestureHandler): Boolean {
     if (handler === this) {

package/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandlerOrchestrator.kt

@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.widget.EditText
 import com.facebook.react.uimanager.ReactCompoundView
 import com.facebook.react.uimanager.RootView
+import com.swmansion.gesturehandler.react.RNGestureHandlerDetectorView
 import com.swmansion.gesturehandler.react.RNGestureHandlerRootHelper
 import com.swmansion.gesturehandler.react.RNGestureHandlerRootView
 import com.swmansion.gesturehandler.react.isHoverAction
@@ -286,7 +287,7 @@ class GestureHandlerOrchestrator(
   }
 
   private fun deliverEventToGestureHandler(handler: GestureHandler, sourceEvent: MotionEvent) {
-    if (!isViewAttachedUnderWrapper(handler.view)) {
+    if (!isViewAttachedUnderWrapper(handler.view ?: handler.hostDetectorView)) {
       handler.cancel()
       return
     }
@@ -745,9 +746,12 @@ class GestureHandlerOrchestrator(
 
       // TODO: this is not an ideal solution as we only consider ViewGroups that has no background set
       // TODO: ideally we should determine the pixel color under the given coordinates and return
-      // false if the color is transparent
-      val isLeafOrTransparent = view !is ViewGroup || view.getBackground() != null
-      return isLeafOrTransparent && isTransformedTouchPointInView(coords[0], coords[1], view)
+      val isLeaf = view !is ViewGroup
+      val isNotTransparent = view.getBackground() != null
+      val isDirectDetectorChild = view.parent is RNGestureHandlerDetectorView
+      val isPointInView = isTransformedTouchPointInView(coords[0], coords[1], view)
+
+      return (isLeaf || isNotTransparent || isDirectDetectorChild) && isPointInView
     }
 
     fun transformPointToChildViewCoords(x: Float, y: Float, parent: ViewGroup, child: View, outLocalPoint: PointF) {

package/android/src/main/java/com/swmansion/gesturehandler/core/NativeViewGestureHandler.kt

@@ -123,6 +123,10 @@ class NativeViewGestureHandler : GestureHandler() {
 
       hook.afterGestureEnd(event)
     } else if (state == STATE_UNDETERMINED || state == STATE_BEGAN) {
+      if (state != STATE_BEGAN && hook.canBegin(event)) {
+        begin()
+      }
+
       when {
         shouldActivateOnStart -> {
           tryIntercept(view, event)
@@ -138,12 +142,6 @@ class NativeViewGestureHandler : GestureHandler() {
         hook.wantsToHandleEventBeforeActivation() -> {
           hook.handleEventBeforeActivation(event)
         }
-
-        state != STATE_BEGAN -> {
-          if (hook.canBegin(event)) {
-            begin()
-          }
-        }
       }
     } else if (state == STATE_ACTIVE) {
       hook.sendTouchEvent(view, event)

package/android/src/main/java/com/swmansion/gesturehandler/core/RotationGestureHandler.kt

@@ -35,7 +35,11 @@ class RotationGestureHandler : GestureHandler() {
     override fun onRotationBegin(detector: RotationGestureDetector) = true
 
     override fun onRotationEnd(detector: RotationGestureDetector) {
-      end()
+      if (state == STATE_ACTIVE) {
+        end()
+      } else {
+        fail()
+      }
     }
   }
 
@@ -64,12 +68,11 @@ class RotationGestureHandler : GestureHandler() {
       anchorX = point.x
       anchorY = point.y
     }
-    if (sourceEvent.actionMasked == MotionEvent.ACTION_UP) {
-      if (state == STATE_ACTIVE) {
-        end()
-      } else {
-        fail()
-      }
+
+    // ACTION_UP is already handled in rotationGestureDetector.onTouchEvent (and effectively in onRotationEnd)
+    // if more than one pointer was used
+    if (sourceEvent.actionMasked == MotionEvent.ACTION_UP && state == STATE_BEGAN) {
+      fail()
     }
   }