@lodev09/react-native-true-sheet 4.0.0-beta.24 → 4.0.0-beta.26

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

@@ -1,10 +1,8 @@
 package com.lodev09.truesheet
 
 import android.view.WindowManager
-import com.facebook.react.bridge.ColorPropConverter
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.ReadableType
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.PointerEvents
@@ -20,6 +18,7 @@ import com.facebook.react.viewmanagers.TrueSheetViewManagerInterface
 import com.lodev09.truesheet.core.AccessibilityOptions
 import com.lodev09.truesheet.core.GrabberOptions
 import com.lodev09.truesheet.events.*
+import com.lodev09.truesheet.utils.getColorOrNull
 
 /**
  * ViewManager for TrueSheetView - Fabric architecture
@@ -120,13 +119,7 @@ class TrueSheetViewManager :
   override fun setDetentBackgrounds(view: TrueSheetView, value: ReadableArray?) {
     view.setDetentBackgrounds(
       (0 until (value?.size() ?: 0)).map { index ->
-        val entry = value?.getMap(index)
-        if (entry != null && entry.hasKey("color") && !entry.isNull("color")) {
-          val color = if (entry.getType("color") == ReadableType.Map) entry.getMap("color") else entry.getDouble("color")
-          ColorPropConverter.getColor(color, view.context)
-        } else {
-          null
-        }
+        value?.getMap(index)?.getColorOrNull("color", view.context)
       }
     )
   }
@@ -164,7 +157,7 @@ class TrueSheetViewManager :
       } else {
         null
       },
-      color = if (options.hasKey("color") && !options.isNull("color")) options.getInt("color") else null,
+      color = options.getColorOrNull("color", view.context),
       adaptive = if (options.hasKey("adaptive")) options.getBoolean("adaptive") else true
     )
     view.setGrabberOptions(grabberOptions)
@@ -209,6 +202,16 @@ class TrueSheetViewManager :
     view.setDimmed(dimmed)
   }
 
+  @ReactProp(name = "dimColor", customType = "Color")
+  override fun setDimColor(view: TrueSheetView, color: Int?) {
+    view.setDimColor(color)
+  }
+
+  @ReactProp(name = "dimOpacity", defaultDouble = -1.0)
+  override fun setDimOpacity(view: TrueSheetView, opacity: Double) {
+    view.setDimOpacity(opacity.toFloat())
+  }
+
   @ReactProp(name = "dimmedDetentIndex", defaultInt = 0)
   override fun setDimmedDetentIndex(view: TrueSheetView, index: Int) {
     view.setDimmedDetentIndex(index)
@@ -250,6 +253,11 @@ class TrueSheetViewManager :
     // iOS-specific prop - no-op on Android
   }
 
+  @ReactProp(name = "foldOptions")
+  override fun setFoldOptions(view: TrueSheetView, options: ReadableMap?) {
+    // iOS-specific prop - no-op on Android
+  }
+
   @ReactProp(name = "insetAdjustment")
   override fun setInsetAdjustment(view: TrueSheetView, insetAdjustment: String?) {
     view.setInsetAdjustment(insetAdjustment ?: "automatic")

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

@@ -22,6 +22,15 @@ class RNScreensEventObserver : EventDispatcherListener {
   private var eventDispatcher: EventDispatcher? = null
   var presenterScreenTag: Int = 0
 
+  // Screens enclosing the presenter. react-native-screens only dispatches lifecycle
+  // events for stack screens, so a presenter inside a plain screen container (e.g. a
+  // bottom tab) never receives them and an enclosing stack screen has to stand in.
+  var ancestorScreenTags: Set<Int> = emptySet()
+
+  // Only the screen that hid the sheet brings it back. An enclosing screen reappearing
+  // must not reveal a sheet whose own screen is still covered inside it.
+  private var disappearedScreenTag: Int = 0
+
   fun startObserving(dispatcher: EventDispatcher?) {
     if (eventDispatcher != null || dispatcher == null) return
 
@@ -35,29 +44,37 @@ class RNScreensEventObserver : EventDispatcherListener {
   }
 
   fun capturePresenterScreenFromView(view: View?) {
-    presenterScreenTag = 0
-
-    var current: View? = view
-    while (current != null) {
-      if (isScreenView(current)) {
-        presenterScreenTag = current.id
-        break
-      }
-      current = (current.parent as? View)
-    }
+    val tags = screenTags(view).toList()
+    presenterScreenTag = tags.firstOrNull() ?: 0
+    ancestorScreenTags = tags.drop(1).toSet()
   }
 
   override fun onEventDispatch(event: Event<*>) {
-    // Only process events for the presenter screen
-    if (presenterScreenTag == 0 || event.viewTag != presenterScreenTag) return
+    // Only process events for the presenter screen and the screens enclosing it
+    if (presenterScreenTag == 0) return
+    if (event.viewTag != presenterScreenTag && event.viewTag !in ancestorScreenTags) return
 
     when (event.eventName) {
-      "topWillDisappear" -> delegate?.presenterScreenWillDisappear()
-      "topWillAppear" -> delegate?.presenterScreenWillAppear()
+      "topWillDisappear" -> {
+        if (disappearedScreenTag != 0) return
+        disappearedScreenTag = event.viewTag
+        delegate?.presenterScreenWillDisappear()
+      }
+
+      "topWillAppear" -> {
+        if (event.viewTag != disappearedScreenTag) return
+        disappearedScreenTag = 0
+        delegate?.presenterScreenWillAppear()
+      }
     }
   }
 
   companion object {
     private fun isScreenView(view: View): Boolean = view.javaClass.name == RN_SCREENS_VIEW_CLASS
+
+    // Tags of the screens enclosing the view, innermost first
+    private fun screenTags(view: View?): Sequence<Int> = generateSequence(view) { it.parent as? View }.filter(::isScreenView).map { it.id }
+
+    fun findPresenterScreenTag(view: View?): Int = screenTags(view).firstOrNull() ?: 0
   }
 }

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

@@ -40,6 +40,15 @@ class TrueSheetBottomSheetBehavior<V : View> : BottomSheetBehavior<V>() {
     hideFriction = HIDE_FRICTION
   }
 
+  // Material's first layout registers an IME callback that rides the sheet's translationY
+  // with the keyboard. TrueSheet positions sheets for the keyboard itself, and the callback
+  // overwrites a parent's stack translation when the keyboard rises mid-translation.
+  override fun onLayoutChild(parent: CoordinatorLayout, child: V, layoutDirection: Int): Boolean {
+    val handled = super.onLayoutChild(parent, child, layoutDirection)
+    ViewCompat.setWindowInsetsAnimationCallback(child, null)
+    return handled
+  }
+
   // With the short threshold, settle at or below the lowest detent like
   // Compose Material3's sheet instead of Material's half-height rule.
   private fun releaseState(child: V, dragged: Boolean, velocityY: Float): Int? {

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

@@ -1,7 +1,6 @@
 package com.lodev09.truesheet.core
 
 import android.annotation.SuppressLint
-import android.content.res.Configuration
 import android.graphics.Color
 import android.graphics.Outline
 import android.graphics.Rect
@@ -20,6 +19,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.lodev09.truesheet.TrueSheetPlacement
 import com.lodev09.truesheet.utils.ScreenUtils
+import com.lodev09.truesheet.utils.isDarkMode
 
 interface TrueSheetBottomSheetViewDelegate {
   val isTopmostSheet: Boolean
@@ -81,14 +81,6 @@ class TrueSheetBottomSheetView(private val reactContext: ThemedReactContext) : F
     clipToPadding = false
   }
 
-  override fun setTranslationY(translationY: Float) {
-    // This prevents keyboard inset animations from resetting parent sheet translation
-    if (translationY == 0f && this.translationY != 0f) {
-      return
-    }
-    super.setTranslationY(translationY)
-  }
-
   // =============================================================================
   // MARK: - Layout
   // =============================================================================
@@ -186,13 +178,8 @@ class TrueSheetBottomSheetView(private val reactContext: ThemedReactContext) : F
     }
   }
 
-  fun getDefaultBackgroundColor(): Int {
-    val isNight = (
-      reactContext.resources.configuration.uiMode and
-        Configuration.UI_MODE_NIGHT_MASK
-      ) == Configuration.UI_MODE_NIGHT_YES
-    return if (isNight) COLOR_SURFACE_CONTAINER_LOW_DARK else COLOR_SURFACE_CONTAINER_LOW_LIGHT
-  }
+  fun getDefaultBackgroundColor(): Int =
+    if (reactContext.isDarkMode) COLOR_SURFACE_CONTAINER_LOW_DARK else COLOR_SURFACE_CONTAINER_LOW_LIGHT
 
   fun setupElevation() {
     val value = delegate?.sheetElevation ?: DEFAULT_ELEVATION

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

@@ -28,6 +28,9 @@ interface TrueSheetCoordinatorLayoutDelegate {
    * didn't follow, `keyboardWasVisible` whether the keyboard was up when it began.
    */
   fun coordinatorLayoutDidPullDown(overdragPx: Int, keyboardWasVisible: Boolean)
