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

package/ios/TrueSheetViewController.mm

@@ -25,6 +25,7 @@
 
 @implementation TrueSheetViewController {
   CGFloat _lastPosition;
+  CGFloat _lastWidth;
   NSInteger _pendingDetentIndex;
   BOOL _pendingContentSizeChange;
   BOOL _pendingDetentsChange;
@@ -211,6 +212,7 @@
     dispatch_async(dispatch_get_main_queue(), ^{
       NSInteger index = [self currentDetentIndex];
       CGFloat detent = [self detentValueForIndex:index];
+      [self.delegate viewControllerDidChangeSize:self.view.frame.size];
       [self.delegate viewControllerDidPresentAtIndex:index position:self.currentPosition detent:detent];
       [self.delegate viewControllerDidFocus];
 
@@ -288,7 +290,12 @@
 - (void)viewDidLayoutSubviews {
   [super viewDidLayoutSubviews];
 
-  [self.delegate viewControllerDidChangeSize:self.view.frame.size];
+  // Update state on rotation (width change)
+  CGFloat width = self.view.frame.size.width;
+  if (_lastWidth != width) {
+    _lastWidth = width;
+    [self.delegate viewControllerDidChangeSize:self.view.frame.size];
+  }
 
   if (_pendingDetentIndex >= 0) {
     NSInteger pendingIndex = _pendingDetentIndex;
@@ -297,6 +304,7 @@
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
       [self storeResolvedPositionForIndex:pendingIndex];
       CGFloat detent = [self detentValueForIndex:pendingIndex];
+      [self.delegate viewControllerDidChangeSize:self.view.frame.size];
       [self.delegate viewControllerDidChangeDetent:pendingIndex position:self.currentPosition detent:detent];
       [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO debug:@"pending detent change"];
     });
@@ -735,6 +743,7 @@
     NSInteger index = self.currentDetentIndex;
     if (index >= 0) {
       CGFloat detent = [self detentValueForIndex:index];
+      [self.delegate viewControllerDidChangeSize:self.view.frame.size];
       [self.delegate viewControllerDidChangeDetent:index position:self.currentPosition detent:detent];
     }
   });

package/ios/core/RNScreensEventObserver.mm

@@ -19,15 +19,21 @@ 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;
+  __weak UIViewController *_parentScreenController;
+  __weak UIWindow *_window;
   BOOL _dismissedByNavigation;
 }
 
 - (instancetype)init {
   if (self = [super init]) {
+    _presenterScreenTag = 0;
     _screenTags = [NSMutableSet new];
     _presenterScreenController = nil;
+    _parentScreenController = nil;
+    _window = nil;
   }
   return self;
 }
@@ -56,9 +62,11 @@ using namespace facebook::react;
         Tag screenTag = family->getTag();
 
         if (event.type == "topWillDisappear") {
-          if ([strongSelf shouldDismissForScreenTag:screenTag]) {
-            strongSelf->_dismissedByNavigation = YES;
-            [strongSelf.delegate presenterScreenWillDisappear];
+          if ([strongSelf->_screenTags containsObject:@(screenTag)]) {
+            if ([strongSelf shouldDismissForScreenTag:screenTag]) {
+              strongSelf->_dismissedByNavigation = YES;
+              [strongSelf.delegate presenterScreenWillDisappear];
+            }
           }
         } else if (event.type == "topWillAppear") {
           if ([strongSelf->_screenTags containsObject:@(screenTag)] && strongSelf->_dismissedByNavigation) {
@@ -85,40 +93,68 @@ using namespace facebook::react;
 }
 
 - (void)capturePresenterScreenFromView:(UIView *)view {
+  _presenterScreenTag = 0;
   [_screenTags removeAllObjects];
   _presenterScreenController = nil;
+  _parentScreenController = nil;
+  _window = view.window;
 
   for (UIView *current = view.superview; current; current = current.superview) {
     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;
-          }
+      UIViewController *screenVC = nil;
+      for (UIResponder *r = current.nextResponder; r; r = r.nextResponder) {
+        if ([r isKindOfClass:[UIViewController class]]) {
+          screenVC = (UIViewController *)r;
+          break;
         }
       }
+
+      if (!_presenterScreenController) {
+        _presenterScreenTag = current.tag;
+        _presenterScreenController = screenVC;
+      } else if (!_parentScreenController && screenVC) {
+        _parentScreenController = screenVC;
+      }
     }
   }
 }
 
 - (BOOL)shouldDismissForScreenTag:(NSInteger)screenTag {
-  if (![_screenTags containsObject:@(screenTag)]) {
+  // For parent screens (not immediate presenter), check if the presenter screen is being removed
+  // This handles nested stack removal case
+  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;
+    }
+
     return NO;
   }
 
+  // For immediate presenter screen
   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
+  // Dismiss if presenter is no longer top of nav stack (pushed/popped)
+  // Skip if still top (e.g. modal dismiss - sheet dismisses naturally)
   return navController.topViewController != _presenterScreenController;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "3.8.0-beta.3",
+  "version": "3.8.0-beta.4",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -56,7 +56,7 @@
     "clean": "scripts/clean.sh",
     "prepare": "bob build",
     "release": "release-it",
-    "release:beta": "yarn release --preRelease=beta"
+    "release:beta": "yarn release --preRelease=beta --no-github.release"
   },
   "keywords": [
     "react-native",
@@ -178,7 +178,8 @@
   "release-it": {
     "git": {
       "commitMessage": "chore: release ${version}",
-      "tagName": "v${version}"
+      "tagName": "v${version}",
+      "tagExclude": "*-beta*"
     },
     "npm": {
       "publish": false