@lodev09/react-native-true-sheet 3.9.9 → 3.10.0-beta.0

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

@@ -2,7 +2,6 @@ package com.lodev09.truesheet
 
 import android.annotation.SuppressLint
 import android.view.View
-import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.view.ReactViewGroup
@@ -40,7 +39,7 @@ class TrueSheetContainerView(reactContext: ThemedReactContext) :
   var insetAdjustment: TrueSheetInsetAdjustment = TrueSheetInsetAdjustment.AUTOMATIC
   var scrollViewBottomInset: Int = 0
   var scrollableEnabled: Boolean = false
-  var scrollableOptions: ReadableMap? = null
+  var scrollableOptions: ScrollableOptions? = null
     set(value) {
       field = value
       contentView?.scrollableOptions = value

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

@@ -4,13 +4,18 @@ import android.annotation.SuppressLint
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ScrollView
-import com.facebook.react.bridge.ReadableMap
+import androidx.core.widget.NestedScrollView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
 import com.lodev09.truesheet.core.TrueSheetKeyboardObserver
 import com.lodev09.truesheet.core.TrueSheetKeyboardObserverDelegate
 import com.lodev09.truesheet.utils.isDescendantOf
+import com.lodev09.truesheet.utils.smoothScrollBy
+import com.lodev09.truesheet.utils.smoothScrollTo
+
+data class ScrollableOptions(val keyboardScrollOffset: Float = 0f, val scrollingExpandsSheet: Boolean = true)
 
 /**
  * Delegate interface for content view size changes
@@ -32,17 +37,18 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
   private var lastWidth = 0
   private var lastHeight = 0
 
-  private var pinnedScrollView: ScrollView? = null
+  private var pinnedScrollView: ViewGroup? = null
   private var originalScrollViewPaddingBottom: Int = 0
   private var bottomInset: Int = 0
+  private var scrollExpansionPadding: Int = 0
 
   private var keyboardScrollOffset: Float = 0f
   private var keyboardObserver: TrueSheetKeyboardObserver? = null
 
-  var scrollableOptions: ReadableMap? = null
+  var scrollableOptions: ScrollableOptions? = null
     set(value) {
       field = value
-      keyboardScrollOffset = value?.getDouble("keyboardScrollOffset")?.toFloat()?.dpToPx() ?: 0f
+      keyboardScrollOffset = value?.keyboardScrollOffset?.dpToPx() ?: 0f
     }
 
   override fun addView(child: View?, index: Int) {
@@ -94,6 +100,9 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
       originalScrollViewPaddingBottom = scrollView.paddingBottom
       pinnedScrollView = scrollView
 
+      scrollView.isNestedScrollingEnabled = true
+      (scrollView.parent as? SwipeRefreshLayout)?.isNestedScrollingEnabled = false
+
       scrollView.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
         if (scrollY != oldScrollY) {
           delegate?.contentViewDidScroll()
@@ -112,6 +121,19 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
     }
   }
 
+  // TODO: Replace this workaround with synchronous state layout updates on every sheet resize.
+  // The container is currently sized to the largest detent, so at smaller detents the ScrollView
+  // viewport extends beyond the visible area, reducing the effective scroll range. This padding
+  // compensates for that difference until we can resize the container per-detent synchronously.
+  fun updateScrollExpansionPadding(padding: Int) {
+    if (scrollExpansionPadding == padding) return
+    scrollExpansionPadding = padding
+    val keyboardHeight = keyboardObserver?.currentHeight ?: 0
+    val basePadding = if (keyboardHeight > 0) keyboardHeight else bottomInset
+    setScrollViewPaddingBottom(originalScrollViewPaddingBottom + basePadding)
+    nudgeScrollView()
+  }
+
   private fun setScrollViewPaddingBottom(paddingBottom: Int) {
     val scrollView = pinnedScrollView ?: return
     scrollView.clipToPadding = false
@@ -119,26 +141,29 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
       scrollView.paddingLeft,
       scrollView.paddingTop,
       scrollView.paddingRight,
-      paddingBottom
+      paddingBottom + scrollExpansionPadding
     )
   }
 
   fun clearScrollable() {
     pinnedScrollView?.setOnScrollChangeListener(null as View.OnScrollChangeListener?)
+    pinnedScrollView?.isNestedScrollingEnabled = false
+    (pinnedScrollView?.parent as? SwipeRefreshLayout)?.isNestedScrollingEnabled = true
+    scrollExpansionPadding = 0
     setScrollViewPaddingBottom(originalScrollViewPaddingBottom)
     pinnedScrollView = null
     originalScrollViewPaddingBottom = 0
     bottomInset = 0
   }
 
-  fun findScrollView(): ScrollView? {
+  fun findScrollView(): ViewGroup? {
     if (pinnedScrollView != null) return pinnedScrollView
     return findScrollView(this as View)
   }
 
-  private fun findScrollView(view: View): ScrollView? {
-    if (view is ScrollView) {
-      return view
+  private fun findScrollView(view: View): ViewGroup? {
+    if (view is ScrollView || view is NestedScrollView) {
+      return view as ViewGroup
     }
 
     if (view is ViewGroup) {
@@ -191,11 +216,13 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
     val totalBottomInset = if (keyboardHeight > 0) keyboardHeight else bottomInset
     setScrollViewPaddingBottom(originalScrollViewPaddingBottom + totalBottomInset)
 
-    // Trigger a scroll to force update
-    scrollView.post {
-      scrollView.smoothScrollBy(0, 1)
-      scrollView.smoothScrollBy(0, -1)
-    }
+    scrollView.post { nudgeScrollView() }
+  }
+
+  private fun nudgeScrollView() {
+    val scrollView = pinnedScrollView ?: return
+    scrollView.smoothScrollBy(0, 1)
+    scrollView.smoothScrollBy(0, -1)
   }
 
   private fun scrollToFocusedInput() {

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

@@ -140,6 +140,16 @@ class TrueSheetModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  @ReactMethod
+  fun handleBackPress(viewTag: Double, promise: Promise) {
+    val tag = viewTag.toInt()
+
+    withTrueSheetView(tag, promise) { view ->
+      view.handleBackPress()
+      promise.resolve(null)
+    }
+  }
+
   /**
    * Helper method to get TrueSheetView by tag and execute closure
    */

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

@@ -6,7 +6,6 @@ import android.view.ViewGroup
 import android.view.accessibility.AccessibilityEvent
 import androidx.annotation.UiThread
 import com.facebook.react.bridge.LifecycleEventListener
-import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.uimanager.PixelUtil.pxToDp
 import com.facebook.react.uimanager.StateWrapper
@@ -282,7 +281,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     setupScrollable()
   }
 