+
+  // A touch that began inside the sheet ended, after the behavior handled the release
+  fun coordinatorLayoutDidEndTouch()
 }
 
 /**
@@ -86,6 +89,10 @@ class TrueSheetCoordinatorLayout(context: Context) :
   private var pullOverdrag = 0f
   private var pullKeyboardVisible = false
 
+  // A touch that began inside the sheet is still down
+  val isTouchingSheet: Boolean
+    get() = pullTracking
+
   init {
     layoutParams = LayoutParams(
       LayoutParams.MATCH_PARENT,
@@ -150,10 +157,16 @@ class TrueSheetCoordinatorLayout(context: Context) :
         if (dy > dx && pullOverdrag > PULL_DOWN_THRESHOLD_DP.dpToPx()) {
           delegate?.coordinatorLayoutDidPullDown(pullOverdrag.toInt(), pullKeyboardVisible)
         }
+        delegate?.coordinatorLayoutDidEndTouch()
         return handled
       }
 
-      MotionEvent.ACTION_CANCEL -> pullTracking = false
+      MotionEvent.ACTION_CANCEL -> if (pullTracking) {
+        pullTracking = false
+        val handled = super.dispatchTouchEvent(ev)
+        delegate?.coordinatorLayoutDidEndTouch()
+        return handled
+      }
     }
     return super.dispatchTouchEvent(ev)
   }

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

@@ -34,10 +34,6 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) :
   View(reactContext),
   ReactPointerEventsView {
 
-  companion object {
-    private const val MAX_ALPHA = 0.5f
-  }
-
   var delegate: TrueSheetDimViewDelegate? = null
 
   private var targetView: ViewGroup? = null
@@ -48,6 +44,10 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) :
   private val blockGestures: Boolean
     get() = alpha > 0f
 
+  fun setDimColor(color: Int) {
+    setBackgroundColor(color)
+  }
+
   init {
     layoutParams = ViewGroup.LayoutParams(
       ViewGroup.LayoutParams.MATCH_PARENT,
@@ -109,30 +109,24 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) :
   }
 
   // =============================================================================
-  // MARK: - Alpha Calculation
+  // MARK: - Progress Calculation
   // =============================================================================
 
-  fun calculateAlpha(sheetTop: Int, dimmedDetentIndex: Int, getSheetTopForDetentIndex: (Int) -> Int): Float {
+  /**
+   * How far the sheet is into its dimmed range, from 0 (undimmed) to 1 (fully dimmed).
+   */
+  fun calculateProgress(sheetTop: Int, dimmedDetentIndex: Int, getSheetTopForDetentIndex: (Int) -> Int): Float {
     val realHeight = ScreenUtils.getRealScreenHeight(reactContext)
     val dimmedDetentTop = getSheetTopForDetentIndex(dimmedDetentIndex)
     val belowDimmedTop = if (dimmedDetentIndex > 0) getSheetTopForDetentIndex(dimmedDetentIndex - 1) else realHeight
 
     return when {
-      sheetTop <= dimmedDetentTop -> MAX_ALPHA
-
+      sheetTop <= dimmedDetentTop -> 1f
       sheetTop >= belowDimmedTop -> 0f
-
-      else -> {
-        val progress = 1f - (sheetTop - dimmedDetentTop).toFloat() / (belowDimmedTop - dimmedDetentTop)
-        (progress * MAX_ALPHA).coerceIn(0f, MAX_ALPHA)
-      }
+      else -> (1f - (sheetTop - dimmedDetentTop).toFloat() / (belowDimmedTop - dimmedDetentTop)).coerceIn(0f, 1f)
     }
   }
 
