@lodev09/react-native-true-sheet 3.8.0-beta.2 → 3.8.0-beta.3

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

@@ -54,7 +54,7 @@ class TrueSheetModule(reactContext: ReactApplicationContext) :
   }
 
   /**
-   * Dismiss a sheet by reference
+   * Dismiss a sheet and all sheets presented on top of it
    *
    * @param viewTag Native view tag of the sheet component
    * @param promise Promise that resolves when sheet is fully dismissed
@@ -73,6 +73,26 @@ class TrueSheetModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  /**
+   * Dismiss only the sheets presented on top of this sheet, keeping this sheet presented
+   *
+   * @param viewTag Native view tag of the sheet component
+   * @param promise Promise that resolves when all child sheets are fully dismissed
+   * @throws VIEW_NOT_FOUND if the view with the given tag is not found
+   * @throws INVALID_VIEW_TYPE if the view is not a TrueSheetView
+   * @throws OPERATION_FAILED if the operation fails for any other reason
+   */
+  @ReactMethod
+  fun dismissStackByRef(viewTag: Double, animated: Boolean, promise: Promise) {
+    val tag = viewTag.toInt()
+
+    withTrueSheetView(tag, promise) { view ->
+      view.dismissStack(animated) {
+        promise.resolve(null)
+      }
+    }
+  }
+
   /**
    * Resize a sheet to a different index by reference
    *
@@ -111,7 +131,7 @@ class TrueSheetModule(reactContext: ReactApplicationContext) :
           return@post
         }
 
-        rootSheet.dismissAll(animated) {
+        rootSheet.dismiss(animated) {
           promise.resolve(null)
         }
       } catch (e: Exception) {

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

@@ -135,11 +135,13 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     val child = getChildAt(index)
     if (child is TrueSheetContainerView) {
       child.delegate = null
-      viewController.createSheetSnapshot()
 
-      // Dismiss when container is removed
-      if (viewController.isPresented) {
-        dismissAll(true) {}
+      // Skip if already dismissing - snapshot preserves visuals during dismiss
+      if (!viewController.isBeingDismissed) {
+        viewController.createSheetSnapshot()
+        if (viewController.isPresented) {
+          dismiss(true) {}
+        }
       }
     }
     viewController.removeView(child)
@@ -171,13 +173,10 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     cleanupScreenEventObserver()
     didInitiallyPresent = false
 
-    if (viewController.isPresented) {
-      viewController.dismissPromise = {
-        viewController.delegate = null
-      }
-      viewController.dismiss()
-    } else {
-      viewController.delegate = null
+    viewController.dismissPromise = { viewController.delegate = null }
+
+    if (viewController.isPresented && !viewController.isBeingDismissed) {
+      viewController.dismiss(animated = false)
     }
   }
 
@@ -344,7 +343,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
       viewController.coordinatorLayout?.let { rootContainerView?.addView(it) }
 
       // Register with observer to track sheet stack hierarchy
-      viewController.parentSheetView = TrueSheetStackManager.onSheetWillPresent(this, detentIndex)
+      viewController.parentSheetView = TrueSheetStackManager.registerSheet(this)
     }
     viewController.presentPromise = promiseCallback
     viewController.present(detentIndex, animated)
@@ -352,30 +351,26 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   @UiThread
   fun dismiss(animated: Boolean = true, promiseCallback: () -> Unit) {
-    // iOS-like behavior: calling dismiss on a presenting controller dismisses
-    // its presented controller (and everything above it), but NOT itself.
-    // See: https://developer.apple.com/documentation/uikit/uiviewcontroller/1621505-dismiss
-    val sheetsAbove = TrueSheetStackManager.getSheetsAbove(this)
-    if (sheetsAbove.isNotEmpty()) {
-      for (sheet in sheetsAbove) {
-        sheet.viewController.dismiss(animated)
-      }
-      promiseCallback()
-      return
-    }
+    // Dismiss all sheets above first
+    dismissStack(animated) {}
 
+    // Then dismiss itself
     viewController.dismissPromise = promiseCallback
     viewController.dismiss(animated)
   }
 
   @UiThread
-  fun dismissAll(animated: Boolean = true, promiseCallback: () -> Unit) {
-    // Dismiss all sheets above first
-    dismiss(animated) {}
+  fun dismissStack(animated: Boolean = true, promiseCallback: () -> Unit) {
+    val sheetsAbove = TrueSheetStackManager.getSheetsAbove(this)
+    if (sheetsAbove.isNotEmpty()) {
+      // Create snapshot only for topmost sheet (first in reversed list)
+      sheetsAbove.firstOrNull()?.viewController?.createSheetSnapshot()
 
-    // Then dismiss itself
-    viewController.dismissPromise = promiseCallback
-    viewController.dismiss(animated)
+      for (sheet in sheetsAbove) {
+        sheet.viewController.dismiss(animated)
+      }
+    }
+    promiseCallback()
   }
 
   @UiThread
@@ -397,7 +392,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
       if (viewController.containerView == null) return@post
 
       viewController.setupSheetDetentsForSizeChange()
-      TrueSheetStackManager.onSheetSizeChanged(this)
+      TrueSheetStackManager.updateParentTranslation(this)
     }
   }
 
@@ -451,6 +446,9 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   // ==================== TrueSheetViewControllerDelegate ====================
 
   override fun viewControllerWillPresent(index: Int, position: Float, detent: Float) {
+    // Update parent sheet translation now that content is measured
+    TrueSheetStackManager.updateParentTranslation(this)
+
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(WillPresentEvent(surfaceId, id, index, position, detent))
   }
@@ -477,7 +475,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(DidDismissEvent(surfaceId, id))
 
-    TrueSheetStackManager.onSheetDidDismiss(this, hadParent)
+    TrueSheetStackManager.unregisterSheet(this, hadParent)
   }
 
   override fun viewControllerDidChangeDetent(index: Int, position: Float, detent: Float) {

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

@@ -131,7 +131,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     private set
 
   private var interactionState: InteractionState = InteractionState.Idle
-  private var isDismissing = false
+  internal var isBeingDismissed = false
+    private set
   var wasHiddenByScreen = false
   private var shouldAnimatePresent = false
   private var isPresentAnimating = false
@@ -340,7 +341,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     sheetView = null
 
     interactionState = InteractionState.Idle
-    isDismissing = false
+    isBeingDismissed = false
     isPresented = false
     isSheetVisible = false
     wasHiddenByScreen = false
@@ -479,8 +480,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   private fun handleStateChanged(sheetView: View, newState: Int) {
     if (newState == BottomSheetBehavior.STATE_HIDDEN) {
-      if (isDismissing) return
-      isDismissing = true
+      if (isBeingDismissed) return
+      isBeingDismissed = true
       dismissKeyboard()
       emitWillDismissEvents()
       finishDismiss()
@@ -502,7 +503,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   private fun handleSlide(sheetView: View, slideOffset: Float) {
     // Skip during dismiss animation
-    if (isDismissing) return
+    if (isBeingDismissed) return
 
     val behavior = behavior ?: return
 
@@ -705,9 +706,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   fun dismiss(animated: Boolean = true) {
-    if (isDismissing) return
+    if (isBeingDismissed) return
 
-    isDismissing = true
+    isBeingDismissed = true
     dismissKeyboard()
     emitWillDismissEvents()
 
@@ -894,7 +895,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     if (!dimmed) return
     if (contentHeight == 0) return
 
-    val keyboardOffset = if (isDismissing) 0 else currentKeyboardInset
+    val keyboardOffset = if (isBeingDismissed) 0 else currentKeyboardInset
     val top = (sheetTop ?: sheetView?.top ?: return) + keyboardOffset
 
     if (animated) {
@@ -981,7 +982,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
           if (!shouldHandleKeyboard(checkFocus = false)) return
 
           setupSheetDetents()
-          if (!isDismissing && detentIndexBeforeKeyboard >= 0) {
+          if (!isBeingDismissed && detentIndexBeforeKeyboard >= 0) {
             setStateForDetentIndex(detentIndexBeforeKeyboard)
           }
         }

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

@@ -31,18 +31,14 @@ object TrueSheetStackManager {
     }
 
   /**
-   * Called when a sheet is about to be presented.
-   * Returns the visible parent sheet to stack on, or null if none.
+   * 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).
    */
   @JvmStatic
