@lodev09/react-native-true-sheet 3.7.3 → 3.7.4-beta.1

package/ios/TrueSheetContentView.mm

@@ -15,7 +15,6 @@
 #import <react/renderer/components/TrueSheetSpec/Props.h>
 #import <react/renderer/components/TrueSheetSpec/RCTComponentViewHelpers.h>
 #import "TrueSheetView.h"
-#import "TrueSheetViewController.h"
 #import "utils/LayoutUtil.h"
 
 using namespace facebook::react;
@@ -24,6 +23,8 @@ using namespace facebook::react;
   RCTScrollViewComponentView *_pinnedScrollView;
   UIView *_pinnedTopView;
   CGSize _lastSize;
+  UIEdgeInsets _contentInsets;
+  UIEdgeInsets _pinnedInsets;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
@@ -34,109 +35,96 @@ using namespace facebook::react;
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const TrueSheetContentViewProps>();
     _props = defaultProps;
-
-    _pinnedScrollView = nil;
-    _pinnedTopView = nil;
-    _lastSize = CGSizeZero;
   }
   return self;
 }
 
+#pragma mark - Layout
+
 - (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
            oldLayoutMetrics:(const LayoutMetrics &)oldLayoutMetrics {
   [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
 
-  // Notify delegate when content size changes for sheet height updates
+  UIEdgeInsets newInsets = UIEdgeInsetsMake(layoutMetrics.contentInsets.top, layoutMetrics.contentInsets.left,
+    layoutMetrics.contentInsets.bottom, layoutMetrics.contentInsets.right);
+
+  if (!UIEdgeInsetsEqualToEdgeInsets(newInsets, _contentInsets)) {
+    _contentInsets = newInsets;
+    [self.delegate contentViewDidChangeInsets];
+  }
+
   CGSize newSize = CGSizeMake(layoutMetrics.frame.size.width, layoutMetrics.frame.size.height);
   if (!CGSizeEqualToSize(newSize, _lastSize)) {
     _lastSize = newSize;
-    if ([self.delegate respondsToSelector:@selector(contentViewDidChangeSize:)]) {
-      [self.delegate contentViewDidChangeSize:newSize];
-    }
+    [self.delegate contentViewDidChangeSize:newSize];
   }
 }
 
+#pragma mark - Child Mounting
+
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
   [super mountChildComponentView:childComponentView index:index];
-
-  if ([self.delegate respondsToSelector:@selector(contentViewDidChangeChildren)]) {
-    [self.delegate contentViewDidChangeChildren];
-  }
+  [self.delegate contentViewDidChangeChildren];
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
   [super unmountChildComponentView:childComponentView index:index];
-
-  if ([self.delegate respondsToSelector:@selector(contentViewDidChangeChildren)]) {
-    [self.delegate contentViewDidChangeChildren];
-  }
+  [self.delegate contentViewDidChangeChildren];
 }
 
-- (void)unpinScrollViewFromParentView:(UIView *)parentView {
-  // Unpin previous scroll view if exists
+#pragma mark - ScrollView Pinning
+
+- (void)clearPinning {
   if (_pinnedScrollView) {
-    [LayoutUtil unpinView:_pinnedScrollView fromParentView:parentView];
+    [LayoutUtil unpinView:_pinnedScrollView fromParentView:self];
+    [LayoutUtil unpinView:_pinnedScrollView fromParentView:self.superview];
   }
+  _pinnedScrollView = nil;
+  _pinnedTopView = nil;
+  _pinnedInsets = UIEdgeInsetsZero;
 }
 
-- (void)setupScrollViewPinning:(BOOL)pinned withHeaderView:(UIView *)headerView {
-  // Pin to container view (parent of content view)
+- (void)setupScrollViewPinning:(BOOL)pinned {
   UIView *containerView = self.superview;
 
   if (!pinned) {
-    [self unpinScrollViewFromParentView:containerView];
-    _pinnedScrollView = nil;
-    _pinnedTopView = nil;
+    [self clearPinning];
     return;
   }
 
-  // Auto-detect and pin scroll views for proper sheet scrolling behavior
-  // Pinning ensures ScrollView fills the available area and scrolls correctly with the sheet
   UIView *topSibling = nil;
   RCTScrollViewComponentView *scrollView = [self findScrollView:&topSibling];
 
-  // Use closest top sibling if found, otherwise fall back to header view
-  UIView *topView = topSibling ?: headerView;
+  BOOL needsUpdate = scrollView != _pinnedScrollView || topSibling != _pinnedTopView ||
+                     !UIEdgeInsetsEqualToEdgeInsets(_contentInsets, _pinnedInsets);
 
-  // Re-pin when scroll view or top view changes
-  BOOL scrollViewChanged = scrollView != _pinnedScrollView;
-  BOOL topViewChanged = topView != _pinnedTopView;
+  if (scrollView && containerView && needsUpdate) {
+    [self clearPinning];
 
-  if (scrollView && containerView && (scrollViewChanged || topViewChanged)) {
-    // Unpin first to remove old constraints
-    [self unpinScrollViewFromParentView:containerView];
+    UIEdgeInsets insets =
+      UIEdgeInsetsMake(topSibling ? 0 : _contentInsets.top, _contentInsets.left, 0, _contentInsets.right);
 
-    if (topView) {
-      // Pin ScrollView below the top view
+    if (topSibling) {
       [LayoutUtil pinView:scrollView
-             toParentView:containerView
-              withTopView:topView
-                    edges:UIRectEdgeLeft | UIRectEdgeRight | UIRectEdgeBottom];
+             toParentView:self
+              withTopView:topSibling
+                    edges:UIRectEdgeLeft | UIRectEdgeRight
+                   insets:insets];
     } else {
-      // No top view, pin to all edges of container
-      [LayoutUtil pinView:scrollView toParentView:containerView edges:UIRectEdgeAll];
+      [LayoutUtil pinView:scrollView
+             toParentView:self
+                    edges:UIRectEdgeTop | UIRectEdgeLeft | UIRectEdgeRight
+                   insets:insets];
     }
 
+    [LayoutUtil pinView:scrollView toParentView:containerView edges:UIRectEdgeBottom];
+
     _pinnedScrollView = scrollView;
-    _pinnedTopView = topView;
+    _pinnedTopView = topSibling;
+    _pinnedInsets = _contentInsets;
   } else if (!scrollView && _pinnedScrollView) {
-    // ScrollView was removed, clean up
-    [self unpinScrollViewFromParentView:containerView];
-    _pinnedScrollView = nil;
-    _pinnedTopView = nil;
-  }
-}
-
-- (RCTScrollViewComponentView *)findScrollViewInSubviews:(NSArray<UIView *> *)subviews {
-  for (UIView *subview in subviews) {
-    if ([subview isKindOfClass:TrueSheetView.class]) {
-      continue;
-    }
-    if ([subview isKindOfClass:RCTScrollViewComponentView.class]) {
-      return (RCTScrollViewComponentView *)subview;
-    }
+    [self clearPinning];
   }
-  return nil;
 }
 
 - (RCTScrollViewComponentView *)findScrollView:(UIView **)outTopSibling {
@@ -144,12 +132,8 @@ using namespace facebook::react;
     return nil;
   }
 
-  UIView *topSibling = nil;
-
-  // Check first-level children for scroll views (ScrollView or FlatList)
   RCTScrollViewComponentView *scrollView = [self findScrollViewInSubviews:self.subviews];
 
-  // If not found, check second level (grandchildren)
   if (!scrollView) {
     for (UIView *subview in self.subviews) {
       scrollView = [self findScrollViewInSubviews:subview.subviews];
@@ -159,43 +143,54 @@ using namespace facebook::react;
     }
   }
 
-  // Find the view positioned directly above the ScrollView (only for first-level)
-  if (scrollView && scrollView.superview == self && self.subviews.count > 1) {
-    CGFloat scrollViewTop = CGRectGetMinY(scrollView.frame);
-    CGFloat closestDistance = CGFLOAT_MAX;
+  if (outTopSibling) {
+    *outTopSibling = [self findTopSiblingForScrollView:scrollView];
+  }
 
-    for (UIView *sibling in self.subviews) {
-      if (sibling == scrollView || [sibling isKindOfClass:TrueSheetView.class]) {
-        continue;
-      }
+  return scrollView;
+}
 
-      CGFloat siblingBottom = CGRectGetMaxY(sibling.frame);
-      if (siblingBottom <= scrollViewTop) {
-        CGFloat distance = scrollViewTop - siblingBottom;
-        if (distance < closestDistance) {
-          closestDistance = distance;
-          topSibling = sibling;
-        }
-      }
+- (RCTScrollViewComponentView *)findScrollViewInSubviews:(NSArray<UIView *> *)subviews {
+  for (UIView *subview in subviews) {
+    if ([subview isKindOfClass:RCTScrollViewComponentView.class] && ![subview isKindOfClass:TrueSheetView.class]) {
+      return (RCTScrollViewComponentView *)subview;
     }
   }
+  return nil;
+}
 
-  if (outTopSibling) {
-    *outTopSibling = topSibling;
+- (UIView *)findTopSiblingForScrollView:(RCTScrollViewComponentView *)scrollView {
+  if (!scrollView || scrollView.superview != self || self.subviews.count <= 1) {
+    return nil;
   }
 
-  return scrollView;
+  CGFloat scrollViewTop = CGRectGetMinY(scrollView.frame);
+  UIView *topSibling = nil;
+  CGFloat closestDistance = CGFLOAT_MAX;
+
+  for (UIView *sibling in self.subviews) {
+    if (sibling == scrollView || [sibling isKindOfClass:TrueSheetView.class]) {
+      continue;
+    }
+
+    CGFloat siblingBottom = CGRectGetMaxY(sibling.frame);
+    if (siblingBottom <= scrollViewTop) {
+      CGFloat distance = scrollViewTop - siblingBottom;
+      if (distance < closestDistance) {
+        closestDistance = distance;
+        topSibling = sibling;
+      }
+    }
+  }
+
+  return topSibling;
 }
 
+#pragma mark - Lifecycle
+
 - (void)prepareForRecycle {
   [super prepareForRecycle];
-
-  // Remove scroll view constraints
-  if (_pinnedScrollView) {
-    [LayoutUtil unpinView:_pinnedScrollView fromParentView:self.superview];
-    _pinnedScrollView = nil;
-    _pinnedTopView = nil;
-  }
+  [self clearPinning];
 }
 
 @end

package/ios/TrueSheetHeaderView.mm

@@ -44,9 +44,7 @@ using namespace facebook::react;
   // Notify delegate when header size changes
   if (!CGSizeEqualToSize(newSize, _lastSize)) {
     _lastSize = newSize;
-    if ([self.delegate respondsToSelector:@selector(headerViewDidChangeSize:)]) {
-      [self.delegate headerViewDidChangeSize:newSize];
-    }
+    [self.delegate headerViewDidChangeSize:newSize];
   }
 }
 

package/ios/TrueSheetView.mm

@@ -14,6 +14,7 @@
 #import "TrueSheetFooterView.h"
 #import "TrueSheetModule.h"
 #import "TrueSheetViewController.h"
+#import "core/RNScreensEventObserver.h"
 #import "events/TrueSheetDragEvents.h"
 #import "events/TrueSheetFocusEvents.h"
 #import "events/TrueSheetLifecycleEvents.h"
@@ -36,7 +37,9 @@
 
 using namespace facebook::react;
 
-@interface TrueSheetView () <TrueSheetViewControllerDelegate, TrueSheetContainerViewDelegate>
+@interface TrueSheetView () <TrueSheetViewControllerDelegate,
+  TrueSheetContainerViewDelegate,
+  RNScreensEventObserverDelegate>
 @end
 
 @implementation TrueSheetView {
@@ -52,6 +55,10 @@ using namespace facebook::react;
   BOOL _isSheetUpdatePending;
   BOOL _pendingLayoutUpdate;
   BOOL _didInitiallyPresent;
+  BOOL _dismissedByNavigation;
+  BOOL _pendingNavigationRepresent;
+  BOOL _pendingMountEvent;
+  RNScreensEventObserver *_screensEventObserver;
 }
 
 #pragma mark - Initialization
@@ -75,6 +82,9 @@ using namespace facebook::react;
     _initialDetentAnimated = YES;
     _scrollable = NO;
     _isSheetUpdatePending = NO;
+
+    _screensEventObserver = [[RNScreensEventObserver alloc] init];
+    _screensEventObserver.delegate = self;
   }
   return self;
 }
@@ -89,6 +99,12 @@ using namespace facebook::react;
     [TrueSheetModule registerView:self withTag:@(self.tag)];
   }
 
+  if (_pendingNavigationRepresent && !_controller.isPresented) {
+    _pendingNavigationRepresent = NO;
+    [self presentAtIndex:_controller.activeDetentIndex animated:YES completion:nil];
+    return;
+  }
+
   if (_initialDetentIndex >= 0 && !_didInitiallyPresent) {
     UIViewController *vc = [self findPresentingViewController];
 
@@ -104,6 +120,9 @@ using namespace facebook::react;
 }
 
 - (void)dealloc {
+  [_screensEventObserver stopObserving];
+  _screensEventObserver = nil;
+
   if (_controller && _controller.presentingViewController) {
     // Find the root presenting controller to dismiss the entire stack
     UIViewController *root = _controller.presentingViewController;
@@ -114,6 +133,8 @@ using namespace facebook::react;
   }
 
   _didInitiallyPresent = NO;
+  _dismissedByNavigation = NO;
+  _pendingNavigationRepresent = NO;
 
   _controller.delegate = nil;
   _controller = nil;
@@ -227,6 +248,8 @@ using namespace facebook::react;
   if (_controller) {
     [self updateStateWithSize:_controller.view.frame.size];
   }
+
+  [_screensEventObserver startObservingWithState:_state.get()->getData()];
 }
 
 /**
@@ -248,6 +271,12 @@ using namespace facebook::react;
 - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask {
   [super finalizeUpdates:updateMask];
 
+  // Emit pending mount event now that eventEmitter is available
+  if (_pendingMountEvent && (updateMask & RNComponentViewUpdateMaskEventEmitter)) {
+    _pendingMountEvent = NO;
+    [TrueSheetLifecycleEvents emitMount:_eventEmitter];
+  }
+
   if (!(updateMask & RNComponentViewUpdateMaskProps) || !_controller)
     return;
 
@@ -281,6 +310,8 @@ using namespace facebook::react;
 
   _lastStateSize = CGSizeZero;
   _didInitiallyPresent = NO;
+  _dismissedByNavigation = NO;
+  _pendingNavigationRepresent = NO;
 }
 
 #pragma mark - Child Component Mounting
@@ -320,19 +351,25 @@ using namespace facebook::react;
   _containerView.scrollViewPinningEnabled = _scrollable;
   [_containerView setupContentScrollViewPinning];
 
-  [TrueSheetLifecycleEvents emitMount:_eventEmitter];
+  if (_eventEmitter) {
+    [TrueSheetLifecycleEvents emitMount:_eventEmitter];
+  } else {
+    _pendingMountEvent = YES;
+  }
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
   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;
+  if (_controller.isPresented) {
+    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;
@@ -381,6 +418,8 @@ using namespace facebook::react;
   [_controller setupSheetDetents];
   [_controller setupActiveDetentWithIndex:index];
 
+  [_screensEventObserver capturePresenterScreenFromView:self];
+
   [presentingViewController presentViewController:_controller
                                          animated:animated
                                        completion:^{
@@ -510,13 +549,20 @@ using namespace facebook::react;
 }
 
 - (void)viewControllerWillDismiss {
-  [_containerView cleanupKeyboardHandler];
-  [TrueSheetLifecycleEvents emitWillDismiss:_eventEmitter];
+  if (!_dismissedByNavigation) {
+    [TrueSheetLifecycleEvents emitWillDismiss:_eventEmitter];
+  }
 }
 
 - (void)viewControllerDidDismiss {
-  _controller.activeDetentIndex = -1;
-  [TrueSheetLifecycleEvents emitDidDismiss:_eventEmitter];
+  [_containerView cleanupKeyboardHandler];
+  if (!_dismissedByNavigation) {
+    _dismissedByNavigation = NO;
+    _pendingNavigationRepresent = NO;
+
+    _controller.activeDetentIndex = -1;
+    [TrueSheetLifecycleEvents emitDidDismiss:_eventEmitter];
+  }
 }
 
 - (void)viewControllerDidChangeDetent:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent {
@@ -553,8 +599,20 @@ using namespace facebook::react;
   [TrueSheetFocusEvents emitDidBlur:_eventEmitter];
 }
 
-- (void)viewControllerDidDetectScreenDisappear {
-  [self dismissAllAnimated:YES completion:nil];
+#pragma mark - RNScreensEventObserverDelegate
+
+- (void)presenterScreenWillDisappear {
+  if (_controller.isPresented && !_controller.isBeingDismissed) {
+    _dismissedByNavigation = YES;
+    [self dismissAllAnimated:YES completion:nil];
+  }
+}
+
+- (void)presenterScreenWillAppear {
+  if (_dismissedByNavigation && !_controller.isPresented && !_controller.isBeingPresented) {
+    _dismissedByNavigation = NO;
+    _pendingNavigationRepresent = YES;
+  }
 }
 
 #pragma mark - Private Helpers

package/ios/TrueSheetViewController.h

@@ -16,13 +16,6 @@
 #define RNS_DISMISSIBLE_MODAL_PROTOCOL_AVAILABLE 0
 #endif
 
-#if __has_include(<RNScreens/RNSLifecycleListenerProtocol.h>)
-#import <RNScreens/RNSLifecycleListenerProtocol.h>
-#define RNS_LIFECYCLE_LISTENER_PROTOCOL_AVAILABLE 1
-#else
-#define RNS_LIFECYCLE_LISTENER_PROTOCOL_AVAILABLE 0
-#endif
-
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol TrueSheetViewControllerDelegate <NSObject>
@@ -46,10 +39,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)viewControllerWillBlur;
 - (void)viewControllerDidBlur;
 
-#if RNS_LIFECYCLE_LISTENER_PROTOCOL_AVAILABLE
-- (void)viewControllerDidDetectScreenDisappear;
-#endif
-
 @end
 
 @interface TrueSheetViewController : UIViewController <UISheetPresentationControllerDelegate,
@@ -57,10 +46,6 @@ NS_ASSUME_NONNULL_BEGIN
 #if RNS_DISMISSIBLE_MODAL_PROTOCOL_AVAILABLE
                                        ,
                                        RNSDismissibleModalProtocol
-#endif
-#if RNS_LIFECYCLE_LISTENER_PROTOCOL_AVAILABLE
-                                       ,
-                                       RNSLifecycleListenerProtocol
 #endif
                                        >