-  fun interpolateAlpha(sheetTop: Int, dimmedDetentIndex: Int, getSheetTopForDetentIndex: (Int) -> Int) {
-    alpha = calculateAlpha(sheetTop, dimmedDetentIndex, getSheetTopForDetentIndex)
-  }
-
   // =============================================================================
   // MARK: - Touch Handling
   // =============================================================================

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

@@ -2,7 +2,6 @@ package com.lodev09.truesheet.core
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.Configuration
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
@@ -13,6 +12,7 @@ import android.widget.FrameLayout
 import androidx.core.graphics.ColorUtils
 import androidx.core.view.ViewCompat
 import com.facebook.react.uimanager.PixelUtil.dpToPx
+import com.lodev09.truesheet.utils.isDarkMode
 
 /**
  * Options for customizing the grabber appearance.
@@ -165,9 +165,7 @@ class TrueSheetGrabberView(
   }
 
   private fun getAdaptiveColor(baseColor: Int? = null): Int {
-    val nightMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-    val isDarkMode = nightMode == Configuration.UI_MODE_NIGHT_YES
-    val modeColor = if (isDarkMode) Color.WHITE else Color.BLACK
+    val modeColor = if (context.isDarkMode) Color.WHITE else Color.BLACK
 
     return if (baseColor != null) {
       // Blend user color with mode color for adaptive effect

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

@@ -12,16 +12,6 @@ object TrueSheetStackManager {
 
   private val presentedSheetStack = mutableListOf<TrueSheetView>()
 
-  /**
-   * Gets the parent sheet at the given index, if any.
-   * Only returns a parent if it's in the same container.
-   * Must be called within synchronized block.
-   */
-  private fun getParentSheetAt(index: Int, rootContainer: ViewGroup?): TrueSheetView? {
-    if (index <= 0) return null
-    return presentedSheetStack[index - 1].takeIf { it.rootContainerView == rootContainer }
-  }
-
   /**
    * Returns the topmost presented and visible sheet, skipping sheets that are dismissing.
    * A dismissing sheet can't parent a new one: its dim would suppress the child's own dim
@@ -33,6 +23,22 @@ object TrueSheetStackManager {
       it.viewController.run { isPresented && isSheetVisible && !isBeingDismissed }
     }
 
+  /**
+   * Returns the topmost sheet hidden by screen navigation that was presented from the same
+   * screen as the given sheet. Sheets presented on the covering screen must not parent to it,
+   * or the hidden sheet would receive focus and blur events while it can't be seen.
+   * Must be called within synchronized block.
+   */
+  private fun findScreenHiddenSheet(sheetView: TrueSheetView): TrueSheetView? {
+    val screenTag = RNScreensEventObserver.findPresenterScreenTag(sheetView)
+    if (screenTag == 0) return null
+
+    return presentedSheetStack.lastOrNull {
+      it.viewController.run { isPresented && wasHiddenByScreen && !isBeingDismissed } &&
+        it.screensEventObserver?.presenterScreenTag == screenTag
+    }
+  }
+
   /**
    * Registers a sheet in the stack and returns its parent sheet if any.
    * Only returns a parent if it's in the same container (e.g., same Screen).
@@ -40,7 +46,8 @@ object TrueSheetStackManager {
   @JvmStatic
   fun registerSheet(sheetView: TrueSheetView): TrueSheetView? {
     synchronized(presentedSheetStack) {
-      val parentSheet = findTopmostSheet()?.takeIf { it.rootContainerView == sheetView.rootContainerView }
+      val parentSheet = (findTopmostSheet() ?: findScreenHiddenSheet(sheetView))
+        ?.takeIf { it.rootContainerView == sheetView.rootContainerView }
 
       if (!presentedSheetStack.contains(sheetView)) {
         presentedSheetStack.add(sheetView)
@@ -62,24 +69,20 @@ object TrueSheetStackManager {
 
   /**
    * Updates parent sheet translation based on the child sheet's position.
-   * Only affects parent sheets in the same container.
    */
   @JvmStatic
   fun updateParentTranslation(sheetView: TrueSheetView) {
-    synchronized(presentedSheetStack) {
-      val index = presentedSheetStack.indexOf(sheetView)
-      val parentSheet = getParentSheetAt(index, sheetView.rootContainerView) ?: return
-
-      // Post to ensure layout is complete before reading position
-      sheetView.viewController.post {
-        val childMinSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(0)
-        val childCurrentSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(
-          sheetView.viewController.currentDetentIndex
-        )
-        // Cap to minimum detent position
-        val childSheetTop = maxOf(childMinSheetTop, childCurrentSheetTop)
-        parentSheet.updateTranslationForChild(childSheetTop)
-      }
+    val parentSheet = sheetView.viewController.parentSheetView ?: return
+
+    // Post to ensure layout is complete before reading position
+    sheetView.viewController.post {
+      val childMinSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(0)
+      val childCurrentSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(
+        sheetView.viewController.currentDetentIndex
+      )
+      // Cap to minimum detent position
+      val childSheetTop = maxOf(childMinSheetTop, childCurrentSheetTop)
+      parentSheet.updateTranslationForChild(childSheetTop)
     }
   }
 
@@ -113,18 +116,6 @@ object TrueSheetStackManager {
     }
   }
 