-  fun setScrollableOptions(options: ReadableMap?) {
+  fun setScrollableOptions(options: ScrollableOptions?) {
     viewController.scrollableOptions = options
     setupScrollable()
   }
@@ -379,6 +378,11 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     viewController.present(detentIndex, animated)
   }
 
+  @UiThread
+  fun handleBackPress() {
+    viewController.handleBackPress()
+  }
+
   @UiThread
   fun dismiss(animated: Boolean = true, promiseCallback: () -> Unit) {
     if (viewController.isBeingDismissed || !viewController.isPresented) {
@@ -577,9 +581,9 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     eventDispatcher?.dispatchEvent(BlurEvent(surfaceId, id))
   }
 
-  override fun viewControllerDidBackPress() {
+  override fun viewControllerDidChangeVisibility(visible: Boolean) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(BackPressEvent(surfaceId, id))
+    eventDispatcher?.dispatchEvent(VisibilityChangeEvent(surfaceId, id, visible))
   }
 
   // ==================== TrueSheetContainerViewDelegate ====================

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

@@ -8,14 +8,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.ImageView
-import android.widget.ScrollView
-import androidx.activity.OnBackPressedCallback
-import androidx.appcompat.app.AppCompatActivity
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.graphics.createBitmap
 import androidx.core.view.isNotEmpty
 import com.facebook.react.R
-import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.JSPointerDispatcher
 import com.facebook.react.uimanager.JSTouchDispatcher
 import com.facebook.react.uimanager.PixelUtil.dpToPx
@@ -27,6 +23,7 @@ import com.facebook.react.util.RNLog
 import com.facebook.react.views.view.ReactViewGroup
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.lodev09.truesheet.core.GrabberOptions
+import com.lodev09.truesheet.core.TrueSheetBottomSheetBehavior
 import com.lodev09.truesheet.core.TrueSheetBottomSheetView
 import com.lodev09.truesheet.core.TrueSheetBottomSheetViewDelegate
 import com.lodev09.truesheet.core.TrueSheetCoordinatorLayout
@@ -64,7 +61,7 @@ interface TrueSheetViewControllerDelegate {
   fun viewControllerDidFocus()
   fun viewControllerWillBlur()
   fun viewControllerDidBlur()
-  fun viewControllerDidBackPress()
+  fun viewControllerDidChangeVisibility(visible: Boolean)
 }
 
 // =============================================================================
@@ -146,9 +143,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private var dimView: TrueSheetDimView? = null
   private var parentDimView: TrueSheetDimView? = null
 
-  // Back button handling
-  private var backCallback: OnBackPressedCallback? = null
-
   // Presentation State
   var isPresented = false
     private set
@@ -213,7 +207,12 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   var scrollable: Boolean = false
 
-  var scrollableOptions: ReadableMap? = null
+  var scrollableOptions: ScrollableOptions? = null
+    set(value) {
+      field = value
+      behavior?.scrollingExpandsSheet = value?.scrollingExpandsSheet ?: true
+      if (isPresented) sheetView?.let { updateScrollExpansionPadding(it.top) }
+    }
 
   override var sheetCornerRadius: Float = DEFAULT_CORNER_RADIUS.dpToPx()
     set(value) {
@@ -245,7 +244,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // =============================================================================
 
   // Behavior
-  private val behavior: BottomSheetBehavior<TrueSheetBottomSheetView>?
+  private val behavior: TrueSheetBottomSheetBehavior<TrueSheetBottomSheetView>?
     get() = sheetView?.behavior
 
   internal val containerView: TrueSheetContainerView?
@@ -349,7 +348,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   private fun cleanupSheet() {
     cleanupKeyboardObserver()
-    cleanupBackCallback()
     sheetView?.animate()?.cancel()
 
     // Cleanup dim views
@@ -411,28 +409,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     snapshotView = null
   }
 
-  // =============================================================================
-  // MARK: - Back Button Handling
-  // =============================================================================
-
-  private fun setupBackCallback() {
-    val activity = reactContext.currentActivity as? AppCompatActivity ?: return
-
-    backCallback = object : OnBackPressedCallback(true) {
-      override fun handleOnBackPressed() {
-        delegate?.viewControllerDidBackPress()
-        dismissOrCollapseToLowest()
-      }
-    }
-
-    activity.onBackPressedDispatcher.addCallback(backCallback!!)
-  }
-
-  private fun cleanupBackCallback() {
-    backCallback?.remove()
-    backCallback = null
-  }
-
   // =============================================================================
   // MARK: - TrueSheetCoordinatorLayout.Delegate
   // =============================================================================
@@ -453,7 +429,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     sheetView?.let { emitChangePositionDelegate(it.top, realtime = false) }
   }
 
-  override fun findScrollView(): ScrollView? = containerView?.contentView?.findScrollView()
+  override fun findScrollView(): ViewGroup? = containerView?.contentView?.findScrollView()
   override fun findSheetView(): TrueSheetBottomSheetView? = sheetView
 
   // =============================================================================
@@ -480,7 +456,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       children.forEach { it.viewController.dismiss(animated = true) }
     }
 
