@lodev09/react-native-true-sheet 3.11.9 → 3.11.10

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

@@ -68,6 +68,12 @@ class TrueSheetFooterView(private val reactContext: ThemedReactContext) :
     return super.onInterceptTouchEvent(event)
   }
 
+  override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
+    // Mirrors ReactSurfaceView: keep receiving onInterceptTouchEvent so
+    // jsTouchDispatcher sees the gesture end, but forward the request up the tree.
+    parent?.requestDisallowInterceptTouchEvent(disallowIntercept)
+  }
+
   override fun onTouchEvent(event: MotionEvent): Boolean {
     if (pointerEvents == PointerEvents.NONE || pointerEvents == PointerEvents.BOX_NONE) {
       return false

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

@@ -15,6 +15,7 @@ import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.util.RNLog
 import com.facebook.react.views.view.ReactViewGroup
+import com.lodev09.truesheet.core.AccessibilityOptions
 import com.lodev09.truesheet.core.GrabberOptions
 import com.lodev09.truesheet.core.RNScreensEventObserver
 import com.lodev09.truesheet.core.RNScreensEventObserverDelegate
@@ -223,6 +224,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     if (viewController.isPresented) {
       viewController.setupDimmedBackground()
       viewController.updateDimAmount()
+      TrueSheetStackManager.updateBackgroundAccessibility()
     }
   }
 
@@ -232,6 +234,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     if (viewController.isPresented) {
       viewController.setupDimmedBackground()
       viewController.updateDimAmount()
+      TrueSheetStackManager.updateBackgroundAccessibility()
     }
   }
 
@@ -261,6 +264,10 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     viewController.grabberOptions = options
   }
 
+  fun setAccessibilityOptions(options: AccessibilityOptions?) {
+    viewController.accessibilityOptions = options
+  }
+
   fun setSheetElevation(elevation: Float) {
     viewController.sheetElevation = elevation
   }

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

@@ -6,6 +6,7 @@ import android.os.Build
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import android.view.accessibility.AccessibilityEvent
 import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.ImageView
 import androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -22,6 +23,7 @@ import com.facebook.react.uimanager.events.EventDispatcher
 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.AccessibilityOptions
 import com.lodev09.truesheet.core.GrabberOptions
 import com.lodev09.truesheet.core.TrueSheetBottomSheetBehavior
 import com.lodev09.truesheet.core.TrueSheetBottomSheetView
@@ -212,6 +214,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   var dimmedDetentIndex = 0
   override var grabber: Boolean = true
   override var grabberOptions: GrabberOptions? = null
+  override var accessibilityOptions: AccessibilityOptions? = null
   override var sheetBackgroundColor: Int? = null
   var insetAdjustment: TrueSheetInsetAdjustment = TrueSheetInsetAdjustment.AUTOMATIC
 
@@ -310,7 +313,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   val bottomInset: Int
     get() = if (edgeToEdgeEnabled) ScreenUtils.getInsets(reactContext).bottom else 0
 
-  val topInset: Int
+  override val topInset: Int
     get() = if (edgeToEdgeEnabled) ScreenUtils.getInsets(reactContext).top else 0
 
   override val contentBottomInset: Int
@@ -634,6 +637,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     if (!isKeyboardTransitioning) {
       updateDimAmount(animated = true)
     }
+
+    TrueSheetStackManager.updateBackgroundAccessibility()
   }
 
   // =============================================================================
@@ -653,6 +658,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
     isSheetVisible = false
     wasHiddenByScreen = true
+    TrueSheetStackManager.updateBackgroundAccessibility()
     delegate?.viewControllerDidChangeVisibility(false)
     dimViews.forEach { it.animate().alpha(0f).setDuration(SCREEN_FADE_DURATION).start() }
     sheet.animate()
@@ -673,6 +679,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     setSheetVisibility(true)
     sheetView?.alpha = 1f
     updateDimAmount(animated = true)