-  /**
-   * Gets the parent sheet of the given sheet, if any.
-   * Only returns a parent if it's in the same container.
-   */
-  @JvmStatic
-  fun getParentSheet(sheetView: TrueSheetView): TrueSheetView? {
-    synchronized(presentedSheetStack) {
-      val index = presentedSheetStack.indexOf(sheetView)
-      return getParentSheetAt(index, sheetView.rootContainerView)
-    }
-  }
-
   /**
    * Returns true if the given sheet is the topmost presented sheet in its container.
    */

package/android/src/main/java/com/lodev09/truesheet/utils/ColorUtils.kt

@@ -0,0 +1,19 @@
+package com.lodev09.truesheet.utils
+
+import android.content.Context
+import android.content.res.Configuration
+import com.facebook.react.bridge.ColorPropConverter
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
+
+/**
+ * Resolves a processed color (number or `PlatformColor` map) at [key], or null when missing.
+ */
+fun ReadableMap.getColorOrNull(key: String, context: Context): Int? {
+  if (!hasKey(key) || isNull(key)) return null
+  val value = if (getType(key) == ReadableType.Map) getMap(key) else getDouble(key)
+  return ColorPropConverter.getColor(value, context)
+}
+
+val Context.isDarkMode: Boolean
+  get() = (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetContentViewShadowNode.cpp

@@ -1,6 +1,5 @@
 #include "TrueSheetContentViewShadowNode.h"
 
-#include <folly/ScopeGuard.h>
 #include <react/renderer/components/view/conversions.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/core/LayoutConstraints.h>
@@ -95,7 +94,12 @@ void TrueSheetContentViewShadowNode::updateNaturalHeightIfNeeded(const LayoutCon
     if (contentChanged_ || !measurement_ || !(measurement_->constraints == constraints) ||
         !(measurement_->context == measurementContext) || measurement_->errata != errata) {
       gIsMeasuringNaturalHeight = true;
-      auto restoreMeasurement = folly::makeGuard([] { gIsMeasuringNaturalHeight = false; });
+      // Not folly::makeGuard: its terminate() isn't linked into RN < 0.86 on Android.
+      struct RestoreMeasurement {
+        ~RestoreMeasurement() {
+          gIsMeasuringNaturalHeight = false;
+        }
+      } restoreMeasurement;
       auto measurementNode =
         measurement_ ? cloneForMeasurement(*this, *measurementSourceChildren_, measurement_->root->getChildren())
                      : cloneForMeasurement(*this, {}, {});

package/ios/TrueSheetContainerView.h

@@ -37,6 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)containerViewContentDidChangeSize:(CGSize)newSize;
 - (void)containerViewScrollViewDidChange;
+- (void)containerViewDidMountTransaction;
 
 @optional
 

package/ios/TrueSheetContainerView.mm

@@ -287,6 +287,12 @@ using namespace facebook::react;
   [self.delegate containerViewScrollViewDidChange];
 }
 
+// Footer controls can mount, unmount, or hide deep in its subtree without
+// passing through its own mount hooks or changing its size.
+- (void)contentViewDidMountTransaction {
+  [self.delegate containerViewDidMountTransaction];
+}
+
 #pragma mark - TrueSheetHeaderViewDelegate
 
 - (void)headerViewDidChangeSize:(CGSize)newSize {

package/ios/TrueSheetContentView.h

@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)contentViewDidChangeSize:(CGSize)newSize;
 - (void)contentViewScrollViewDidChange;
+- (void)contentViewDidMountTransaction;
 
 @end
 

package/ios/TrueSheetContentView.mm

@@ -181,6 +181,8 @@ using namespace facebook::react;
   // Layout has settled for the whole tree — the footer overlap (sheet height,
   // scroll view frame) and the keyboard inset are current here
   [self updateBottomInset];
+
+  [self.delegate contentViewDidMountTransaction];
 }
 
 #pragma mark - Scrollable

