@lodev09/react-native-true-sheet 3.7.0 → 3.7.1

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

@@ -95,6 +95,31 @@ class TrueSheetModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  /**
+   * Dismiss all presented sheets by dismissing from the bottom of the stack
+   *
+   * @param animated Whether to animate the dismissals
+   * @param promise Promise that resolves when all sheets are dismissed
+   */
+  @ReactMethod
+  fun dismissAll(animated: Boolean, promise: Promise) {
+    Handler(Looper.getMainLooper()).post {
+      try {
+        val rootSheet = TrueSheetStackManager.getRootSheet()
+        if (rootSheet == null) {
+          promise.resolve(null)
+          return@post
+        }
+
+        rootSheet.dismissAll(animated) {
+          promise.resolve(null)
+        }
+      } catch (e: Exception) {
+        promise.reject("OPERATION_FAILED", "Failed to dismiss all sheets: ${e.message}", e)
+      }
+    }
+  }
+
   /**
    * Helper method to get TrueSheetView by tag and execute closure
    */

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

@@ -109,6 +109,10 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   }
 
   override fun addView(child: View?, index: Int) {
+    if (child is TrueSheetContainerView) {
+      viewController.removeSheetSnapshot()
+    }
+
     viewController.addView(child, index)
 
     if (child is TrueSheetContainerView) {
@@ -128,10 +132,11 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     val child = getChildAt(index)
     if (child is TrueSheetContainerView) {
       child.delegate = null
+      viewController.createSheetSnapshot()
 
-      // Dismiss the sheet when container is removed
+      // Dismiss when container is removed
       if (viewController.isPresented) {
-        viewController.dismiss(animated = false)
+        dismissAll(true) {}
       }
     }
     viewController.removeView(child)
@@ -157,13 +162,19 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   fun onDropInstance() {
     reactContext.removeLifecycleEventListener(this)
 
-    viewController.dismiss()
-    viewController.delegate = null
-
     TrueSheetModule.unregisterView(id)
     TrueSheetStackManager.removeSheet(this)
 
     didInitiallyPresent = false
+
+    if (viewController.isPresented) {
+      viewController.dismissPromise = {
+        viewController.delegate = null
+      }
+      viewController.dismiss()
+    } else {
+      viewController.delegate = null
+    }
   }
 
   /**
@@ -310,6 +321,16 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     viewController.dismiss(animated)
   }
 
+  @UiThread
+  fun dismissAll(animated: Boolean = true, promiseCallback: () -> Unit) {
+    // Dismiss all sheets above first
+    dismiss(animated) {}
+
+    // Then dismiss itself
+    viewController.dismissPromise = promiseCallback
+    viewController.dismiss(animated)
+  }
+
   @UiThread
   fun resize(detentIndex: Int, promiseCallback: () -> Unit) {
     if (!viewController.isPresented) {
@@ -326,12 +347,13 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
    * Uses post() to ensure all layout passes complete before reconfiguring.
    */
   fun updateSheetIfNeeded() {
-    if (!viewController.isPresented) return
-    if (isSheetUpdatePending) return
+    if (!viewController.isPresented || isSheetUpdatePending) return
 
     isSheetUpdatePending = true
     viewController.post {
       isSheetUpdatePending = false
+      if (viewController.containerView == null) return@post
+
       viewController.setupSheetDetentsForSizeChange()
       TrueSheetStackManager.onSheetSizeChanged(this)
     }
@@ -466,6 +488,10 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     eventDispatcher?.dispatchEvent(BackPressEvent(surfaceId, id))
   }
 
+  override fun viewControllerDidDetectScreenDisappear() {
+    dismissAll(animated = true) {}
+  }
+
   // ==================== TrueSheetContainerViewDelegate ====================
 
   override fun containerViewContentDidChangeSize(width: Int, height: Int) {
@@ -489,7 +515,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
    * of whichever window this view is in - whether that's the activity's window or a
    * Modal's dialog window.
    */
-  private fun findRootContainerView(): ViewGroup? {
+  override fun findRootContainerView(): ViewGroup? {
     var current: android.view.ViewParent? = parent
 
     while (current != null) {

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

@@ -1,14 +1,18 @@
 package com.lodev09.truesheet
 
 import android.annotation.SuppressLint
+import android.graphics.Bitmap
+import android.graphics.Canvas
 import android.os.Build
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.accessibility.AccessibilityNodeInfo
+import android.widget.ImageView
 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 androidx.core.view.isVisible
 import com.facebook.react.R
@@ -46,6 +50,7 @@ data class DetentInfo(val index: Int, val position: Float)
 
 interface TrueSheetViewControllerDelegate {
   val eventDispatcher: EventDispatcher?
+  fun findRootContainerView(): ViewGroup?
   fun viewControllerWillPresent(index: Int, position: Float, detent: Float)
   fun viewControllerDidPresent(index: Int, position: Float, detent: Float)
   fun viewControllerWillDismiss()
@@ -61,6 +66,7 @@ interface TrueSheetViewControllerDelegate {
   fun viewControllerWillBlur()
   fun viewControllerDidBlur()
   fun viewControllerDidBackPress()
+  fun viewControllerDidDetectScreenDisappear()
 }
 
 // =============================================================================
@@ -130,7 +136,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   private var interactionState: InteractionState = InteractionState.Idle
   private var isDismissing = false
-  private var wasHiddenByModal = false
+  internal var wasHiddenByModal = false
   private var shouldAnimatePresent = false
   private var isPresentAnimating = false
 
@@ -213,7 +219,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private val behavior: BottomSheetBehavior<TrueSheetBottomSheetView>?
     get() = sheetView?.behavior
 
-  private val containerView: TrueSheetContainerView?
+  internal val containerView: TrueSheetContainerView?
     get() = if (this.isNotEmpty()) getChildAt(0) as? TrueSheetContainerView else null
 
   // Screen Measurements
@@ -320,6 +326,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     parentDimView?.detach()
     parentDimView = null
 
+    // Cleanup snapshot
+    removeSheetSnapshot()
+
     // Detach content from sheet
     sheetView?.removeView(this)
 
@@ -338,6 +347,34 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     shouldAnimatePresent = true
   }
 
+  private var snapshotView: View? = null
+
+  fun createSheetSnapshot() {
+    if (!isPresented) return
+    val sheet = sheetView ?: return
+    if (sheet.width <= 0 || sheet.height <= 0) return
+
+    val bitmap = createBitmap(sheet.width, sheet.height)
+    val canvas = Canvas(bitmap)
+    sheet.draw(canvas)
+
+    val snapshot = ImageView(reactContext).apply {
+      setImageBitmap(bitmap)
+      layoutParams = LayoutParams(sheet.width, sheet.height)
+    }
+
+    sheet.addView(snapshot, 0)
+    snapshotView = snapshot
+  }
+
+  fun removeSheetSnapshot() {
+    snapshotView?.let {
+      (it as? ImageView)?.setImageDrawable(null)
+      sheetView?.removeView(it)
+    }
+    snapshotView = null
+  }
+
   // =============================================================================
   // MARK: - Back Button Handling
   // =============================================================================
@@ -405,6 +442,19 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     dismissOrCollapseToLowest()
   }
 
+  // =============================================================================
+  // MARK: - TrueSheetBottomSheetViewDelegate - Grabber Tap
+  // =============================================================================
+
+  override fun bottomSheetViewDidTapGrabber() {
+    val nextIndex = (currentDetentIndex + 1) % detents.size
+    if (nextIndex == 0 && detents.size == 1 && dismissible) {
+      dismiss(animated = true)
+    } else {
+      setStateForDetentIndex(nextIndex)
+    }
+  }
+
   // =============================================================================
   // MARK: - BottomSheetCallback
   // =============================================================================
@@ -534,6 +584,12 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
             post { parent.showAfterModal() }
           }
         }
+      },
+      onNonModalScreenPushed = {
+        // Only handle on root sheet (no parent) to trigger dismissAll
+        if (isPresented && isSheetVisible && parentSheetView == null) {
+          delegate?.viewControllerDidDetectScreenDisappear()
+        }
       }
     )
     rnScreensObserver?.start()
@@ -892,7 +948,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   fun saveFocusedView() {
-    focusedViewBeforeBlur = reactContext.currentActivity?.currentFocus
+    focusedViewBeforeBlur = delegate?.findRootContainerView()?.findFocus()
+      ?: reactContext.currentActivity?.currentFocus
   }
 
   fun restoreFocusedView() {

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

@@ -18,7 +18,8 @@ class RNScreensFragmentObserver(
   private val reactContext: ReactContext,
   private val onModalPresented: () -> Unit,
   private val onModalWillDismiss: () -> Unit,
-  private val onModalDidDismiss: () -> Unit
+  private val onModalDidDismiss: () -> Unit,
+  private val onNonModalScreenPushed: () -> Unit
 ) {
   private var fragmentLifecycleCallback: FragmentManager.FragmentLifecycleCallbacks? = null
   private var activityLifecycleObserver: DefaultLifecycleObserver? = null
@@ -61,6 +62,9 @@ class RNScreensFragmentObserver(
           if (activeModalFragments.size == 1) {
             onModalPresented()
           }
+        } else if (activeModalFragments.isEmpty() && isNonModalScreenFragment(f)) {
+          // Only trigger non-modal push when no modals are active
+          onNonModalScreenPushed()
         }
       }
 
@@ -145,6 +149,27 @@ class RNScreensFragmentObserver(
      */
     private fun isScreensFragment(fragment: Fragment): Boolean = fragment.javaClass.name.startsWith(RN_SCREENS_PACKAGE)
 
+    /**
+     * Check if fragment is a non-modal screen (regular push presentation).
+     */
+    private fun isNonModalScreenFragment(fragment: Fragment): Boolean {
+      if (!isScreensFragment(fragment)) return false
+      // ScreenModalFragment is always a modal
+      if (fragment.javaClass.name.contains("ScreenModalFragment")) return false
+
+      try {
+        val getScreenMethod = fragment.javaClass.getMethod("getScreen")
+        val screen = getScreenMethod.invoke(fragment) ?: return false
+
+        val getStackPresentationMethod = screen.javaClass.getMethod("getStackPresentation")
+        val stackPresentation = getStackPresentationMethod.invoke(screen) ?: return false
+
+        return stackPresentation.toString() == "PUSH"
+      } catch (e: Exception) {
+        return false
+      }
+    }
+
     /**
      * Check if fragment is a react-native-screens modal (fullScreenModal, transparentModal, or formSheet).
      * Uses reflection to check the fragment's screen.stackPresentation property.

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

@@ -3,10 +3,13 @@ package com.lodev09.truesheet.core
 import android.annotation.SuppressLint
 import android.graphics.Color
 import android.graphics.Outline
+import android.graphics.Rect
 import android.graphics.drawable.ShapeDrawable
 import android.graphics.drawable.shapes.RoundRectShape
 import android.util.TypedValue
+import android.view.GestureDetector
 import android.view.Gravity
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewOutlineProvider
 import android.widget.FrameLayout
@@ -22,6 +25,7 @@ interface TrueSheetBottomSheetViewDelegate {
   val sheetBackgroundColor: Int?
   val grabber: Boolean
   val grabberOptions: GrabberOptions?
+  fun bottomSheetViewDidTapGrabber()
 }
 
 /**
@@ -162,4 +166,32 @@ class TrueSheetBottomSheetView(private val reactContext: ThemedReactContext) : F
 
     addView(grabberView, 0)
   }
+
+  // =============================================================================
+  // MARK: - Grabber Tap Detection
+  // =============================================================================
+
+  private val grabberTapDetector = GestureDetector(
+    context,
+    object : GestureDetector.SimpleOnGestureListener() {
+      override fun onSingleTapUp(e: MotionEvent): Boolean {
+        delegate?.bottomSheetViewDidTapGrabber()
+        return true
+      }
+    }
+  )
+
+  override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
+    val grabber = findViewWithTag<View>(GRABBER_TAG)
+    if (grabber != null) {
+      val rect = Rect()
+      grabber.getHitRect(rect)
+      if (rect.contains(ev.x.toInt(), ev.y.toInt())) {
+        if (grabberTapDetector.onTouchEvent(ev)) {
+          return true
+        }
+      }
+    }
+    return super.dispatchTouchEvent(ev)
+  }
 }

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

@@ -25,16 +25,18 @@ data class GrabberOptions(
 
 /**
  * Native grabber (drag handle) view for the bottom sheet.
- * Displays a small pill-shaped indicator at the top of the 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) : View(context) {
+class TrueSheetGrabberView(context: Context, private val options: GrabberOptions? = null) : FrameLayout(context) {
 
   companion object {
     private const val DEFAULT_WIDTH = 32f // dp
     private const val DEFAULT_HEIGHT = 4f // dp
     private const val DEFAULT_TOP_MARGIN = 16f // dp
     private const val DEFAULT_ALPHA = 0.4f
+    private const val HITBOX_PADDING_HORIZONTAL = 16f // dp
+    private const val HITBOX_PADDING_VERTICAL = 16f // dp
     private val DEFAULT_COLOR = Color.argb((DEFAULT_ALPHA * 255).toInt(), 73, 69, 79) // #49454F @ 40%
   }
 
@@ -57,19 +59,33 @@ class TrueSheetGrabberView(context: Context, private val options: GrabberOptions
     get() = if (isAdaptive) getAdaptiveColor(options?.color) else options?.color ?: DEFAULT_COLOR
 
   init {
-    layoutParams = FrameLayout.LayoutParams(
-      grabberWidth.dpToPx().toInt(),
-      grabberHeight.dpToPx().toInt()
+    val hitboxWidth = grabberWidth + (HITBOX_PADDING_HORIZONTAL * 2)
+    val hitboxHeight = grabberHeight + (HITBOX_PADDING_VERTICAL * 2)
+
+    layoutParams = LayoutParams(
+      hitboxWidth.dpToPx().toInt(),
+      hitboxHeight.dpToPx().toInt()
     ).apply {
       gravity = Gravity.CENTER_HORIZONTAL or Gravity.TOP
-      topMargin = grabberTopMargin.dpToPx().toInt()
+      topMargin = (grabberTopMargin - HITBOX_PADDING_VERTICAL).dpToPx().toInt()
     }
 
-    background = GradientDrawable().apply {
-      shape = GradientDrawable.RECTANGLE
-      cornerRadius = grabberCornerRadius.dpToPx()
-      setColor(grabberColor)
+    // The visible pill centered inside the hitbox
+    val pillView = View(context).apply {
+      layoutParams = LayoutParams(
+        grabberWidth.dpToPx().toInt(),
+        grabberHeight.dpToPx().toInt()
+      ).apply {
+        gravity = Gravity.CENTER
+      }
+      background = GradientDrawable().apply {
+        shape = GradientDrawable.RECTANGLE
+        cornerRadius = grabberCornerRadius.dpToPx()
+        setColor(grabberColor)
+      }
     }
+
+    addView(pillView)
   }
 
   private fun getAdaptiveColor(baseColor: Int? = null): Int {

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

@@ -35,7 +35,7 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
     private set
 
   fun isFocusedViewWithinSheet(sheetView: View): Boolean {
-    val focusedView = reactContext.currentActivity?.currentFocus ?: return false
+    val focusedView = targetView.rootView?.findFocus() ?: return false
     var current: View? = focusedView
     while (current != null && current !== targetView) {
       if (current === sheetView) return true
@@ -131,7 +131,7 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
     // Ensure we don't add duplicate listeners
     if (globalLayoutListener != null) return
 
-    val rootView = reactContext.currentActivity?.window?.decorView?.rootView ?: return
+    val rootView = targetView.rootView ?: return
     activityRootView = rootView
 
     globalLayoutListener = ViewTreeObserver.OnGlobalLayoutListener {

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

@@ -18,16 +18,16 @@ object TrueSheetStackManager {
    */
   private fun getParentSheetAt(index: Int, rootContainer: ViewGroup?): TrueSheetView? {
     if (index <= 0) return null
-    return presentedSheetStack[index - 1].takeIf { it.rootContainerView == rootContainer }
+    return presentedSheetStack[index - 1].takeIf { !it.viewController.wasHiddenByModal && it.rootContainerView == rootContainer }
   }
 
   /**
-   * Returns the topmost presented and visible sheet.
+   * Returns the topmost presented and visible sheet that is not hidden by modal.
    * Must be called within synchronized block.
    */
   private fun findTopmostSheet(): TrueSheetView? =
     presentedSheetStack.lastOrNull {
-      it.viewController.isPresented && it.viewController.isSheetVisible
+      it.viewController.isPresented && it.viewController.isSheetVisible && !it.viewController.wasHiddenByModal
     }
 
   /**
@@ -151,4 +151,27 @@ object TrueSheetStackManager {
       return findTopmostSheet()
     }
   }
+
+  /**
+   * Returns the root presented sheet for dismissAll.
+   * Starts from the topmost sheet and walks up to find the root of its stack.
+   * Stops at modal boundary (parent hidden by modal) or when there's no parent.
+   */
+  @JvmStatic
+  fun getRootSheet(): TrueSheetView? {
+    synchronized(presentedSheetStack) {
+      val topmost = presentedSheetStack.lastOrNull { it.viewController.isPresented } ?: return null
+
+      var current: TrueSheetView = topmost
+      while (true) {
+        val parent = current.viewController.parentSheetView ?: return current
+
+        if (parent.viewController.wasHiddenByModal) {
+          return current
+        }
+
+        current = parent
+      }
+    }
+  }
 }

package/ios/TrueSheetModule.mm

@@ -14,6 +14,7 @@
 #import "TrueSheetModule.h"
 #import <React/RCTUtils.h>
 #import "TrueSheetView.h"
+#import "TrueSheetViewController.h"
 
 #import <TrueSheetSpec/TrueSheetSpec.h>
 
@@ -115,6 +116,44 @@ RCT_EXPORT_MODULE(TrueSheetModule)
   });
 }
 
