react-native-swipeable-actions 0.1.4 → 0.1.5

package/android/src/main/java/expo/modules/swipeable/SwipeableView.kt

@@ -235,12 +235,20 @@ class SwipeableView(context: Context, appContext: AppContext) : ExpoView(context
     // Auto-close runnable for tracking and cancellation
     private var autoCloseRunnable: Runnable? = null
 
+    // Track when a child (e.g. RNGH gesture handler) claims the touch
+    private var childRequestedDisallowIntercept: Boolean = false
+
     init {
         clipChildren = false
         clipToPadding = false
         setWillNotDraw(false)
     }
 
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
+        childRequestedDisallowIntercept = disallowIntercept
+        super.requestDisallowInterceptTouchEvent(disallowIntercept)
+    }
+
     override fun setClipChildren(clipChildren: Boolean) {
         super.setClipChildren(false)
     }
@@ -350,6 +358,7 @@ class SwipeableView(context: Context, appContext: AppContext) : ExpoView(context
                 dispatchTouchStartX = event.rawX
                 dispatchTouchStartY = event.rawY
                 isBlockingChildEvents = false
+                childRequestedDisallowIntercept = false
 
                 // Initialize tracking
                 touchStartX = event.rawX
@@ -379,6 +388,11 @@ class SwipeableView(context: Context, appContext: AppContext) : ExpoView(context
 
                 // Detect horizontal swipe
                 if (dx > touchSlop && dx > dy) {
+                    // If a child gesture handler (e.g. RNGH) claimed the touch, yield to it
+                    if (childRequestedDisallowIntercept) {
+                        return super.dispatchTouchEvent(event)
+                    }
+
                     val horizontalDelta = event.rawX - dispatchTouchStartX
                     val isCorrectDirection = if (isOpen) {
                         true

package/ios/SwipeableView.swift

@@ -31,6 +31,19 @@ public class SwipeableView: ExpoView {
         return typeName.contains("SurfaceTouchHandler") || typeName.contains("RCTTouchHandler")
     }
 
+    /// Walk from a hit-tested view up to (but not including) self, checking for gesture recognizers.
+    /// Any child view with a gesture recognizer (RNGH, custom, etc.) takes priority over our pan.
+    private func hasChildGesture(from view: UIView) -> Bool {
+        var current: UIView? = view
+        while let v = current, v !== self {
+            if !(v.gestureRecognizers ?? []).isEmpty {
+                return true
+            }
+            current = v.superview
+        }
+        return false
+    }
+
     // MARK: - Thread-Safe Static Registry
 
     private static let registryQueue = DispatchQueue(label: "com.swipeable.registry", qos: .userInteractive)
@@ -862,6 +875,13 @@ extension SwipeableView: UIGestureRecognizerDelegate {
         let shouldBegin = isOpen || (isLeading ? velocity.x > 0 : velocity.x < 0)
 
         if shouldBegin {
+            // Prevent our pan from starting when the touch is on a child view that has
+            // its own gesture recognizers (e.g. RNGH). Delegate-based conflict resolution
+            // doesn't work with RNGH (it overrides delegates), so we yield via hit-test.
+            let touchPoint = pan.location(in: self)
+            if let hitView = super.hitTest(touchPoint, with: nil), hasChildGesture(from: hitView) {
+                return false
+            }
             cancelFabricTouches()
         }
 
@@ -892,11 +912,4 @@ extension SwipeableView: UIGestureRecognizerDelegate {
 
         return false
     }
-
-    public func gestureRecognizer(
-        _ gestureRecognizer: UIGestureRecognizer,
-        shouldRequireFailureOf otherGestureRecognizer: UIGestureRecognizer
-    ) -> Bool {
-        false
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-swipeable-actions",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "High-performance native swipeable row component for React Native using Expo Modules",
   "main": "src/index.ts",
   "types": "build/index.d.ts",