+    TrueSheetStackManager.updateBackgroundAccessibility()
   }
 
   /**
@@ -709,6 +716,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     sheet.setupBackground()
     sheet.setupElevation()
     sheet.setupGrabber()
+    sheet.setupAccessibility()
 
     if (shouldAnimatePresent) {
       isPresentAnimating = true
@@ -821,11 +829,16 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     delegate?.viewControllerDidFocus()
     sheetView?.updateGrabberAccessibilityValue(index, detents.size)
 
+    TrueSheetStackManager.updateBackgroundAccessibility()
+    // Move accessibility focus into the sheet
+    sheetView?.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED)
+
     presentPromise?.invoke()
     presentPromise = null
   }
 
   private fun finishDismiss() {
+    TrueSheetStackManager.updateBackgroundAccessibility()
     restoreFocusedView()
     emitDidDismissEvents()
     cleanupSheet()
@@ -1145,8 +1158,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     // keyboard-expanded position and a non-keyboard detent position. If so, dismiss
     // keyboard and commit to that detent.
     val maxAvailableHeight = realScreenHeight - topInset
-    val keyboardHeight = minOf(detentCalculator.getDetentHeight(detents.last()), maxAvailableHeight)
-    val keyboardTop = realScreenHeight - keyboardHeight
+    val keyboardTop = detentCalculator.getSheetTopForDetentIndex(detents.size - 1)
 
     for (i in detents.indices) {
       val nonKeyboardHeight = minOf(detentCalculator.getDetentHeight(detents[i], includeKeyboard = false), maxAvailableHeight)
@@ -1348,6 +1360,12 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     return super.onInterceptTouchEvent(event)
   }
 
+  override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
+    // Mirrors ReactSurfaceView: keep receiving onInterceptTouchEvent so
+    // jsTouchDispatcher sees the gesture end, but forward the request up the tree.
+    parent?.requestDisallowInterceptTouchEvent(disallowIntercept)
+  }
+
   override fun onTouchEvent(event: MotionEvent): Boolean {
     eventDispatcher?.let {
       jsTouchDispatcher.handleTouchEvent(event, it, reactContext)

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

@@ -14,6 +14,7 @@ import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.TrueSheetViewManagerDelegate
 import com.facebook.react.viewmanagers.TrueSheetViewManagerInterface
+import com.lodev09.truesheet.core.AccessibilityOptions
 import com.lodev09.truesheet.core.GrabberOptions
 import com.lodev09.truesheet.events.*
 
@@ -136,6 +137,25 @@ class TrueSheetViewManager :
     view.setGrabberOptions(grabberOptions)
   }
 
+  @ReactProp(name = "accessibilityOptions")
+  override fun setAccessibilityOptions(view: TrueSheetView, options: ReadableMap?) {
+    if (options == null) {
+      view.setAccessibilityOptions(null)
+      return
+    }
+
+    val accessibilityOptions = AccessibilityOptions(
+      grabberLabel = if (options.hasKey("grabberLabel")) options.getString("grabberLabel") else null,
+      expandedValue = if (options.hasKey("expandedValue")) options.getString("expandedValue") else null,
+      collapsedValue = if (options.hasKey("collapsedValue")) options.getString("collapsedValue") else null,
+      detentValue = if (options.hasKey("detentValue")) options.getString("detentValue") else null,
+      expandActionLabel = if (options.hasKey("expandActionLabel")) options.getString("expandActionLabel") else null,
+      collapseActionLabel = if (options.hasKey("collapseActionLabel")) options.getString("collapseActionLabel") else null,
+      paneTitle = if (options.hasKey("paneTitle")) options.getString("paneTitle") else null
+    )
+    view.setAccessibilityOptions(accessibilityOptions)
+  }
+
   @ReactProp(name = "dismissible", defaultBoolean = true)
   override fun setDismissible(view: TrueSheetView, dismissible: Boolean) {
     view.setDismissible(dismissible)

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

@@ -31,6 +31,7 @@ interface TrueSheetBottomSheetViewDelegate {
   val anchorOffset: Int
   val grabber: Boolean
   val grabberOptions: GrabberOptions?
+  val accessibilityOptions: AccessibilityOptions?
   val draggable: Boolean
   fun bottomSheetViewDidTapGrabber()
   fun bottomSheetViewDidAccessibilityIncrement()
@@ -78,8 +79,6 @@ 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) {
@@ -195,23 +194,37 @@ class TrueSheetBottomSheetView(private val reactContext: ThemedReactContext) : F
   fun setupGrabber() {
     findViewWithTag<View>(GRABBER_TAG)?.let { removeView(it) }
 
+    // Content view is the controller, added before the grabber (delegate is the controller)
+    val contentView = delegate as? View
+
     val isEnabled = delegate?.grabber ?: true
     val isDraggable = delegate?.draggable ?: true
-    if (!isEnabled || !isDraggable) return
+    if (!isEnabled || !isDraggable) {
+      contentView?.accessibilityTraversalAfter = View.NO_ID
+      return
+    }
 
-    val grabberView = TrueSheetGrabberView(reactContext, delegate?.grabberOptions).apply {
+    val grabberView = TrueSheetGrabberView(reactContext, delegate?.grabberOptions, delegate?.accessibilityOptions).apply {
       tag = GRABBER_TAG
+      id = View.generateViewId()
       onAccessibilityIncrement = { delegate?.bottomSheetViewDidAccessibilityIncrement() }
       onAccessibilityDecrement = { delegate?.bottomSheetViewDidAccessibilityDecrement() }
     }
 
     addView(grabberView)
+
+    // Grabber is added after content for z-ordering, but should be announced first
+    contentView?.accessibilityTraversalAfter = grabberView.id
   }
 
   fun updateGrabberAccessibilityValue(index: Int, detentCount: Int) {
     findViewWithTag<TrueSheetGrabberView>(GRABBER_TAG)?.updateAccessibilityValue(index, detentCount)
   }
 
+  fun setupAccessibility() {
+    ViewCompat.setAccessibilityPaneTitle(this, delegate?.accessibilityOptions?.paneTitle ?: "Bottom sheet")
+  }
+
   // =============================================================================
   // MARK: - Grabber Tap Detection
   // =============================================================================

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

@@ -20,6 +20,7 @@ interface TrueSheetDetentCalculatorDelegate {
   val contentBottomInset: Int
   val maxContentHeight: Int?
   val keyboardInset: Int
+  val topInset: Int
 }
 
 /**
@@ -39,6 +40,7 @@ class TrueSheetDetentCalculator(private val reactContext: ThemedReactContext) {
   private val contentBottomInset: Int get() = delegate?.contentBottomInset ?: 0
   private val maxContentHeight: Int? get() = delegate?.maxContentHeight
   private val keyboardInset: Int get() = delegate?.keyboardInset ?: 0
+  private val topInset: Int get() = delegate?.topInset ?: 0
 
   /**
    * Height for peek (-2.0) detents: header + footer + peek content height.
@@ -79,7 +81,12 @@ class TrueSheetDetentCalculator(private val reactContext: ThemedReactContext) {
       RNLog.w(reactContext, "TrueSheet: Detent index ($index) is out of bounds (0..${detents.size - 1})")
       return realScreenHeight
     }
-    return realScreenHeight - getDetentHeight(detents[index])
+    // Clamp to the space the sheet can actually occupy — matching
+    // setupSheetDetents. A keyboard-inflated detent height can exceed it,
+    // placing the expected top above the screen while the real sheet stops
+    // at the top inset.
+    val maxAvailableHeight = realScreenHeight - topInset
+    return realScreenHeight - minOf(getDetentHeight(detents[index]), maxAvailableHeight)
   }
 
   /**
@@ -187,6 +194,10 @@ class TrueSheetDetentCalculator(private val reactContext: ThemedReactContext) {
       val pos = getSheetTopForDetentIndex(i)
       val nextPos = getSheetTopForDetentIndex(i + 1)
 
+      // Skip degenerate segments — keyboard growth can clamp adjacent detents
+      // to the same top; falling through reports the topmost detent
+      if (pos == nextPos) continue
+
       if (positionPx in nextPos..pos) {
         val range = pos - nextPos
         val progress = if (range > 0) (pos - positionPx).toFloat() / range else 0f

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

@@ -26,12 +26,29 @@ data class GrabberOptions(
   val adaptive: Boolean = true
 )
 
+/**
+ * Options for customizing (e.g. localizing) accessibility strings.
+ */
+data class AccessibilityOptions(
+  val grabberLabel: String? = null,
+  val expandedValue: String? = null,
+  val collapsedValue: String? = null,
+  val detentValue: String? = null,
+  val expandActionLabel: String? = null,
+  val collapseActionLabel: String? = null,
+  val paneTitle: String? = null
+)
+
 /**
  * Native grabber (drag handle) view for the bottom sheet.
  * Displays a small pill-shaped indicator at the top of the sheet with a tappable hitbox.
  */
 @SuppressLint("ViewConstructor")