+- (void)dismissAll:(BOOL)animated resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+  RCTExecuteOnMainQueue(^{
+    @synchronized(viewRegistry) {
+      // Find the root presented sheet (one without a parent TrueSheet)
+      TrueSheetView *rootSheet = nil;
+
+      for (TrueSheetView *view in viewRegistry.allValues) {
+        if (!view.viewController.isPresented) {
+          continue;
+        }
+
+        UIViewController *presenter = view.viewController.presentingViewController;
+        BOOL hasParentSheet = [presenter isKindOfClass:[TrueSheetViewController class]];
+
+        if (!hasParentSheet) {
+          rootSheet = view;
+          break;
+        }
+      }
+
+      if (!rootSheet) {
+        resolve(nil);
+        return;
+      }
+
+      [rootSheet
+        dismissAllAnimated:animated
+                completion:^(BOOL success, NSError *_Nullable error) {
+                  if (success) {
+                    resolve(nil);
+                  } else {
+                    reject(@"DISMISS_FAILED", error.localizedDescription ?: @"Failed to dismiss sheets", error);
+                  }
+                }];
+    }
+  });
+}
+
 #pragma mark - Helper Methods
 
 + (nullable TrueSheetView *)getTrueSheetViewByTag:(NSNumber *)reactTag {

package/ios/TrueSheetView.h

@@ -23,6 +23,8 @@ typedef void (^TrueSheetCompletionBlock)(BOOL success, NSError *_Nullable error)
 
 @interface TrueSheetView : RCTViewComponentView
 
+@property (nonatomic, readonly) TrueSheetViewController *viewController;
+
 // TurboModule methods
 - (void)presentAtIndex:(NSInteger)index
               animated:(BOOL)animated
@@ -32,6 +34,8 @@ typedef void (^TrueSheetCompletionBlock)(BOOL success, NSError *_Nullable error)
 
 - (void)resizeToIndex:(NSInteger)index completion:(nullable TrueSheetCompletionBlock)completion;
 
+- (void)dismissAllAnimated:(BOOL)animated completion:(nullable TrueSheetCompletionBlock)completion;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/TrueSheetView.mm

@@ -45,6 +45,7 @@ using namespace facebook::react;
   TrueSheetViewController *_controller;
   RCTSurfaceTouchHandler *_touchHandler;
   TrueSheetViewShadowNode::ConcreteState::Shared _state;
+  UIView *_snapshotView;
   CGSize _lastStateSize;
   NSInteger _initialDetentIndex;
   BOOL _scrollable;
@@ -69,6 +70,7 @@ using namespace facebook::react;
 
     _touchHandler = [[RCTSurfaceTouchHandler alloc] init];
     _containerView = nil;
+    _snapshotView = nil;
     _lastStateSize = CGSizeZero;
     _initialDetentIndex = -1;
     _initialDetentAnimated = YES;
@@ -107,6 +109,9 @@ using namespace facebook::react;
   _controller.delegate = nil;
   _controller = nil;
 
+  [_snapshotView removeFromSuperview];
+  _snapshotView = nil;
+
   [TrueSheetModule unregisterViewWithTag:@(self.tag)];
 }
 