package/ios/TrueSheetFooterView.mm

@@ -123,6 +123,11 @@ using namespace facebook::react;
 
 - (void)collectAccessibilityElementsFromView:(UIView *)view into:(NSMutableArray *)elements {
   for (UIView *subview in view.subviews) {
+    // Fabric hides `display: none` views instead of unmounting them
+    if (subview.hidden) {
+      continue;
+    }
+
     if (subview.isAccessibilityElement || subview.accessibilityLabel || subview.accessibilityIdentifier) {
       [elements addObject:subview];
     } else if (subview.accessibilityElements.count > 0) {

package/ios/TrueSheetModule.mm

@@ -149,11 +149,17 @@ RCT_EXPORT_MODULE(TrueSheetModule)
 - (void)dismissAll:(BOOL)animated resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
   RCTExecuteOnMainQueue(^{
     @synchronized(viewRegistry) {
+      // Drop presents still waiting on another sheet's dismissal
+      for (TrueSheetView *view in viewRegistry.objectEnumerator) {
+        [view cancelPendingPresent];
+      }
+
       // Find the root presented sheet (one without a parent TrueSheet)
       TrueSheetView *rootSheet = nil;
 
       for (TrueSheetView *view in viewRegistry.objectEnumerator) {
-        if (!view.viewController.isPresented) {
+        // A sheet still animating in counts too — dismissAnimated waits for it to land
+        if (!view.viewController.isPresented && !view.viewController.isBeingPresented) {
           continue;
         }
 
@@ -171,7 +177,10 @@ RCT_EXPORT_MODULE(TrueSheetModule)
         return;
       }
 
-      [rootSheet emitDismissedPosition];
+      // Mid-present, the deferred dismiss tracks its own position like a regular dismiss
+      if (rootSheet.viewController.isPresented) {
+        [rootSheet emitDismissedPosition];
+      }
       [rootSheet dismissAnimated:animated
                       completion:^(BOOL success, NSError *_Nullable error) {
                         if (success) {

package/ios/TrueSheetView.h

@@ -34,6 +34,8 @@ typedef void (^TrueSheetCompletionBlock)(BOOL success, NSError *_Nullable error)
 
 - (void)emitDismissedPosition;
 
+- (BOOL)cancelPendingPresent;
+
 - (void)resizeToIndex:(NSInteger)index completion:(nullable TrueSheetCompletionBlock)completion;
 
 - (void)dismissStackAnimated:(BOOL)animated completion:(nullable TrueSheetCompletionBlock)completion;