-  fun onSheetWillPresent(sheetView: TrueSheetView, detentIndex: Int): TrueSheetView? {
+  fun registerSheet(sheetView: TrueSheetView): TrueSheetView? {
     synchronized(presentedSheetStack) {
       val parentSheet = findTopmostSheet()?.takeIf { it.rootContainerView == sheetView.rootContainerView }
 
-      val childSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(detentIndex)
-      parentSheet?.updateTranslationForChild(childSheetTop)
-
       if (!presentedSheetStack.contains(sheetView)) {
         presentedSheetStack.add(sheetView)
       }
@@ -52,11 +48,10 @@ object TrueSheetStackManager {
   }
 
   /**
-   * Called when a sheet has been dismissed.
-   * Resets parent sheet translation if this sheet was stacked on it.
+   * Unregisters a sheet from the stack and resets parent translation if needed.
    */
   @JvmStatic
-  fun onSheetDidDismiss(sheetView: TrueSheetView, hadParent: Boolean) {
+  fun unregisterSheet(sheetView: TrueSheetView, hadParent: Boolean) {
     synchronized(presentedSheetStack) {
       presentedSheetStack.remove(sheetView)
       if (hadParent) {
@@ -66,12 +61,11 @@ object TrueSheetStackManager {
   }
 
   /**
-   * Called when a presented sheet's size changes (e.g., after setupSheetDetents).
-   * Updates parent sheet translations to match the new sheet position.
+   * Updates parent sheet translation based on the child sheet's position.
    * Only affects parent sheets in the same container.
    */
   @JvmStatic
-  fun onSheetSizeChanged(sheetView: TrueSheetView) {
+  fun updateParentTranslation(sheetView: TrueSheetView) {
     synchronized(presentedSheetStack) {
       val index = presentedSheetStack.indexOf(sheetView)
       val parentSheet = getParentSheetAt(index, sheetView.rootContainerView) ?: return

package/ios/TrueSheetContentView.mm

@@ -138,9 +138,15 @@ using namespace facebook::react;
   CGFloat newHeight = containerView.bounds.size.height - scrollViewFrameInContainer.origin.y;
 
   if (newHeight > 0) {
+    // Preserve contentOffset before changing frame to prevent scroll jump
+    CGPoint savedContentOffset = _pinnedScrollView.scrollView.contentOffset;
+
     CGRect frame = _pinnedScrollView.frame;
     frame.size.height = newHeight;
     _pinnedScrollView.frame = frame;
+
+    // Restore contentOffset after frame change
+    _pinnedScrollView.scrollView.contentOffset = savedContentOffset;
   }
 }
 

package/ios/TrueSheetModule.mm

@@ -93,6 +93,30 @@ RCT_EXPORT_MODULE(TrueSheetModule)
   });
 }
 
+- (void)dismissStackByRef:(double)viewTag
+                 animated:(BOOL)animated
+                  resolve:(RCTPromiseResolveBlock)resolve
+                   reject:(RCTPromiseRejectBlock)reject {
+  RCTExecuteOnMainQueue(^{
+    TrueSheetView *trueSheetView = [TrueSheetModule getTrueSheetViewByTag:@((NSInteger)viewTag)];
+
+    if (!trueSheetView) {
+      reject(@"SHEET_NOT_FOUND", [NSString stringWithFormat:@"No sheet found with tag %d", (int)viewTag], nil);
+      return;
+    }
+
+    [trueSheetView
+      dismissStackAnimated:animated
+                completion:^(BOOL success, NSError *_Nullable error) {
+                  if (success) {
+                    resolve(nil);
+                  } else {
+                    reject(@"DISMISS_FAILED", error.localizedDescription ?: @"Failed to dismiss stack", error);
+                  }
+                }];
+  });
+}
+
 - (void)resizeByRef:(double)viewTag
               index:(double)index
             resolve:(RCTPromiseResolveBlock)resolve
@@ -141,15 +165,15 @@ RCT_EXPORT_MODULE(TrueSheetModule)
         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);
-                  }
-                }];
+      [rootSheet emitDismissedPosition];
+      [rootSheet dismissAnimated:animated
+                      completion:^(BOOL success, NSError *_Nullable error) {
+                        if (success) {
+                          resolve(nil);
+                        } else {
+                          reject(@"DISMISS_FAILED", error.localizedDescription ?: @"Failed to dismiss sheets", error);
+                        }
+                      }];
     }
   });
 }

