@lodev09/react-native-true-sheet 3.0.0-beta.0 → 3.0.0-beta.1

package/ios/TrueSheetView.mm

@@ -302,7 +302,11 @@ using namespace facebook::react;
 
 - (void)prepareForRecycle {
   [super prepareForRecycle];
-  [self invalidate];
+
+  // Dismiss controller if presented
+  if (_controller && _controller.presentingViewController) {
+    [_controller dismissViewControllerAnimated:YES completion:nil];
+  }
 
   // Unregister from the registry
   // Note: Re-registration will happen automatically when the component is reused

package/ios/TrueSheetViewController.h

@@ -8,6 +8,13 @@
 
 #import <UIKit/UIKit.h>
 
+#if __has_include(<RNScreens/RNSDismissibleModalProtocol.h>)
+#import <RNScreens/RNSDismissibleModalProtocol.h>
+#define RNS_DISMISSIBLE_MODAL_PROTOCOL_AVAILABLE 1
+#else
+#define RNS_DISMISSIBLE_MODAL_PROTOCOL_AVAILABLE 0
+#endif
+
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol TrueSheetViewControllerDelegate <NSObject>
@@ -23,7 +30,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface TrueSheetViewController : UIViewController <UISheetPresentationControllerDelegate>
+@interface TrueSheetViewController : UIViewController <UISheetPresentationControllerDelegate
+#if RNS_DISMISSIBLE_MODAL_PROTOCOL_AVAILABLE
+                                       ,
+                                       RNSDismissibleModalProtocol
+#endif
+                                       >
 
 @property (nonatomic, weak, nullable) id<TrueSheetViewControllerDelegate> delegate;
 @property (nonatomic, strong) NSArray *detents;

package/ios/TrueSheetViewController.mm

@@ -58,6 +58,9 @@
     // The sheet's view has smaller insets, so we need the actual device insets
     UIWindow *window = [WindowUtil keyWindow];
     _bottomInset = window ? window.safeAreaInsets.bottom : 0;
+
+    // Allow modals to be presented from this view controller
+    self.definesPresentationContext = YES;
   }
   return self;
 }
@@ -127,7 +130,8 @@
 - (void)viewWillDisappear:(BOOL)animated {
   [super viewWillDisappear:animated];
 
-  if ([self.delegate respondsToSelector:@selector(viewControllerWillDismiss)]) {
+  // Only dispatch willDismiss if the sheet is actually being dismissed
+  if (self.isBeingDismissed && [self.delegate respondsToSelector:@selector(viewControllerWillDismiss)]) {
     [self.delegate viewControllerWillDismiss];
   }
 
@@ -137,13 +141,22 @@
 
 - (void)viewDidDisappear:(BOOL)animated {
   [super viewDidDisappear:animated];
-  if ([self.delegate respondsToSelector:@selector(viewControllerDidDismiss)]) {
+
+  // Only dispatch didDismiss if the sheet is actually being dismissed
+  // (not when another modal is presented on top)
+  BOOL isActuallyDismissing = self.presentingViewController == nil || self.isBeingDismissed;
+
+  if (isActuallyDismissing && [self.delegate respondsToSelector:@selector(viewControllerDidDismiss)]) {
     [self.delegate viewControllerDidDismiss];
   }
 
   _isTrackingPositionFromLayout = NO;
-  _isPresented = NO;
-  _activeDetentIndex = -1;
+
+  // Only reset state if actually dismissing
+  if (isActuallyDismissing) {
+    _isPresented = NO;
+    _activeDetentIndex = -1;
+  }
 }
 
 - (void)viewWillTransitionToSize:(CGSize)size
@@ -646,4 +659,14 @@
   }
 }
 
+#pragma mark - RNSDismissibleModalProtocol
+
+#if RNS_DISMISSIBLE_MODAL_PROTOCOL_AVAILABLE
+- (BOOL)isDismissible {
+  // Return NO to prevent react-native-screens from dismissing this sheet
+  // when presenting a React Navigation modal
+  return NO;
+}
+#endif
+
 @end

package/package.json

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