@lodev09/react-native-true-sheet 3.6.9 → 3.6.10

package/android/src/main/java/com/lodev09/truesheet/TrueSheetView.kt

@@ -248,6 +248,10 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     viewController.insetAdjustment = insetAdjustment
   }
 
+  fun setScrollable(scrollable: Boolean) {
+    viewController.scrollable = scrollable
+  }
+
   // ==================== State Management ====================
 
   /**

package/android/src/main/java/com/lodev09/truesheet/TrueSheetViewController.kt

@@ -170,6 +170,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   override var grabberOptions: GrabberOptions? = null
   override var sheetBackgroundColor: Int? = null
   var insetAdjustment: String = "automatic"
+  var scrollable: Boolean = false
+    set(value) {
+      field = value
+      coordinatorLayout?.scrollable = value
+    }
 
   override var sheetCornerRadius: Float = DEFAULT_CORNER_RADIUS.dpToPx()
     set(value) {
@@ -297,6 +302,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     // Create coordinator layout
     coordinatorLayout = TrueSheetCoordinatorLayout(reactContext).apply {
       delegate = this@TrueSheetViewController
+      scrollable = this@TrueSheetViewController.scrollable
     }
 
     sheetView = TrueSheetBottomSheetView(reactContext).apply {

package/android/src/main/java/com/lodev09/truesheet/TrueSheetViewManager.kt

@@ -190,7 +190,7 @@ class TrueSheetViewManager :
 
   @ReactProp(name = "scrollable", defaultBoolean = false)
   override fun setScrollable(view: TrueSheetView, value: Boolean) {
-    // iOS-specific prop - no-op on Android
+    view.setScrollable(value)
   }
 
   @ReactProp(name = "pageSizing", defaultBoolean = true)

package/android/src/main/java/com/lodev09/truesheet/core/TrueSheetCoordinatorLayout.kt

@@ -2,7 +2,10 @@ package com.lodev09.truesheet.core
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.view.View
+import android.view.MotionEvent
+import android.view.ViewConfiguration
+import android.view.ViewGroup
+import android.widget.ScrollView
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactPointerEventsView
@@ -22,15 +25,19 @@ class TrueSheetCoordinatorLayout(context: Context) :
   ReactPointerEventsView {
 
   var delegate: TrueSheetCoordinatorLayoutDelegate? = null
+  var scrollable: Boolean = false
+
+  private val touchSlop: Int = ViewConfiguration.get(context).scaledTouchSlop
+  private var dragging = false
+  private var initialY = 0f
+  private var activePointerId = 0
 
   init {
-    // Fill the entire screen
     layoutParams = LayoutParams(
       LayoutParams.MATCH_PARENT,
       LayoutParams.MATCH_PARENT
     )
 
-    // Ensure we don't clip the sheet during animations
     clipChildren = false
     clipToPadding = false
   }
@@ -46,10 +53,87 @@ class TrueSheetCoordinatorLayout(context: Context) :
     delegate?.coordinatorLayoutDidLayout(changed)
   }
 
-  /**
-   * Allow pointer events to pass through to underlying views.
-   * The DimView and BottomSheetView handle their own touch interception.
-   */
   override val pointerEvents: PointerEvents
     get() = PointerEvents.BOX_NONE
+
+  /**
+   * Intercepts touch events for ScrollViews that can't scroll (content < viewport),
+   * allowing the sheet to be dragged in these cases.
+   *
+   * TODO: Remove this workaround once NestedScrollView is merged into react-native core.
+   * See: https://github.com/facebook/react-native/pull/44099
+   */
+  override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
+    if (!scrollable) {
+      return super.onInterceptTouchEvent(ev)
+    }
+
+    val scrollView = findScrollView(this)
+    val cannotScroll = scrollView != null &&
+      scrollView.scrollY == 0 &&
+      !scrollView.canScrollVertically(1)
+
+    if (cannotScroll) {
+      when (ev.action and MotionEvent.ACTION_MASK) {
+        MotionEvent.ACTION_DOWN -> {
+          dragging = false
+          initialY = ev.y
+          activePointerId = ev.getPointerId(0)
+        }
+
+        MotionEvent.ACTION_MOVE -> {
+          val pointerIndex = ev.findPointerIndex(activePointerId)
+          if (pointerIndex != -1) {
+            val y = ev.getY(pointerIndex)
+            val deltaY = initialY - y
+            if (kotlin.math.abs(deltaY) > touchSlop) {
+              dragging = true
+              parent?.requestDisallowInterceptTouchEvent(true)
+            }
+          }
+        }
+
+        MotionEvent.ACTION_UP,
+        MotionEvent.ACTION_CANCEL -> {
+          dragging = false
+        }
+      }
+    } else {
+      dragging = false
+    }
+
+    return dragging || super.onInterceptTouchEvent(ev)
+  }
+
+  @SuppressLint("ClickableViewAccessibility")
+  override fun onTouchEvent(ev: MotionEvent): Boolean {
+    if (dragging) {
+      when (ev.action and MotionEvent.ACTION_MASK) {
+        MotionEvent.ACTION_UP,
+        MotionEvent.ACTION_CANCEL -> {
+          dragging = false
+        }
+      }
+      // Let parent CoordinatorLayout handle the touch for BottomSheetBehavior
+      return super.onTouchEvent(ev)
+    }
+    return super.onTouchEvent(ev)
+  }
+
+  private fun findScrollView(view: android.view.View): ScrollView? {
+    if (view is ScrollView) {
+      return view
+    }
+
+    if (view is ViewGroup) {
+      for (i in 0 until view.childCount) {
+        val scrollView = findScrollView(view.getChildAt(i))
+        if (scrollView != null) {
+          return scrollView
+        }
+      }
+    }
+
+    return null
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "3.6.9",
+  "version": "3.6.10",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",