@lodev09/react-native-true-sheet 4.0.0-beta.27 → 4.0.0-beta.29

package/ios/TrueSheetViewController.mm

@@ -77,6 +77,9 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
 @implementation TrueSheetViewController {
   TrueSheetPositionState _lastEmittedPositionState;
   CGSize _lastReportedSize;
+  // Net of the footer's baked-in inset, snapshotted together: the inset updates
+  // with the footer's layout, but a size change mid-present is deferred to
+  // didPresent, so subtracting it live pairs a new inset with a stale height.
   CGFloat _autoDetentHeight;
   CGFloat _peekDetentHeight;
   NSInteger _pendingDetentIndex;
@@ -1576,8 +1579,8 @@ static BOOL TrueSheetIsPhoneIdiom(void) {
  */
 - (void)setupSheetDetentsForSizeChange {
   if (@available(iOS 16.0, *)) {
-    CGFloat autoHeight = [_detentCalculator autoHeightForKeyboardHeight:_keyboardHeight];
-    CGFloat peekHeight = [_detentCalculator peekHeight];
+    CGFloat autoHeight = [_detentCalculator autoHeightForKeyboardHeight:_keyboardHeight] - [self autoDetentBottomInset];
+    CGFloat peekHeight = [_detentCalculator peekHeight] - [self peekDetentBottomInset];
 
     if (fabs(autoHeight - _autoDetentHeight) < 0.5 && fabs(peekHeight - _peekDetentHeight) < 0.5) {
       return;
@@ -1617,8 +1620,8 @@ static BOOL TrueSheetIsPhoneIdiom(void) {
   [_detentCalculator clearResolvedHeights];
   _hingeCorrections = 0;
 
-  _autoDetentHeight = [_detentCalculator autoHeightForKeyboardHeight:_keyboardHeight];
-  _peekDetentHeight = [_detentCalculator peekHeight];
+  _autoDetentHeight = [_detentCalculator autoHeightForKeyboardHeight:_keyboardHeight] - [self autoDetentBottomInset];
+  _peekDetentHeight = [_detentCalculator peekHeight] - [self peekDetentBottomInset];
 
   for (NSInteger index = 0; index < self.detents.count; index++) {
     id detent = self.detents[index];
@@ -1681,7 +1684,7 @@ static BOOL TrueSheetIsPhoneIdiom(void) {
       return [self customDetentWithIdentifier:@"custom-auto"
                                       atIndex:index
                                   heightBlock:^CGFloat {
-                                    return self->_autoDetentHeight - [self autoDetentBottomInset];
+                                    return self->_autoDetentHeight;
                                   }];
     } else {
       return [UISheetPresentationControllerDetent mediumDetent];
@@ -1693,7 +1696,7 @@ static BOOL TrueSheetIsPhoneIdiom(void) {
       return [self customDetentWithIdentifier:@"custom-peek"
                                       atIndex:index
                                   heightBlock:^CGFloat {
-                                    return self->_peekDetentHeight - [self peekDetentBottomInset];
+                                    return self->_peekDetentHeight;
                                   }];
     } else {
       return [UISheetPresentationControllerDetent mediumDetent];

package/ios/core/RNScreensEventObserver.mm

@@ -22,8 +22,7 @@ using namespace facebook::react;
   NSInteger _presenterScreenTag;
   NSMutableSet<NSNumber *> *_screenTags;
   __weak UIViewController *_presenterScreenController;
-  __weak UIViewController *_parentScreenController;
-  __weak UIWindow *_window;
+  NSHashTable<UIViewController *> *_parentScreenControllers;
   BOOL _dismissedByNavigation;
   BOOL _pendingInteractiveDismiss;
   BOOL _pendingInteractiveAppear;
@@ -39,8 +38,7 @@ using namespace facebook::react;
     _presenterScreenTag = 0;
     _screenTags = [NSMutableSet new];
     _presenterScreenController = nil;
-    _parentScreenController = nil;
-    _window = nil;
+    _parentScreenControllers = [NSHashTable weakObjectsHashTable];
   }
   return self;
 }
@@ -143,8 +141,7 @@ using namespace facebook::react;
   _presenterScreenTag = 0;
   [_screenTags removeAllObjects];
   _presenterScreenController = nil;
-  _parentScreenController = nil;
-  _window = view.window;
+  [_parentScreenControllers removeAllObjects];
 
   Class screenViewClass = NSClassFromString(@"RNSScreenView");
   if (!screenViewClass)
@@ -165,8 +162,8 @@ using namespace facebook::react;
       if (!_presenterScreenController) {
         _presenterScreenTag = current.tag;
         _presenterScreenController = screenVC;
-      } else if (!_parentScreenController && screenVC) {
-        _parentScreenController = screenVC;
+      } else if (screenVC) {
+        [_parentScreenControllers addObject:screenVC];
       }
     }
   }
@@ -239,27 +236,16 @@ using namespace facebook::react;
 }
 
 - (BOOL)shouldDismissForScreenTag:(NSInteger)screenTag {
-  // For parent screens (not immediate presenter), check if the presenter screen is being removed
-  // This handles nested stack removal case
+  // For parent screens, dismiss if one was popped or covered in its own stack. The presenter
+  // may already be detached (e.g. its nested stack unmounting), so it can't be checked here.
+  // Skip if all are still top (e.g. modal dismiss - sheet dismisses naturally)
   if (screenTag != _presenterScreenTag) {
-    UINavigationController *parentNav = _parentScreenController.navigationController;
-
-    // Modal case: parent's nav is presented -> let sheet dismiss naturally
-    // Nested stack case: parent's nav is not presented (embedded) -> need to dismiss
-    if (parentNav.presentingViewController != nil) {
-      return NO;
-    }
-
-    if (!_parentScreenController) {
-      return NO;
-    }
-
-    // If presenter view is no longer in window, the nested stack is being removed
-    UIView *presenterView = [_window viewWithTag:_presenterScreenTag];
-    if (presenterView == nil || presenterView.window == nil) {
-      return YES;
+    for (UIViewController *screen in _parentScreenControllers) {
+      UINavigationController *nav = screen.navigationController;
+      if (nav && nav.topViewController != screen) {
+        return YES;
+      }
     }
-
     return NO;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "4.0.0-beta.27",
+  "version": "4.0.0-beta.29",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",