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

package/ios/TrueSheetContentView.mm

@@ -21,6 +21,7 @@ using namespace facebook::react;
 
 @implementation TrueSheetContentView {
   RCTScrollViewComponentView *_pinnedScrollView;
+  UIView *_pinnedTopView;
   CGSize _lastSize;
 }
 
@@ -34,6 +35,7 @@ using namespace facebook::react;
     _props = defaultProps;
 
     _pinnedScrollView = nil;
+    _pinnedTopView = nil;
     _lastSize = CGSizeZero;
   }
   return self;
@@ -53,6 +55,22 @@ using namespace facebook::react;
   }
 }
 
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
+  [super mountChildComponentView:childComponentView index:index];
+
+  if ([self.delegate respondsToSelector:@selector(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];
+  }
+}
+
 - (void)unpinScrollViewFromParentView:(UIView *)parentView {
   // Unpin previous scroll view if exists
   if (_pinnedScrollView) {
@@ -67,43 +85,104 @@ using namespace facebook::react;
   if (!pinned) {
     [self unpinScrollViewFromParentView:containerView];
     _pinnedScrollView = nil;
+    _pinnedTopView = nil;
     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
-  RCTScrollViewComponentView *scrollView = [self findScrollView];
+  UIView *topSibling = nil;
+  RCTScrollViewComponentView *scrollView = [self findScrollView:&topSibling];
+
+  // Use closest top sibling if found, otherwise fall back to header view
+  UIView *topView = topSibling ?: headerView;
 
-  if (scrollView && containerView) {
-    // Always unpin first to remove old constraints
+  // Re-pin when scroll view or top view changes
+  BOOL scrollViewChanged = scrollView != _pinnedScrollView;
+  BOOL topViewChanged = topView != _pinnedTopView;
+
+  if (scrollView && containerView && (scrollViewChanged || topViewChanged)) {
+    // Unpin first to remove old constraints
     [self unpinScrollViewFromParentView:containerView];
 
-    if (headerView) {
-      // Pin ScrollView below the header view
+    if (topView) {
+      // Pin ScrollView below the top view
       [LayoutUtil pinView:scrollView
              toParentView:containerView
-              withTopView:headerView
+              withTopView:topView
                     edges:UIRectEdgeLeft | UIRectEdgeRight | UIRectEdgeBottom];
     } else {
-      // No header, pin to all edges of container
+      // No top view, pin to all edges of container
       [LayoutUtil pinView:scrollView toParentView:containerView edges:UIRectEdgeAll];
     }
 
     _pinnedScrollView = scrollView;
+    _pinnedTopView = topView;
+  } else if (!scrollView && _pinnedScrollView) {
+    // ScrollView was removed, clean up
+    [self unpinScrollViewFromParentView:containerView];
+    _pinnedScrollView = nil;
+    _pinnedTopView = nil;
   }
 }
 
-- (RCTScrollViewComponentView *)findScrollView {
-  // Check first-level children for scroll views (ScrollView or FlatList)
-  for (UIView *subview in self.subviews) {
+- (RCTScrollViewComponentView *)findScrollViewInSubviews:(NSArray<UIView *> *)subviews {
+  for (UIView *subview in subviews) {
     if ([subview isKindOfClass:RCTScrollViewComponentView.class]) {
       return (RCTScrollViewComponentView *)subview;
     }
   }
-
   return nil;
 }
 
+- (RCTScrollViewComponentView *)findScrollView:(UIView **)outTopSibling {
+  if (self.subviews.count == 0) {
+    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];
+      if (scrollView) {
+        break;
+      }
+    }
+  }
+
+  // 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;
+
+    for (UIView *sibling in self.subviews) {
+      if (sibling == scrollView) {
+        continue;
+      }
+
+      CGFloat siblingBottom = CGRectGetMaxY(sibling.frame);
+      if (siblingBottom <= scrollViewTop) {
+        CGFloat distance = scrollViewTop - siblingBottom;
+        if (distance < closestDistance) {
+          closestDistance = distance;
+          topSibling = sibling;
+        }
+      }
+    }
+  }
+
+  if (outTopSibling) {
+    *outTopSibling = topSibling;
+  }
+
+  return scrollView;
+}
+
 - (void)prepareForRecycle {
   [super prepareForRecycle];
 
@@ -111,6 +190,7 @@ using namespace facebook::react;
   if (_pinnedScrollView) {
     [LayoutUtil unpinView:_pinnedScrollView fromParentView:self.superview];
     _pinnedScrollView = nil;
+    _pinnedTopView = nil;
   }
 }
 

package/ios/TrueSheetView.mm

@@ -14,16 +14,10 @@
 #import "TrueSheetFooterView.h"
 #import "TrueSheetModule.h"
 #import "TrueSheetViewController.h"
-#import "events/OnDetentChangeEvent.h"
-#import "events/OnDidDismissEvent.h"
-#import "events/OnDidPresentEvent.h"
-#import "events/OnDragBeginEvent.h"
-#import "events/OnDragChangeEvent.h"
-#import "events/OnDragEndEvent.h"
-#import "events/OnMountEvent.h"
-#import "events/OnPositionChangeEvent.h"
-#import "events/OnWillDismissEvent.h"
-#import "events/OnWillPresentEvent.h"
+#import "events/TrueSheetDragEvents.h"
+#import "events/TrueSheetFocusEvents.h"
+#import "events/TrueSheetLifecycleEvents.h"
+#import "events/TrueSheetStateEvents.h"
 #import "utils/LayoutUtil.h"
 #import "utils/WindowUtil.h"
 
@@ -53,7 +47,7 @@ using namespace facebook::react;
   TrueSheetViewShadowNode::ConcreteState::Shared _state;
   CGSize _lastStateSize;
   NSInteger _initialDetentIndex;
-  BOOL _fitScrollView;
+  BOOL _scrollable;
   BOOL _initialDetentAnimated;
   BOOL _isSheetUpdatePending;
 }
@@ -73,7 +67,7 @@ using namespace facebook::react;
     _lastStateSize = CGSizeZero;
     _initialDetentIndex = -1;
     _initialDetentAnimated = YES;
-    _fitScrollView = NO;
+    _scrollable = NO;
     _isSheetUpdatePending = NO;
   }
   return self;
@@ -127,6 +121,12 @@ using namespace facebook::react;
   // Blur tint
   _controller.blurTint = !newProps.blurTint.empty() ? RCTNSStringFromString(newProps.blurTint) : nil;
 
+  // Blur intensity (-1 means use system default)
+  _controller.blurIntensity = newProps.blurIntensity >= 0 ? @(newProps.blurIntensity) : nil;
+
+  // Blur interaction
+  _controller.blurInteraction = newProps.blurInteraction;
+
   // Corner radius
   _controller.cornerRadius = newProps.cornerRadius < 0 ? nil : @(newProps.cornerRadius);
 
@@ -138,6 +138,7 @@ using namespace facebook::react;
   _controller.grabber = newProps.grabber;
   _controller.pageSizing = newProps.pageSizing;
   _controller.modalInPresentation = !newProps.dismissible;
+  _controller.draggable = newProps.draggable;
   _controller.dimmed = newProps.dimmed;
 
   if (newProps.dimmedDetentIndex >= 0) {
@@ -146,10 +147,10 @@ using namespace facebook::react;
 
   _initialDetentIndex = newProps.initialDetentIndex;
   _initialDetentAnimated = newProps.initialDetentAnimated;
-  _fitScrollView = newProps.fitScrollView;
+  _scrollable = newProps.scrollable;
 
   if (_containerView) {
-    _containerView.scrollViewPinningEnabled = _fitScrollView;
+    _containerView.scrollViewPinningEnabled = _scrollable;
   }
 }
 
@@ -193,6 +194,7 @@ using namespace facebook::react;
       [self->_controller setupSheetDetents];
       [self->_controller applyActiveDetent];
     }];