-    dismissOrCollapseToLowest()
+    if (dismissible) {
+      dismiss(animated = true)
+    } else if (parentSheetView == null && isDimmedAtCurrentDetent && dimmedDetentIndex > 0) {
+      setStateForDetentIndex(dimmedDetentIndex - 1)
+    }
   }
 
   // =============================================================================
@@ -496,6 +476,20 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
+  override fun bottomSheetViewDidAccessibilityIncrement() {
+    if (currentDetentIndex < detents.size - 1) {
+      setStateForDetentIndex(currentDetentIndex + 1)
+    }
+  }
+
+  override fun bottomSheetViewDidAccessibilityDecrement() {
+    if (currentDetentIndex > 0) {
+      setStateForDetentIndex(currentDetentIndex - 1)
+    } else if (dismissible) {
+      dismiss(animated = true)
+    }
+  }
+
   // =============================================================================
   // MARK: - BottomSheetCallback
   // =============================================================================
@@ -548,6 +542,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       else -> { }
     }
 
+    updateScrollExpansionPadding(sheetView.top)
     emitChangePositionDelegate(sheetView.top)
 
     // On older APIs, use onSlide for footer positioning during keyboard transitions
@@ -561,6 +556,15 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
+  private fun updateScrollExpansionPadding(sheetTop: Int) {
+    if (!scrollable) {
+      containerView?.contentView?.updateScrollExpansionPadding(0)
+      return
+    }
+    val expandedOffset = behavior?.expandedOffset ?: return
+    containerView?.contentView?.updateScrollExpansionPadding(maxOf(0, sheetTop - expandedOffset))
+  }
+
   private fun handleStateSettled(sheetView: View, newState: Int) {
     if (interactionState is InteractionState.Reconfiguring) return
 
@@ -586,6 +590,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
           currentDetentIndex = detentInfo.index
           setupDimmedBackground()
           delegate?.viewControllerDidChangeDetent(detentInfo.index, detentInfo.position, detent)
+          this@TrueSheetViewController.sheetView?.updateGrabberAccessibilityValue(detentInfo.index, detents.size)
         }
 
         interactionState = InteractionState.Idle