-class TrueSheetGrabberView(context: Context, private val options: GrabberOptions? = null) : FrameLayout(context) {
+class TrueSheetGrabberView(
+  context: Context,
+  private val options: GrabberOptions? = null,
+  private val accessibilityOptions: AccessibilityOptions? = null
+) : FrameLayout(context) {
 
   companion object {
     private const val DEFAULT_WIDTH = 32f // dp
@@ -94,7 +111,7 @@ class TrueSheetGrabberView(context: Context, private val options: GrabberOptions
     addView(pillView)
 
     isFocusable = true
-    contentDescription = "Sheet Grabber"
+    contentDescription = accessibilityOptions?.grabberLabel ?: "Drag handle"
 
     accessibilityDelegate = object : View.AccessibilityDelegate() {
       override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfo) {
@@ -102,13 +119,13 @@ class TrueSheetGrabberView(context: Context, private val options: GrabberOptions
         info.addAction(
           AccessibilityNodeInfo.AccessibilityAction(
             AccessibilityNodeInfo.ACTION_SCROLL_FORWARD,
-            "Expand"
+            accessibilityOptions?.expandActionLabel ?: "Expand"
           )
         )
         info.addAction(
           AccessibilityNodeInfo.AccessibilityAction(
             AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD,
-            "Collapse"
+            accessibilityOptions?.collapseActionLabel ?: "Collapse"
           )
         )
         info.className = "android.widget.SeekBar"
@@ -134,9 +151,15 @@ class TrueSheetGrabberView(context: Context, private val options: GrabberOptions
   fun updateAccessibilityValue(index: Int, detentCount: Int) {
     val description: CharSequence? = when {
       index < 0 || detentCount <= 0 -> null
-      index >= detentCount - 1 -> "Expanded"
-      index == 0 -> "Collapsed"
-      else -> "Detent ${index + 1} of $detentCount"
+
+      index >= detentCount - 1 -> accessibilityOptions?.expandedValue ?: "Expanded"
+
+      index == 0 -> accessibilityOptions?.collapsedValue ?: "Collapsed"
+
+      else ->
+        (accessibilityOptions?.detentValue ?: "Detent {index} of {count}")
+          .replace("{index}", "${index + 1}")
+          .replace("{count}", "$detentCount")
     }
     ViewCompat.setStateDescription(this, description)
   }

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

@@ -1,5 +1,6 @@
 package com.lodev09.truesheet.core
 
+import android.view.View
 import android.view.ViewGroup
 import com.lodev09.truesheet.TrueSheetView
 
@@ -143,6 +144,57 @@ object TrueSheetStackManager {
     }
   }
 
+  private val savedBackgroundImportance = HashMap<View, Int>()
+
+  /**
+   * Hides views behind the topmost dimmed (modal) sheet from accessibility,
+   * mirroring BottomSheetDialog behavior. Sheets live in the same window as
+   * the app content, so without this TalkBack can traverse behind the sheet.
+   *
+   * Derived from the current stack state and idempotent — call whenever a
+   * sheet presents, dismisses, settles, or changes its dim state.
+   */
+  @JvmStatic
+  fun updateBackgroundAccessibility() {
+    synchronized(presentedSheetStack) {
+      val topDimmedIndex = presentedSheetStack.indexOfLast {
+        it.viewController.run { isPresented && isSheetVisible && !isBeingDismissed && isDimmedAtCurrentDetent }
+      }
+      val topDimmed = presentedSheetStack.getOrNull(topDimmedIndex)
+      val root = topDimmed?.viewController?.coordinatorLayout?.parent as? ViewGroup
+
+      if (root == null) {
+        restoreBackgroundAccessibility()
+        return
+      }
+
+      // The dimmed sheet and any sheets above it stay accessible
+      val accessibleCoordinators = presentedSheetStack
+        .subList(topDimmedIndex, presentedSheetStack.size)
+        .mapNotNull { it.viewController.coordinatorLayout }
+        .toSet()
+
+      for (i in 0 until root.childCount) {
+        val child = root.getChildAt(i)
+        if (child in accessibleCoordinators) {
+          savedBackgroundImportance.remove(child)?.let { child.importantForAccessibility = it }
+          continue
+        }
+        if (!savedBackgroundImportance.containsKey(child)) {
+          savedBackgroundImportance[child] = child.importantForAccessibility
+        }
+        child.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
+      }
+    }
+  }
+
+  private fun restoreBackgroundAccessibility() {
+    savedBackgroundImportance.forEach { (view, importance) ->
+      view.importantForAccessibility = importance
+    }
+    savedBackgroundImportance.clear()
+  }
+
   /**
    * Returns the root presented sheet for dismissAll.
    * Starts from the topmost sheet and walks up to find the root of its stack.

package/ios/TrueSheetView.mm

@@ -230,6 +230,9 @@ using namespace facebook::react;
     _controller.grabberOptions = nil;
   }
 
+  // Accessibility options - applied to the custom grabber
+  _controller.accessibilityOptions = newProps.accessibilityOptions;
+
   _controller.presentation = newProps.presentation;
   _controller.dismissible = newProps.dismissible;
   _controller.draggable = newProps.draggable;

package/ios/TrueSheetViewController.h

@@ -63,6 +63,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, nullable) NSNumber *cornerRadius;
 @property (nonatomic, assign) BOOL grabber;
 @property (nonatomic, strong, nullable) GrabberOptions *grabberOptions;
+@property (nonatomic, assign) facebook::react::TrueSheetViewAccessibilityOptionsStruct accessibilityOptions;
 @property (nonatomic, assign) BOOL draggable;
 @property (nonatomic, assign) BOOL dimmed;
 @property (nonatomic, strong, nullable) NSNumber *dimmedDetentIndex;
@@ -77,6 +78,13 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL dismissible;
 @property (nonatomic, assign) BOOL isPresented;
 @property (nonatomic, assign) NSInteger activeDetentIndex;
+
+/**
+ * YES while the keyboard has the sheet grown beyond its detent height.
+ * Offset learning is skipped in this state — the measured frame would bake
+ * ~keyboardHeight into the learned offset.
+ */
+@property (nonatomic, assign) BOOL keyboardSheetGrown;
 @property (nonatomic, readonly) BOOL isTopmostPresentedController;
 @property (nonatomic, weak, nullable) UIView *accessibilityContentView;
 

package/ios/TrueSheetViewController.mm

@@ -460,6 +460,10 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
     [self endInteractiveDismissState];
   }
 
+  // Dismissing with the keyboard up skips the hide notification — don't let
+  // the stale flag block learning on the next present.
+  _keyboardSheetGrown = NO;
+
   [self emitDidDismissEvents];
 }
 
@@ -478,6 +482,21 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
     } else {
       UIViewController *presented = self.presentedViewController;
       BOOL hasPresentedController = presented != nil && !presented.isBeingPresented && !presented.isBeingDismissed;
+
+      // A layout pass at rest can nudge the frame by a sub-pixel amount
+      // (pixel-grid snapping after present), leaving the interpolated index
+      // slightly off the whole number. Re-learn when the frame is effectively
+      // at the current detent so the drift is absorbed instead of emitted.
+      // The tight threshold keeps real movement from being absorbed.
+      if (presented == nil && !_isDragging) {
+        NSInteger index = self.currentDetentIndex;
+        CGFloat expectedHeight = [_detentCalculator resolvedHeightForIndex:index];
+        CGFloat actualHeight = self.screenHeight - self.currentPosition;
+        if (expectedHeight > 0 && fabs(actualHeight - expectedHeight) < 2) {
+          [self learnOffsetForDetentIndex:index];
+        }
+      }
+
       [self emitChangePositionDelegateWithPosition:self.currentPosition
                                           realtime:!hasPresentedController
                                              debug:@"layout"];
@@ -636,13 +655,13 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
       strongSelf->_isTransitioning = NO;
       strongSelf->_isTransitionSnapping = NO;
 
-      // Emit settled position after detent snap.
+      // Settle after a present or detent-snap transition.
       // Uses dispatch_after because presentedView frame isn't final until UIKit
-      // completes its layout pass after the transition animation.
+      // completes its layout pass after the transition animation — learning
+      // here absorbs any sub-pixel drift since the earlier learns.
       if (strongSelf->_isPresented) {
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-          CGFloat position = strongSelf.currentPosition;
-          [strongSelf emitChangePositionDelegateWithPosition:position realtime:NO debug:@"transition end"];
+          [strongSelf settleAtDetentIndex:strongSelf.currentDetentIndex debug:@"transition end"];
         });
       }
     }];