+    [_controller updateDraggable];
   } else if (_initialDetentIndex >= 0) {
     [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
   }
@@ -239,10 +241,10 @@ using namespace facebook::react;
     _controller.headerHeight = @(headerHeight);
   }
 
-  _containerView.scrollViewPinningEnabled = _fitScrollView;
+  _containerView.scrollViewPinningEnabled = _scrollable;
   [_containerView setupContentScrollViewPinning];
 
-  [OnMountEvent emit:_eventEmitter];
+  [TrueSheetLifecycleEvents emitMount:_eventEmitter];
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
@@ -265,9 +267,14 @@ 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) {
     [_controller.sheetPresentationController animateChanges:^{
-      [self->_controller setupActiveDetentWithIndex:index];
+      [self->_controller resizeToDetentIndex:index];
     }];
     if (completion) {
       completion(YES, nil);
@@ -300,6 +307,11 @@ 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);
@@ -315,14 +327,6 @@ using namespace facebook::react;
                                   }];
 }
 
-- (void)resizeToIndex:(NSInteger)index {
-  if (_controller.isPresented) {
-    [_controller.sheetPresentationController animateChanges:^{
-      [self->_controller setupActiveDetentWithIndex:index];
-    }];
-  }
-}
-
 #pragma mark - TrueSheetContainerViewDelegate
 
 /**
@@ -336,7 +340,6 @@ using namespace facebook::react;
 
   dispatch_async(dispatch_get_main_queue(), ^{
     self->_isSheetUpdatePending = NO;
-    self->_controller.layoutTransitioning = YES;
 
     [self->_controller.sheetPresentationController animateChanges:^{
       [self->_controller setupSheetDetents];
@@ -356,27 +359,29 @@ using namespace facebook::react;
 
 #pragma mark - TrueSheetViewControllerDelegate
 
-- (void)viewControllerWillPresent {
-  NSInteger index = [_controller currentDetentIndex];
+- (void)viewControllerWillPresentAtIndex:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent {
   _controller.activeDetentIndex = index;
-  [OnWillPresentEvent emit:_eventEmitter index:index position:_controller.currentPosition];
+  [TrueSheetLifecycleEvents emitWillPresent:_eventEmitter index:index position:position detent:detent];
 }
 
-- (void)viewControllerDidPresent {
-  [OnDidPresentEvent emit:_eventEmitter index:[_controller currentDetentIndex] position:_controller.currentPosition];
+- (void)viewControllerDidPresentAtIndex:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent {
+  [TrueSheetLifecycleEvents emitDidPresent:_eventEmitter index:index position:position detent:detent];
 }
 
-- (void)viewControllerDidDrag:(UIGestureRecognizerState)state index:(NSInteger)index position:(CGFloat)position {
+- (void)viewControllerDidDrag:(UIGestureRecognizerState)state
+                        index:(NSInteger)index
+                     position:(CGFloat)position
+                       detent:(CGFloat)detent {
   switch (state) {
     case UIGestureRecognizerStateBegan:
-      [OnDragBeginEvent emit:_eventEmitter index:index position:position];
+      [TrueSheetDragEvents emitDragBegin:_eventEmitter index:index position:position detent:detent];
       break;
     case UIGestureRecognizerStateChanged:
-      [OnDragChangeEvent emit:_eventEmitter index:index position:position];
+      [TrueSheetDragEvents emitDragChange:_eventEmitter index:index position:position detent:detent];
       break;
     case UIGestureRecognizerStateEnded:
     case UIGestureRecognizerStateCancelled:
-      [OnDragEndEvent emit:_eventEmitter index:index position:position];
+      [TrueSheetDragEvents emitDragEnd:_eventEmitter index:index position:position detent:detent];
       break;
     default:
       break;
@@ -384,29 +389,48 @@ using namespace facebook::react;
 }
 
 - (void)viewControllerWillDismiss {
-  [OnWillDismissEvent emit:_eventEmitter];
+  [TrueSheetLifecycleEvents emitWillDismiss:_eventEmitter];
 }
 
 - (void)viewControllerDidDismiss {
   _controller.activeDetentIndex = -1;
-  [OnDidDismissEvent emit:_eventEmitter];
+  [TrueSheetLifecycleEvents emitDidDismiss:_eventEmitter];
 }
 
-- (void)viewControllerDidChangeDetent:(NSInteger)index position:(CGFloat)position {
+- (void)viewControllerDidChangeDetent:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent {
   if (_controller.activeDetentIndex != index) {
     _controller.activeDetentIndex = index;
   }
-  [OnDetentChangeEvent emit:_eventEmitter index:index position:position];
+  [TrueSheetStateEvents emitDetentChange:_eventEmitter index:index position:position detent:detent];
 }
 
-- (void)viewControllerDidChangePosition:(NSInteger)index position:(CGFloat)position transitioning:(BOOL)transitioning {
-  [OnPositionChangeEvent emit:_eventEmitter index:index position:position transitioning:transitioning];
+- (void)viewControllerDidChangePosition:(CGFloat)index
+                               position:(CGFloat)position
+                                 detent:(CGFloat)detent
+                               realtime:(BOOL)realtime {
+  [TrueSheetStateEvents emitPositionChange:_eventEmitter index:index position:position detent:detent realtime:realtime];
 }
 
 - (void)viewControllerDidChangeSize:(CGSize)size {
   [self updateStateWithSize:size];
 }
 
+- (void)viewControllerWillFocus {
+  [TrueSheetFocusEvents emitWillFocus:_eventEmitter];
+}
+
+- (void)viewControllerDidFocus {
+  [TrueSheetFocusEvents emitDidFocus:_eventEmitter];
+}
+
+- (void)viewControllerWillBlur {
+  [TrueSheetFocusEvents emitWillBlur:_eventEmitter];
+}
+
+- (void)viewControllerDidBlur {
+  [TrueSheetFocusEvents emitDidBlur:_eventEmitter];
+}
+
 #pragma mark - Private Helpers
 
 - (UIViewController *)findPresentingViewController {

package/ios/TrueSheetViewController.h

@@ -19,14 +19,24 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol TrueSheetViewControllerDelegate <NSObject>
 
-- (void)viewControllerWillPresent;
-- (void)viewControllerDidPresent;
+- (void)viewControllerWillPresentAtIndex:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent;
+- (void)viewControllerDidPresentAtIndex:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent;
 - (void)viewControllerWillDismiss;
 - (void)viewControllerDidDismiss;
-- (void)viewControllerDidChangeDetent:(NSInteger)index position:(CGFloat)position;
-- (void)viewControllerDidDrag:(UIGestureRecognizerState)state index:(NSInteger)index position:(CGFloat)position;
-- (void)viewControllerDidChangePosition:(NSInteger)index position:(CGFloat)position transitioning:(BOOL)transitioning;
+- (void)viewControllerDidChangeDetent:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent;
+- (void)viewControllerDidDrag:(UIGestureRecognizerState)state
+                        index:(NSInteger)index
+                     position:(CGFloat)position
+                       detent:(CGFloat)detent;
+- (void)viewControllerDidChangePosition:(CGFloat)index
+                               position:(CGFloat)position
+                                 detent:(CGFloat)detent
+                               realtime:(BOOL)realtime;
 - (void)viewControllerDidChangeSize:(CGSize)size;
+- (void)viewControllerWillFocus;
+- (void)viewControllerDidFocus;
+- (void)viewControllerWillBlur;
+- (void)viewControllerDidBlur;
 
 @end
 
@@ -38,28 +48,29 @@ NS_ASSUME_NONNULL_BEGIN
                                        >
 
 @property (nonatomic, weak, nullable) id<TrueSheetViewControllerDelegate> delegate;
-@property (nonatomic, strong) NSArray *detents;
+@property (nonatomic, strong) NSArray<NSNumber *> *detents;
 @property (nonatomic, strong, nullable) NSNumber *maxHeight;
 @property (nonatomic, strong, nullable) NSNumber *contentHeight;
 @property (nonatomic, strong, nullable) NSNumber *headerHeight;
 @property (nonatomic, strong, nullable) UIColor *backgroundColor;
 @property (nonatomic, strong, nullable) NSNumber *cornerRadius;
 @property (nonatomic, assign) BOOL grabber;
+@property (nonatomic, assign) BOOL draggable;
 @property (nonatomic, assign) BOOL dimmed;
 @property (nonatomic, strong, nullable) NSNumber *dimmedDetentIndex;
 @property (nonatomic, copy, nullable) NSString *blurTint;
+@property (nonatomic, strong, nullable) NSNumber *blurIntensity;
+@property (nonatomic, assign) BOOL blurInteraction;
 @property (nonatomic, assign) BOOL pageSizing;
-@property (nonatomic, assign) BOOL layoutTransitioning;
 @property (nonatomic, assign) BOOL isPresented;
 @property (nonatomic, assign) NSInteger activeDetentIndex;
 
 - (void)applyActiveDetent;
 - (void)setupActiveDetentWithIndex:(NSInteger)index;
+- (void)resizeToDetentIndex:(NSInteger)index;
 - (void)setupSheetDetents;
 - (void)setupSheetProps;
-- (NSInteger)currentDetentIndex;
-- (CGFloat)currentPosition;
-- (CGFloat)bottomInset;
+- (void)updateDraggable;
 
 @end