@@ -598,6 +603,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
             val detent = detentCalculator.getDetentValueForIndex(detentInfo.index)
             delegate?.viewControllerDidChangeDetent(detentInfo.index, detentInfo.position, detent)
           }
+          this@TrueSheetViewController.sheetView?.updateGrabberAccessibilityValue(detentInfo.index, detents.size)
         }
       }
     }
@@ -624,8 +630,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
     isSheetVisible = false
     wasHiddenByScreen = true
-    backCallback?.isEnabled = false
-
+    delegate?.viewControllerDidChangeVisibility(false)
     dimViews.forEach { it.animate().alpha(0f).setDuration(SCREEN_FADE_DURATION).start() }
     sheet.animate()
       .alpha(0f)
@@ -641,10 +646,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   internal fun showAfterScreen() {
     isSheetVisible = true
+    delegate?.viewControllerDidChangeVisibility(true)
     setSheetVisibility(true)
     sheetView?.alpha = 1f
     updateDimAmount(animated = true)
-    backCallback?.isEnabled = true
   }
 
   /**
@@ -677,7 +682,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     setupSheetDetents()
     setupDimmedBackground()
     setupKeyboardObserver()
-    setupBackCallback()
 
     sheet.setupBackground()
     sheet.setupElevation()
@@ -722,11 +726,12 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     val params = sheet.createLayoutParams()
 
     @Suppress("UNCHECKED_CAST")
-    val behavior = params.behavior as BottomSheetBehavior<TrueSheetBottomSheetView>
+    val behavior = params.behavior as TrueSheetBottomSheetBehavior<TrueSheetBottomSheetView>
 
     // Configure behavior
     behavior.isHideable = true
     behavior.isDraggable = draggable
+    behavior.scrollingExpandsSheet = scrollableOptions?.scrollingExpandsSheet ?: true
     behavior.state = BottomSheetBehavior.STATE_HIDDEN
     behavior.addBottomSheetCallback(sheetCallback)
 
@@ -754,11 +759,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     KeyboardUtils.dismiss(reactContext)
   }
 
-  private fun dismissOrCollapseToLowest() {
+  fun handleBackPress() {
     if (dismissible) {
       dismiss(animated = true)
-    } else if (parentSheetView == null && isDimmedAtCurrentDetent && dimmedDetentIndex > 0) {
-      setStateForDetentIndex(dimmedDetentIndex - 1)
+    } else if (currentDetentIndex > 0) {
+      setStateForDetentIndex(0)
     }
   }
 
@@ -787,6 +792,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     delegate?.viewControllerDidPresent(index, position, detent)
     parentSheetView?.viewControllerDidBlur()
     delegate?.viewControllerDidFocus()
+    sheetView?.updateGrabberAccessibilityValue(index, detents.size)
 
     presentPromise?.invoke()
     presentPromise = null

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

@@ -74,7 +74,7 @@ class TrueSheetViewManager :
       FocusEvent.EVENT_NAME to hashMapOf("registrationName" to FocusEvent.REGISTRATION_NAME),
       WillBlurEvent.EVENT_NAME to hashMapOf("registrationName" to WillBlurEvent.REGISTRATION_NAME),
       BlurEvent.EVENT_NAME to hashMapOf("registrationName" to BlurEvent.REGISTRATION_NAME),
-      BackPressEvent.EVENT_NAME to hashMapOf("registrationName" to BackPressEvent.REGISTRATION_NAME)
+      VisibilityChangeEvent.EVENT_NAME to hashMapOf("registrationName" to VisibilityChangeEvent.REGISTRATION_NAME)
     )
 
   // ==================== Props ====================
@@ -218,7 +218,16 @@ class TrueSheetViewManager :
 
   @ReactProp(name = "scrollableOptions")
   override fun setScrollableOptions(view: TrueSheetView, options: ReadableMap?) {
-    view.setScrollableOptions(options)
+    if (options == null) {
+      view.setScrollableOptions(null)
+      return
+    }
+
+    val scrollableOptions = ScrollableOptions(
+      keyboardScrollOffset = if (options.hasKey("keyboardScrollOffset")) options.getDouble("keyboardScrollOffset").toFloat() else 0f,
+      scrollingExpandsSheet = if (options.hasKey("scrollingExpandsSheet")) options.getBoolean("scrollingExpandsSheet") else true
+    )
+    view.setScrollableOptions(scrollableOptions)
   }
 
   companion object {

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

@@ -0,0 +1,36 @@
+package com.lodev09.truesheet.core
+
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+
+class TrueSheetBottomSheetBehavior<V : View> : BottomSheetBehavior<V>() {
+  var scrollingExpandsSheet: Boolean = true
+
+  override fun onNestedPreScroll(
+    coordinatorLayout: CoordinatorLayout,
+    child: V,
+    target: View,
+    dx: Int,
+    dy: Int,
+    consumed: IntArray,
+    type: Int
+  ) {
+    // dy > 0 = user swiping up = sheet expanding
+    // Block expansion from scroll, but allow if sheet is already being dragged
+    if (!scrollingExpandsSheet && dy > 0 && state != STATE_DRAGGING) return
+    super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type)
+  }
+
+  override fun onNestedPreFling(
+    coordinatorLayout: CoordinatorLayout,
+    child: V,
+    target: View,
+    velocityX: Float,
+    velocityY: Float
+  ): Boolean {
+    // Don't consume flings — let the ScrollView decelerate naturally
+    if (!scrollingExpandsSheet) return false
+    return super.onNestedPreFling(coordinatorLayout, child, target, velocityX, velocityY)
+  }
+}

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

@@ -14,6 +14,7 @@ import android.view.View
 import android.view.ViewOutlineProvider
 import android.widget.FrameLayout
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.ThemedReactContext
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -32,6 +33,8 @@ interface TrueSheetBottomSheetViewDelegate {
   val grabberOptions: GrabberOptions?
   val draggable: Boolean
   fun bottomSheetViewDidTapGrabber()
+  fun bottomSheetViewDidAccessibilityIncrement()
+  fun bottomSheetViewDidAccessibilityDecrement()
 }
 
 /**
@@ -63,9 +66,9 @@ class TrueSheetBottomSheetView(private val reactContext: ThemedReactContext) : F
 
   // Behavior reference (set after adding to CoordinatorLayout)
   @Suppress("UNCHECKED_CAST")
-  val behavior: BottomSheetBehavior<TrueSheetBottomSheetView>?
+  val behavior: TrueSheetBottomSheetBehavior<TrueSheetBottomSheetView>?
     get() = (layoutParams as? CoordinatorLayout.LayoutParams)
-      ?.behavior as? BottomSheetBehavior<TrueSheetBottomSheetView>
+      ?.behavior as? TrueSheetBottomSheetBehavior<TrueSheetBottomSheetView>
 
   // =============================================================================
   // MARK: - Initialization
@@ -75,6 +78,8 @@ class TrueSheetBottomSheetView(private val reactContext: ThemedReactContext) : F
     // Allow content to extend beyond bounds (for footer positioning)
     clipChildren = false
     clipToPadding = false
+
+    ViewCompat.setAccessibilityPaneTitle(this, "Bottom sheet")
   }
 
   override fun setTranslationY(translationY: Float) {
@@ -106,7 +111,7 @@ class TrueSheetBottomSheetView(private val reactContext: ThemedReactContext) : F
   fun createLayoutParams(): CoordinatorLayout.LayoutParams {
     val applyMaxWidth = delegate?.maxContentWidth != null && !ScreenUtils.isPortraitPhone(reactContext)
     val effectiveMaxWidth = if (applyMaxWidth) delegate!!.maxContentWidth!! else DEFAULT_MAX_WIDTH.dpToPx().toInt()
-    val behavior = BottomSheetBehavior<TrueSheetBottomSheetView>().apply {
+    val behavior = TrueSheetBottomSheetBehavior<TrueSheetBottomSheetView>().apply {
       isHideable = true
       maxWidth = effectiveMaxWidth
     }
@@ -196,11 +201,17 @@ class TrueSheetBottomSheetView(private val reactContext: ThemedReactContext) : F
 
     val grabberView = TrueSheetGrabberView(reactContext, delegate?.grabberOptions).apply {
       tag = GRABBER_TAG
+      onAccessibilityIncrement = { delegate?.bottomSheetViewDidAccessibilityIncrement() }
+      onAccessibilityDecrement = { delegate?.bottomSheetViewDidAccessibilityDecrement() }
     }
 
     addView(grabberView)
   }
 
+  fun updateGrabberAccessibilityValue(index: Int, detentCount: Int) {
+    findViewWithTag<TrueSheetGrabberView>(GRABBER_TAG)?.updateAccessibilityValue(index, detentCount)
+  }
+
   // =============================================================================
   // MARK: - Grabber Tap Detection
   // =============================================================================

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

@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.res.Configuration
 import android.view.MotionEvent
 import android.view.ViewConfiguration
-import android.widget.ScrollView
+import android.view.ViewGroup
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.facebook.react.uimanager.PointerEvents
@@ -15,7 +15,7 @@ import com.lodev09.truesheet.utils.isDescendantOf
 interface TrueSheetCoordinatorLayoutDelegate {
   fun coordinatorLayoutDidLayout(changed: Boolean)
   fun coordinatorLayoutDidChangeConfiguration()
-  fun findScrollView(): ScrollView?
+  fun findScrollView(): ViewGroup?
   fun findSheetView(): TrueSheetBottomSheetView?
 }
 
@@ -75,7 +75,7 @@ class TrueSheetCoordinatorLayout(context: Context) :
     val sheet = delegate?.findSheetView() ?: return
     val behavior = sheet.behavior ?: return
     try {
-      val field = behavior.javaClass.getDeclaredField("nestedScrollingChildRef")
+      val field = behavior.javaClass.superclass.getDeclaredField("nestedScrollingChildRef")
       field.isAccessible = true
       @Suppress("UNCHECKED_CAST")
       val ref = field.get(behavior) as? java.lang.ref.WeakReference<android.view.View> ?: return

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

@@ -29,7 +29,7 @@ interface TrueSheetDimViewDelegate {
  * This implements the "dimmedDetentIndex" equivalent functionality:
  * the view only becomes interactive when the sheet is at or above the dimmed detent.
  */
-@SuppressLint("ViewConstructor", "ClickableViewAccessibility")
+@SuppressLint("ViewConstructor")
 class TrueSheetDimView(private val reactContext: ThemedReactContext) :
   View(reactContext),
   ReactPointerEventsView {
@@ -60,6 +60,8 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) :
     setOnClickListener {
       delegate?.dimViewDidTap()
     }
+
+    importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO
   }
 
   // =============================================================================