package/ios/TrueSheetView.h

@@ -32,9 +32,11 @@ typedef void (^TrueSheetCompletionBlock)(BOOL success, NSError *_Nullable error)
 
 - (void)dismissAnimated:(BOOL)animated completion:(nullable TrueSheetCompletionBlock)completion;
 
+- (void)emitDismissedPosition;
+
 - (void)resizeToIndex:(NSInteger)index completion:(nullable TrueSheetCompletionBlock)completion;
 
-- (void)dismissAllAnimated:(BOOL)animated completion:(nullable TrueSheetCompletionBlock)completion;
+- (void)dismissStackAnimated:(BOOL)animated completion:(nullable TrueSheetCompletionBlock)completion;
 
 @end
 

package/ios/TrueSheetView.mm

@@ -111,7 +111,7 @@ using namespace facebook::react;
     UIViewController *vc = [self findPresentingViewController];
 
     // Only present if the view controller is in the same window and not being dismissed
-    if (vc && vc.view.window == self.window && !vc.isBeingDismissed) {
+    if (vc && vc.view.window == self.window && !_controller.isBeingDismissed) {
       _didInitiallyPresent = YES;
       [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
     } else {
@@ -407,12 +407,7 @@ using namespace facebook::react;
 - (void)presentAtIndex:(NSInteger)index
               animated:(BOOL)animated
             completion:(nullable TrueSheetCompletionBlock)completion {
-  if (_controller.isBeingPresented) {
-    RCTLogWarn(@"TrueSheet: sheet is being presented. Wait for it to transition before presenting again.");
-    return;
-  }
-
-  if (_controller.isPresented) {
+  if (_controller.isBeingPresented || _controller.isPresented) {
     RCTLogWarn(@"TrueSheet: sheet is already presented. Use resize() to change detent.");
     if (completion) {
       completion(YES, nil);
@@ -420,6 +415,9 @@ using namespace facebook::react;
     return;
   }
 
+  // Reset navigation dismiss flag when presenting (handles view recycling edge cases)
+  _dismissedByNavigation = NO;
+
   UIViewController *presentingViewController = [self findPresentingViewController];
   if (!presentingViewController) {
     NSError *error = [NSError errorWithDomain:@"com.lodev09.TrueSheet"
@@ -446,27 +444,6 @@ using namespace facebook::react;
                                        }];
 }
 
-- (void)dismissAnimated:(BOOL)animated completion:(nullable TrueSheetCompletionBlock)completion {
-  if (_controller.isBeingDismissed) {
-    RCTLogWarn(@"TrueSheet: sheet is being dismissed. No need to dismiss it again.");
-    return;
-  }
-
-  if (!_controller.isPresented) {
-    if (completion) {
-      completion(YES, nil);
-    }
-    return;
-  }
-
-  [_controller dismissViewControllerAnimated:animated
-                                  completion:^{
-                                    if (completion) {
-                                      completion(YES, nil);
-                                    }
-                                  }];
-}
-
 - (void)resizeToIndex:(NSInteger)index completion:(nullable TrueSheetCompletionBlock)completion {
   if (!_controller.isPresented) {
     RCTLogWarn(@"TrueSheet: Cannot resize. Sheet is not presented.");
@@ -489,16 +466,20 @@ using namespace facebook::react;
   return _controller;
 }
 
-- (void)dismissAllAnimated:(BOOL)animated completion:(nullable TrueSheetCompletionBlock)completion {
-  if (!_controller.isPresented) {
+- (void)emitDismissedPosition {
+  [self viewControllerDidChangePosition:-1 position:_controller.screenHeight detent:0 realtime:NO];
+}
+
+- (void)dismissAnimated:(BOOL)animated completion:(nullable TrueSheetCompletionBlock)completion {
+  if (_controller.isBeingDismissed || !_controller.isPresented) {
+    RCTLogWarn(@"TrueSheet: sheet is already dismissed. No need to dismiss it again.");
+
     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
@@ -509,6 +490,33 @@ using namespace facebook::react;
                                 }];
 }
 
+- (void)dismissStackAnimated:(BOOL)animated completion:(nullable TrueSheetCompletionBlock)completion {
+  if (_controller.isBeingDismissed || !_controller.isPresented) {
+    RCTLogWarn(@"TrueSheet: sheet is already dismissed. No need to dismiss it again.");
+
+    if (completion) {
+      completion(YES, nil);
+    }
+    return;
+  }
+
+  // Only dismiss presented children, not this sheet itself
+  if (!_controller.presentedViewController) {
+    if (completion) {
+      completion(YES, nil);
+    }
+    return;
+  }
+
+  // Calling dismiss on _controller dismisses all VCs presented on top of it, but keeps _controller presented
+  [_controller dismissViewControllerAnimated:animated
+                                  completion:^{
+                                    if (completion) {
+                                      completion(YES, nil);
+                                    }
+                                  }];
+}
+
 #pragma mark - TrueSheetContainerViewDelegate
 
 /**
@@ -627,7 +635,7 @@ using namespace facebook::react;
 - (void)presenterScreenWillDisappear {
   if (_controller.isPresented && !_controller.isBeingDismissed) {
     _dismissedByNavigation = YES;
-    [self dismissAllAnimated:YES completion:nil];
+    [self dismissAnimated:YES completion:nil];
   }
 }
 

package/ios/TrueSheetViewController.h

@@ -69,6 +69,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL isPresented;
 @property (nonatomic, assign) NSInteger activeDetentIndex;
 @property (nonatomic, readonly) BOOL isTopmostPresentedController;
+
 @property (nonatomic, readonly) CGFloat screenHeight;
 
 - (void)applyActiveDetent;

package/ios/TrueSheetViewController.mm

@@ -222,12 +222,8 @@
   }
 }
 
-- (BOOL)isDismissing {
-  return self.presentingViewController == nil || self.isBeingDismissed;
-}
-
 - (void)emitWillDismissEvents {
-  if (self.isDismissing && !_isWillDismissEmitted) {
+  if (self.isBeingDismissed && !_isWillDismissEmitted) {
     _isWillDismissEmitted = YES;
 
     [self.delegate viewControllerWillBlur];
@@ -237,7 +233,7 @@
 }
 
 - (void)emitDidDismissEvents {
-  if (self.isDismissing) {
+  if (self.isBeingDismissed) {
     _isPresented = NO;
     _isWillDismissEmitted = NO;
 
@@ -398,12 +394,12 @@
   CGRect dismissedFrame = CGRectMake(0, self.screenHeight, 0, 0);
   CGRect presentedFrame = CGRectMake(0, self.currentPosition, 0, 0);
 
-  _transitionFakeView.frame = self.isDismissing ? presentedFrame : dismissedFrame;
+  _transitionFakeView.frame = self.isBeingDismissed ? presentedFrame : dismissedFrame;
   [self storeResolvedPositionForIndex:self.currentDetentIndex];
 
   auto animation = ^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
     [[context containerView] addSubview:self->_transitionFakeView];
-    self->_transitionFakeView.frame = self.isDismissing ? dismissedFrame : presentedFrame;
+    self->_transitionFakeView.frame = self.isBeingDismissed ? dismissedFrame : presentedFrame;
 
     self->_transitioningTimer = [CADisplayLink displayLinkWithTarget:self selector:@selector(handleTransitionTracker)];
     [self->_transitioningTimer addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];

package/ios/core/RNScreensEventObserver.mm

@@ -19,14 +19,14 @@ using namespace facebook::react;
 @implementation RNScreensEventObserver {
   std::weak_ptr<const EventDispatcher> _eventDispatcher;
   std::shared_ptr<const EventListener> _eventListener;
-  NSInteger _presenterScreenTag;
+  NSMutableSet<NSNumber *> *_screenTags;
   __weak UIViewController *_presenterScreenController;
   BOOL _dismissedByNavigation;
 }
 
 - (instancetype)init {
   if (self = [super init]) {
-    _presenterScreenTag = 0;
+    _screenTags = [NSMutableSet new];
     _presenterScreenController = nil;
   }
   return self;
@@ -61,7 +61,7 @@ using namespace facebook::react;
             [strongSelf.delegate presenterScreenWillDisappear];
           }
         } else if (event.type == "topWillAppear") {
-          if (screenTag == strongSelf->_presenterScreenTag && strongSelf->_dismissedByNavigation) {
+          if ([strongSelf->_screenTags containsObject:@(screenTag)] && strongSelf->_dismissedByNavigation) {
             strongSelf->_dismissedByNavigation = NO;
             [strongSelf.delegate presenterScreenWillAppear];
           }
@@ -85,33 +85,41 @@ using namespace facebook::react;
 }
 
 - (void)capturePresenterScreenFromView:(UIView *)view {
-  _presenterScreenTag = 0;
+  [_screenTags removeAllObjects];
   _presenterScreenController = nil;
 
   for (UIView *current = view.superview; current; current = current.superview) {
-    NSString *className = NSStringFromClass([current class]);
-
-    if ([className isEqualToString:@"RNSScreenView"]) {
-      _presenterScreenTag = current.tag;
-      for (UIResponder *r = current.nextResponder; r; r = r.nextResponder) {
-        if ([r isKindOfClass:[UIViewController class]]) {
-          _presenterScreenController = (UIViewController *)r;
-          break;
+    if ([NSStringFromClass([current class]) isEqualToString:@"RNSScreenView"]) {
+      [_screenTags addObject:@(current.tag)];
+
+      // Capture the view controller from the first (immediate presenter) screen
+      if (!_presenterScreenController) {
+        for (UIResponder *r = current.nextResponder; r; r = r.nextResponder) {
+          if ([r isKindOfClass:[UIViewController class]]) {
+            _presenterScreenController = (UIViewController *)r;
+            break;
+          }
         }
       }
-      break;
     }
   }
 }
 
 - (BOOL)shouldDismissForScreenTag:(NSInteger)screenTag {
-  if (_presenterScreenTag != screenTag) {
+  if (![_screenTags containsObject:@(screenTag)]) {
     return NO;
   }
 
+  UINavigationController *navController = _presenterScreenController.navigationController;
+
+  // If nav controller is nil or being dismissed, dismiss the sheet
+  if (!navController || navController.isBeingDismissed) {
+    return YES;
+  }
+
   // Skip if screen is still top of nav stack (e.g. modal dismiss - sheet dismisses naturally with modal)
   // Dismiss if a new screen was pushed or popped
-  return _presenterScreenController.navigationController.topViewController != _presenterScreenController;
+  return navController.topViewController != _presenterScreenController;
 }
 
 @end