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

package/README.md

@@ -31,6 +31,7 @@ The true native bottom sheet experience for your React Native Apps. 💩
 
 - React Native >= 0.76 (Expo SDK 52+)
 - New Architecture enabled (default in RN 0.76+)
+- Xcode 26.2 (strongly recommended for better library functionality)
 
 ### Expo
 
@@ -45,6 +46,27 @@ yarn add @lodev09/react-native-true-sheet
 cd ios && pod install
 ```
 
+### EAS Build (iOS)
+
+When using [EAS Build](https://docs.expo.dev/build/introduction/) to build your iOS app, you must configure your `eas.json` to use a build image that includes Xcode 26.2. Use `"image": "latest"` or choose from the [available build images](https://docs.expo.dev/build-reference/infrastructure/#ios-server-images):
+
+```json
+{
+  "build": {
+    "production": {
+      "ios": {
+        "image": "latest"
+      }
+    },
+    "development": {
+      "ios": {
+        "image": "latest"
+      }
+    }
+  }
+}
+```
+
 ## Documentation
 
 - [Example](example)

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

@@ -3,9 +3,11 @@ package com.lodev09.truesheet
 import android.annotation.SuppressLint
 import android.view.View
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.view.ReactViewGroup
 
 interface TrueSheetContainerViewDelegate {
+  val eventDispatcher: EventDispatcher?
   fun containerViewContentDidChangeSize(width: Int, height: Int)
   fun containerViewHeaderDidChangeSize(width: Int, height: Int)
   fun containerViewFooterDidChangeSize(width: Int, height: Int)
@@ -32,6 +34,9 @@ class TrueSheetContainerView(reactContext: ThemedReactContext) :
   var headerHeight: Int = 0
   var footerHeight: Int = 0
 
+  override val eventDispatcher: EventDispatcher?
+    get() = delegate?.eventDispatcher
+
   init {
     // Allow footer to position outside container bounds
     clipChildren = false

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

@@ -11,10 +11,11 @@ import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.view.ReactViewGroup
 
 /**
- * Delegate interface for footer view size changes
+ * Delegate interface for footer view size changes and event dispatching
  */
 interface TrueSheetFooterViewDelegate {
   fun footerViewDidChangeSize(width: Int, height: Int)
+  val eventDispatcher: EventDispatcher?
 }
 
 /**
@@ -30,7 +31,9 @@ class TrueSheetFooterView(private val reactContext: ThemedReactContext) :
   RootView {
 
   var delegate: TrueSheetFooterViewDelegate? = null
-  var eventDispatcher: EventDispatcher? = null
+
+  private val eventDispatcher: EventDispatcher?
+    get() = delegate?.eventDispatcher
 
   private var lastWidth = 0
   private var lastHeight = 0

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

@@ -42,7 +42,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   private val containerView: TrueSheetContainerView?
     get() = viewController.getChildAt(0) as? TrueSheetContainerView
 
-  var eventDispatcher: EventDispatcher? = null
+  override var eventDispatcher: EventDispatcher? = null
 
   // Initial present configuration (set by ViewManager before mount)
   var initialDetentIndex: Int = -1
@@ -248,6 +248,10 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     viewController.insetAdjustment = insetAdjustment
   }
 
+  fun setScrollable(scrollable: Boolean) {
+    viewController.scrollable = scrollable
+  }
+
   // ==================== State Management ====================
 
   /**
@@ -380,10 +384,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   override fun viewControllerWillPresent(index: Int, position: Float, detent: Float) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(WillPresentEvent(surfaceId, id, index, position, detent))
-
-    // Enable touch event dispatching to React Native while sheet is visible
-    viewController.eventDispatcher = eventDispatcher
-    containerView?.footerView?.eventDispatcher = eventDispatcher
   }
 
   override fun viewControllerDidPresent(index: Int, position: Float, detent: Float) {
@@ -394,10 +394,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   override fun viewControllerWillDismiss() {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(WillDismissEvent(surfaceId, id))
-
-    // Disable touch event dispatching when sheet is dismissing
-    viewController.eventDispatcher = null
-    containerView?.footerView?.eventDispatcher = null
   }
 
   override fun viewControllerDidDismiss(hadParent: Boolean) {

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

@@ -45,6 +45,7 @@ import com.lodev09.truesheet.utils.ScreenUtils
 data class DetentInfo(val index: Int, val position: Float)
 
 interface TrueSheetViewControllerDelegate {
+  val eventDispatcher: EventDispatcher?
   fun viewControllerWillPresent(index: Int, position: Float, detent: Float)
   fun viewControllerDidPresent(index: Int, position: Float, detent: Float)
   fun viewControllerWillDismiss()
@@ -155,9 +156,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   // Touch Dispatchers
-  internal var eventDispatcher: EventDispatcher? = null
   private val jsTouchDispatcher = JSTouchDispatcher(this)
-  private var jsPointerDispatcher: JSPointerDispatcher? = null
+  private val jsPointerDispatcher = JSPointerDispatcher(this)
+
+  private val eventDispatcher
+    get() = delegate?.eventDispatcher
 
   // Detent Configuration
   override var maxSheetHeight: Int? = null
@@ -170,6 +173,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) {
@@ -279,14 +287,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private val dimViews: List<TrueSheetDimView>
     get() = listOfNotNull(dimView, parentDimView)
 
-  // =============================================================================
-  // MARK: - Initialization
-  // =============================================================================
-
-  init {
-    jsPointerDispatcher = JSPointerDispatcher(this)
-  }
-
   // =============================================================================
   // MARK: - Sheet Creation & Cleanup
   // =============================================================================
@@ -297,6 +297,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 {
@@ -1062,32 +1063,26 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
-  override fun handleException(t: Throwable) {
-    reactContext.reactApplicationContext.handleException(RuntimeException(t))
-  }
-
   // =============================================================================
-  // MARK: - Touch Event Handling
+  // MARK: - RootView Touch Handling
   // =============================================================================
 
   override fun dispatchTouchEvent(event: MotionEvent): Boolean {
-    // Footer needs special handling since it's positioned absolutely
     val footer = containerView?.footerView
-    if (footer != null && footer.isVisible) {
+    if (footer != null && footer.isShown) {
       val footerLocation = ScreenUtils.getScreenLocation(footer)
-      val touchScreenX = event.rawX.toInt()
-      val touchScreenY = event.rawY.toInt()
-
-      // Check if touch is within footer bounds
-      if (touchScreenX >= footerLocation[0] &&
-        touchScreenX <= footerLocation[0] + footer.width &&
-        touchScreenY >= footerLocation[1] &&
-        touchScreenY <= footerLocation[1] + footer.height
+      val touchX = event.rawX.toInt()
+      val touchY = event.rawY.toInt()
+
+      if (touchX >= footerLocation[0] &&
+        touchX <= footerLocation[0] + footer.width &&
+        touchY >= footerLocation[1] &&
+        touchY <= footerLocation[1] + footer.height
       ) {
         val localEvent = MotionEvent.obtain(event)
         localEvent.setLocation(
-          (touchScreenX - footerLocation[0]).toFloat(),
-          (touchScreenY - footerLocation[1]).toFloat()
+          (touchX - footerLocation[0]).toFloat(),
+          (touchY - footerLocation[1]).toFloat()
         )
         val handled = footer.dispatchTouchEvent(localEvent)
         localEvent.recycle()
@@ -1100,7 +1095,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
     eventDispatcher?.let {
       jsTouchDispatcher.handleTouchEvent(event, it, reactContext)
-      jsPointerDispatcher?.handleMotionEvent(event, it, true)
+      jsPointerDispatcher.handleMotionEvent(event, it, true)
     }
     return super.onInterceptTouchEvent(event)
   }
@@ -1108,35 +1103,35 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   override fun onTouchEvent(event: MotionEvent): Boolean {
     eventDispatcher?.let {
       jsTouchDispatcher.handleTouchEvent(event, it, reactContext)
-      jsPointerDispatcher?.handleMotionEvent(event, it, false)
+      jsPointerDispatcher.handleMotionEvent(event, it, false)
     }
     super.onTouchEvent(event)
     return true
   }
 
   override fun onInterceptHoverEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { jsPointerDispatcher?.handleMotionEvent(event, it, true) }
+    eventDispatcher?.let { jsPointerDispatcher.handleMotionEvent(event, it, true) }
     return super.onHoverEvent(event)
   }
 
   override fun onHoverEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { jsPointerDispatcher?.handleMotionEvent(event, it, false) }
+    eventDispatcher?.let { jsPointerDispatcher.handleMotionEvent(event, it, false) }
     return super.onHoverEvent(event)
   }
 
   override fun onChildStartedNativeGesture(childView: View?, ev: MotionEvent) {
     eventDispatcher?.let {
       jsTouchDispatcher.onChildStartedNativeGesture(ev, it)
-      jsPointerDispatcher?.onChildStartedNativeGesture(childView, ev, it)
+      jsPointerDispatcher.onChildStartedNativeGesture(childView, ev, it)
     }
   }
 
   override fun onChildEndedNativeGesture(childView: View, ev: MotionEvent) {
     eventDispatcher?.let { jsTouchDispatcher.onChildEndedNativeGesture(ev, it) }
-    jsPointerDispatcher?.onChildEndedNativeGesture()
+    jsPointerDispatcher.onChildEndedNativeGesture()
   }
 
-  override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
-    super.requestDisallowInterceptTouchEvent(disallowIntercept)
+  override fun handleException(t: Throwable) {
+    reactContext.reactApplicationContext.handleException(RuntimeException(t))
   }
 }

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.11",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",