@@ -798,7 +817,10 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
     .index = [self interpolatedIndexForPosition:position],
   };
 
-  if (!TrueSheetPositionStateEquals(_lastEmittedPositionState, state)) {
+  // Settle (non-realtime) emits are authoritative and bypass the dedupe — a
+  // learn right before them can correct the interpolated index by less than
+  // the tolerance, and the corrected value must still reach JS.
+  if (!realtime || !TrueSheetPositionStateEquals(_lastEmittedPositionState, state)) {
     _lastEmittedPositionState = state;
 
     [self.delegate viewControllerDidChangePosition:state.index
@@ -809,9 +831,24 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
 }
 
 - (void)learnOffsetForDetentIndex:(NSInteger)index {
+  if (_keyboardSheetGrown) {
+    return;
+  }
   [_detentCalculator learnOffsetForDetentIndex:index];
 }
 
+- (void)setKeyboardSheetGrown:(BOOL)keyboardSheetGrown {
+  BOOL wasGrown = _keyboardSheetGrown;
+  _keyboardSheetGrown = keyboardSheetGrown;
+
+  // Settles are skipped or measure a mid-animation frame while the keyboard
+  // has the sheet grown (e.g. a drag-end during the shrink-back) — re-settle
+  // at the resting detent once the keyboard is fully away.
+  if (wasGrown && !keyboardSheetGrown && self.isPresented && !_isDragging) {
+    [self settleAtDetentIndex:self.currentDetentIndex debug:@"keyboard settled"];
+  }
+}
+
 /**
  * Learn the resolver-vs-actual offset at a settled detent, then emit the corrected
  * position. Only valid when presentedView's frame is final — never mid-drag or
@@ -1065,6 +1102,7 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
     self.sheet.prefersGrabberVisible = NO;
 
     GrabberOptions *options = self.grabberOptions;
+    _grabberView.accessibilityOptions = self.accessibilityOptions;
     _grabberView.grabberWidth = options.width;
     _grabberView.grabberHeight = options.height;
     _grabberView.topMargin = options.topMargin;

package/ios/core/TrueSheetDetentCalculator.h

@@ -55,6 +55,12 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)learnOffsetForDetentIndex:(NSInteger)index;
 
+/**
+ Returns the expected sheet height for a detent index: the UIKit-resolved
+ height plus the learned offset.
+ */
+- (CGFloat)resolvedHeightForIndex:(NSInteger)index;
+
 /**
  Finds the segment between detents for a given position.
  Returns YES if position is between two detents, NO if at edges.

package/ios/core/TrueSheetGrabberView.h

@@ -7,6 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
+#import <react/renderer/components/TrueSheetSpec/Props.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -45,6 +46,9 @@ NS_ASSUME_NONNULL_BEGIN
 /// Whether the grabber color adapts to the background (default: YES)
 @property (nonatomic, strong, nullable) NSNumber *adaptive;
 
+/// Accessibility strings (defaults come from the codegen prop defaults)
+@property (nonatomic, assign) facebook::react::TrueSheetViewAccessibilityOptionsStruct accessibilityOptions;
+
 /// Called when the grabber is tapped
 @property (nonatomic, copy, nullable) void (^onTap)(void);
 

package/ios/core/TrueSheetGrabberView.mm

@@ -8,6 +8,10 @@
 
 #import "TrueSheetGrabberView.h"
 
+#import <React/RCTConversions.h>
+
+using namespace facebook::react;
+
 @implementation GrabberOptions
 
 - (instancetype)init {
@@ -66,9 +70,7 @@ static const CGFloat kHitPaddingVertical = 10.0;
 - (void)setupView {
   self.clipsToBounds = NO;
   self.isAccessibilityElement = YES;
-  self.accessibilityLabel = @"Sheet Grabber";
   self.accessibilityTraits = UIAccessibilityTraitAdjustable | UIAccessibilityTraitButton;
-  self.accessibilityHint = @"Double-tap to expand. Swipe up or down to resize the sheet";
 
   UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap)];
   [self addGestureRecognizer:tap];
@@ -103,6 +105,12 @@ static const CGFloat kHitPaddingVertical = 10.0;
 
 #pragma mark - Public
 
+- (void)setAccessibilityOptions:(TrueSheetViewAccessibilityOptionsStruct)accessibilityOptions {
+  _accessibilityOptions = accessibilityOptions;
+  self.accessibilityLabel = RCTNSStringFromStringNilIfEmpty(accessibilityOptions.grabberLabel);
+  self.accessibilityHint = RCTNSStringFromStringNilIfEmpty(accessibilityOptions.grabberHint);
+}
+
 - (void)updateAccessibilityValueWithIndex:(NSInteger)index detentCount:(NSInteger)count {
   if (index < 0 || count <= 0) {
     self.accessibilityValue = nil;
@@ -110,11 +118,13 @@ static const CGFloat kHitPaddingVertical = 10.0;
   }
 
   if (index >= count - 1) {
-    self.accessibilityValue = @"Expanded";
+    self.accessibilityValue = RCTNSStringFromStringNilIfEmpty(_accessibilityOptions.expandedValue);
   } else if (index == 0) {
-    self.accessibilityValue = @"Collapsed";
+    self.accessibilityValue = RCTNSStringFromStringNilIfEmpty(_accessibilityOptions.collapsedValue);
   } else {
-    self.accessibilityValue = [NSString stringWithFormat:@"Detent %ld of %ld", (long)(index + 1), (long)count];
+    NSString *value = RCTNSStringFromStringNilIfEmpty(_accessibilityOptions.detentValue);
+    value = [value stringByReplacingOccurrencesOfString:@"{index}" withString:@(index + 1).stringValue];
+    self.accessibilityValue = [value stringByReplacingOccurrencesOfString:@"{count}" withString:@(count).stringValue];
   }
 }
 

package/ios/core/TrueSheetKeyboardObserver.mm

@@ -83,6 +83,21 @@
 
   _currentHeight = keyboardHeight;
 
+  if (keyboardHeight > 0) {
+    _viewController.keyboardSheetGrown = YES;
+  } else {
+    // The sheet stays grown until UIKit finishes the shrink-back animation —
+    // clear after it completes, unless the keyboard came back in the meantime.
+    __weak __typeof(self) weakSelf = self;
+    dispatch_after(
+      dispatch_time(DISPATCH_TIME_NOW, (int64_t)((duration + 0.1) * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        __strong __typeof(weakSelf) strongSelf = weakSelf;
+        if (strongSelf && strongSelf->_currentHeight == 0) {
+          strongSelf->_viewController.keyboardSheetGrown = NO;
+        }
+      });
+  }
+
   for (id<TrueSheetKeyboardObserverDelegate> delegate in _delegates) {
     if (keyboardHeight > 0) {
       [delegate keyboardWillShow:keyboardHeight duration:duration curve:curve];