@@ -280,6 +285,11 @@ using namespace facebook::react;
     return;
   }
 
+  if (_snapshotView) {
+    [_snapshotView removeFromSuperview];
+    _snapshotView = nil;
+  }
+
   _containerView = (TrueSheetContainerView *)childComponentView;
   _containerView.delegate = self;
 
@@ -308,6 +318,14 @@ using namespace facebook::react;
   if (![childComponentView isKindOfClass:[TrueSheetContainerView class]])
     return;
 
+  UIView *superView = _containerView.superview;
+  UIView *snapshot = [_containerView snapshotViewAfterScreenUpdates:NO];
+  if (snapshot) {
+    snapshot.frame = _containerView.frame;
+    [superView insertSubview:snapshot belowSubview:_containerView];
+    _snapshotView = snapshot;
+  }
+
   _containerView.delegate = nil;
 
   if (_touchHandler) {
@@ -396,6 +414,30 @@ using namespace facebook::react;
   [self presentAtIndex:index animated:YES completion:completion];
 }
 
+- (TrueSheetViewController *)viewController {
+  return _controller;
+}
+
+- (void)dismissAllAnimated:(BOOL)animated completion:(nullable TrueSheetCompletionBlock)completion {
+  if (!_controller.isPresented) {
+    if (completion) {
+      completion(YES, nil);
+    }
+    return;
+  }
+
+  [self viewControllerDidChangePosition:-1 position:_controller.screenHeight detent:0 realtime:NO];
+
+  // Dismiss from the presenting view controller to dismiss this sheet and all its children
+  UIViewController *presenter = _controller.presentingViewController;
+  [presenter dismissViewControllerAnimated:animated
+                                completion:^{
+                                  if (completion) {
+                                    completion(YES, nil);
+                                  }
+                                }];
+}
+
 #pragma mark - TrueSheetContainerViewDelegate
 
 /**
@@ -409,6 +451,9 @@ using namespace facebook::react;
 
   dispatch_async(dispatch_get_main_queue(), ^{
     self->_isSheetUpdatePending = NO;
+    if (!self->_containerView)
+      return;
+
     [self->_controller setupSheetDetentsForSizeChange];
   });
 }
@@ -499,6 +544,10 @@ using namespace facebook::react;
   [TrueSheetFocusEvents emitDidBlur:_eventEmitter];
 }
 
+- (void)viewControllerDidDetectScreenDisappear {
+  [self dismissAllAnimated:YES completion:nil];
+}
+
 #pragma mark - Private Helpers
 
 - (UIViewController *)findPresentingViewController {