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

package/ios/TrueSheetView.mm

@@ -22,21 +22,24 @@
 #import "events/OnDragEndEvent.h"
 #import "events/OnMountEvent.h"
 #import "events/OnPositionChangeEvent.h"
-#import "events/OnSizeChangeEvent.h"
 #import "events/OnWillDismissEvent.h"
 #import "events/OnWillPresentEvent.h"
 #import "utils/LayoutUtil.h"
 #import "utils/WindowUtil.h"
 
-#import <react/renderer/components/TrueSheetSpec/ComponentDescriptors.h>
 #import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
 #import <react/renderer/components/TrueSheetSpec/Props.h>
 #import <react/renderer/components/TrueSheetSpec/RCTComponentViewHelpers.h>
+#import <react/renderer/components/TrueSheetSpec/TrueSheetViewComponentDescriptor.h>
+#import <react/renderer/components/TrueSheetSpec/TrueSheetViewShadowNode.h>
+#import <react/renderer/components/TrueSheetSpec/TrueSheetViewState.h>
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTLog.h>
 #import <React/RCTSurfaceTouchHandler.h>
 #import <React/RCTUtils.h>
+#import <react/renderer/core/State.h>
 
 using namespace facebook::react;
 
@@ -47,26 +50,31 @@ using namespace facebook::react;
   TrueSheetContainerView *_containerView;
   TrueSheetViewController *_controller;
   RCTSurfaceTouchHandler *_touchHandler;
+  TrueSheetViewShadowNode::ConcreteState::Shared _state;
+  CGSize _lastStateSize;
   NSInteger _initialDetentIndex;
+  BOOL _scrollable;
   BOOL _initialDetentAnimated;
+  BOOL _isSheetUpdatePending;
 }
 
+#pragma mark - Initialization
+
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const TrueSheetViewProps>();
     _props = defaultProps;
 
-    // Initialize controller - persists across container lifecycle
     _controller = [[TrueSheetViewController alloc] init];
     _controller.delegate = self;
 
-    // Initialize touch handler - will be attached to container when mounted
     _touchHandler = [[RCTSurfaceTouchHandler alloc] init];
-
     _containerView = nil;
-
+    _lastStateSize = CGSizeZero;
     _initialDetentIndex = -1;
     _initialDetentAnimated = YES;
+    _scrollable = NO;
+    _isSheetUpdatePending = NO;
   }
   return self;
 }
@@ -74,28 +82,23 @@ using namespace facebook::react;
 - (void)didMoveToWindow {
   [super didMoveToWindow];
 
-  if (!self.window) {
+  if (!self.window)
     return;
-  }
 
-  // Register this view with the TurboModule when added to window
-  // This ensures the tag is properly set by the framework
+  // Register with TurboModule when tag is set
   if (self.tag > 0) {
     [TrueSheetModule registerView:self withTag:@(self.tag)];
   }
 }
 
 - (void)dealloc {
-  // Dismiss controller if presented
   if (_controller && _controller.presentingViewController) {
     [_controller dismissViewControllerAnimated:NO completion:nil];
   }
 
-  // Clean up controller
   _controller.delegate = nil;
   _controller = nil;
 
-  // Unregister this view from the TurboModule
   [TrueSheetModule unregisterViewWithTag:@(self.tag)];
 }
 
@@ -105,16 +108,172 @@ using namespace facebook::react;
   return concreteComponentDescriptorProvider<TrueSheetViewComponentDescriptor>();
 }
 
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps {
+  [super updateProps:props oldProps:oldProps];
+
+  const auto &newProps = *std::static_pointer_cast<TrueSheetViewProps const>(props);
+
+  // Detents (-1 represents "auto")
+  NSMutableArray *detents = [NSMutableArray new];
+  for (const auto &detent : newProps.detents) {
+    [detents addObject:@(detent)];
+  }
+  _controller.detents = detents;
+
+  // Background color
+  _controller.backgroundColor =
+    newProps.background == 0 ? nil : RCTUIColorFromSharedColor(SharedColor(newProps.background));
+
+  // Blur tint
+  _controller.blurTint = !newProps.blurTint.empty() ? RCTNSStringFromString(newProps.blurTint) : nil;
+
+  // Corner radius
+  _controller.cornerRadius = newProps.cornerRadius < 0 ? nil : @(newProps.cornerRadius);
+
+  // Max height
+  if (newProps.maxHeight != 0.0) {
+    _controller.maxHeight = @(newProps.maxHeight);
+  }
+
+  _controller.grabber = newProps.grabber;
+  _controller.pageSizing = newProps.pageSizing;
+  _controller.modalInPresentation = !newProps.dismissible;
+  _controller.dimmed = newProps.dimmed;
+
+  if (newProps.dimmedDetentIndex >= 0) {
+    _controller.dimmedDetentIndex = @(newProps.dimmedDetentIndex);
+  }
+
+  _initialDetentIndex = newProps.initialDetentIndex;
+  _initialDetentAnimated = newProps.initialDetentAnimated;
+  _scrollable = newProps.scrollable;
+
+  if (_containerView) {
+    _containerView.scrollViewPinningEnabled = _scrollable;
+  }
+}
+
+- (void)updateState:(const State::Shared &)state oldState:(const State::Shared &)oldState {
+  _state = std::static_pointer_cast<TrueSheetViewShadowNode::ConcreteState const>(state);
+
+  if (_controller) {
+    [self updateStateWithSize:_controller.view.frame.size];
+  }
+}
+
+/**
+ * Updates Fabric state with container width for Yoga layout.
+ */
+- (void)updateStateWithSize:(CGSize)size {
+  if (!_state || size.width <= 0 || size.width == _lastStateSize.width)
+    return;
+
+  _lastStateSize = size;
+  _state->updateState([=](TrueSheetViewShadowNode::ConcreteState::Data const &oldData)
+                        -> TrueSheetViewShadowNode::ConcreteState::SharedData {
+    auto newData = oldData;
+    newData.containerWidth = static_cast<float>(size.width);
+    return std::make_shared<TrueSheetViewShadowNode::ConcreteState::Data const>(newData);
+  });
+}
+
+- (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask {
+  [super finalizeUpdates:updateMask];
+
+  if (!(updateMask & RNComponentViewUpdateMaskProps) || !_controller)
+    return;
+
+  if (_containerView) {
+    [_containerView setupContentScrollViewPinning];
+  }
+
+  if (_controller.isPresented) {
+    [_controller.sheetPresentationController animateChanges:^{
+      [self->_controller setupSheetProps];
+      [self->_controller setupSheetDetents];
+      [self->_controller applyActiveDetent];
+    }];
+  } else if (_initialDetentIndex >= 0) {
+    [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
+  }
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+
+  _lastStateSize = CGSizeZero;
+
+  if (_controller && _controller.presentingViewController) {
+    [_controller dismissViewControllerAnimated:YES completion:nil];
+  }
+
+  [TrueSheetModule unregisterViewWithTag:@(self.tag)];
+}
+
+#pragma mark - Child Component Mounting
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
+  if (![childComponentView isKindOfClass:[TrueSheetContainerView class]])
+    return;
+
+  if (_containerView != nil) {
+    RCTLogWarn(@"TrueSheet: Sheet can only have one container component.");
+    return;
+  }
+
+  _containerView = (TrueSheetContainerView *)childComponentView;
+  _containerView.delegate = self;
+
+  [_touchHandler attachToView:_containerView];
+  [_controller.view addSubview:_containerView];
+  [LayoutUtil pinView:_containerView toParentView:_controller.view edges:UIRectEdgeAll];
+  [_controller.view bringSubviewToFront:_containerView];
+
+  CGFloat contentHeight = [_containerView contentHeight];
+  if (contentHeight > 0) {
+    _controller.contentHeight = @(contentHeight);
+  }
+
+  CGFloat headerHeight = [_containerView headerHeight];
+  if (headerHeight > 0) {
+    _controller.headerHeight = @(headerHeight);
+  }
+
+  _containerView.scrollViewPinningEnabled = _scrollable;
+  [_containerView setupContentScrollViewPinning];
+
+  [OnMountEvent emit:_eventEmitter];
+}
+
+- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
+  if (![childComponentView isKindOfClass:[TrueSheetContainerView class]])
+    return;
+
+  _containerView.delegate = nil;
+
+  if (_touchHandler) {
+    [_touchHandler detachFromView:_containerView];
+  }
+
+  [LayoutUtil unpinView:_containerView fromParentView:nil];
+  [_containerView removeFromSuperview];
+  _containerView = nil;
+}
+
 #pragma mark - TurboModule Methods
 
 - (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];
     }];
-
     if (completion) {
       completion(YES, nil);
     }
@@ -122,30 +281,23 @@ using namespace facebook::react;
   }
 
   UIViewController *presentingViewController = [self findPresentingViewController];
-
   if (!presentingViewController) {
     NSError *error = [NSError errorWithDomain:@"com.lodev09.TrueSheet"
                                          code:1001
                                      userInfo:@{NSLocalizedDescriptionKey : @"No presenting view controller found"}];
-
     if (completion) {
       completion(NO, error);
     }
     return;
   }
 
-  // Setup our sheet properties
   [_controller setupSheetProps];
   [_controller setupSheetDetents];
-
-  // Set to the given detent index
   [_controller setupActiveDetentWithIndex:index];
 
-  // Present our sheet
-  [presentingViewController presentViewController:self->_controller
+  [presentingViewController presentViewController:_controller
                                          animated:animated
                                        completion:^{
-                                         // Call completion handler
                                          if (completion) {
                                            completion(YES, nil);
                                          }
@@ -153,6 +305,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);
@@ -176,184 +333,47 @@ using namespace facebook::react;
   }
 }
 
-- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps {
-  [super updateProps:props oldProps:oldProps];
-
-  const auto &newProps = *std::static_pointer_cast<TrueSheetViewProps const>(props);
-
-  // Update detents - pass numbers directly (-1 represents "auto")
-  NSMutableArray *detents = [NSMutableArray new];
-  for (const auto &detent : newProps.detents) {
-    [detents addObject:@(detent)];
-  }
-
-  _controller.detents = detents;
-
-  // Update background color - always set it, even if 0 (which could be a valid color like black)
-  UIColor *color = RCTUIColorFromSharedColor(SharedColor(newProps.background));
-  _controller.backgroundColor = color;
-
-  // Update blur tint - always set it to clear when removed
-  _controller.blurTint = !newProps.blurTint.empty() ? RCTNSStringFromString(newProps.blurTint) : nil;
-
-  // Update corner radius
-  if (newProps.cornerRadius < 0) {
-    _controller.cornerRadius = nil;
-  } else {
-    _controller.cornerRadius = @(newProps.cornerRadius);
-  }
-
-  // Update max height
-  if (newProps.maxHeight != 0.0) {
-    _controller.maxHeight = @(newProps.maxHeight);
-  }
-
-  // Update grabber
-  _controller.grabber = newProps.grabber;
-
-  // Update dismissible
-  _controller.modalInPresentation = !newProps.dismissible;
-
-  // Update dimmed
-  _controller.dimmed = newProps.dimmed;
-
-  // Update dimmedIndex
-  if (newProps.dimmedIndex >= 0) {
-    _controller.dimmedIndex = @(newProps.dimmedIndex);
-  }
-
-  // Store initial presentation settings
-  _initialDetentIndex = newProps.initialDetentIndex;
-  _initialDetentAnimated = newProps.initialDetentAnimated;
-}
-
-- (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask {
-  [super finalizeUpdates:updateMask];
-
-  // Apply controller updates after all props and children are updated
-  if (updateMask & RNComponentViewUpdateMaskProps) {
-    // Apply changes to presented sheet if needed
-    if (_controller.isPresented) {
-      [_controller.sheetPresentationController animateChanges:^{
-        [self->_controller setupSheetDetents];
-        [self->_controller applyActiveDetent];
-      }];
-    } else {
-      // Handle initial presentation
-      if (_initialDetentIndex >= 0 && !_controller.isPresented) {
-        [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
-      }
-    }
-  }
-}
-
-- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
-  // Check if it's a container view
-  if ([childComponentView isKindOfClass:[TrueSheetContainerView class]]) {
-    if (_containerView != nil) {
-      NSLog(@"TrueSheet: Sheet can only have one container component.");
-      return;
-    }
-
-    _containerView = (TrueSheetContainerView *)childComponentView;
-
-    // Set this view as the container's delegate
-    _containerView.delegate = self;
-
-    // Attach touch handler to container for touch event handling
-    [_touchHandler attachToView:_containerView];
-
-    // Add to parent view hierarchy
-    [_controller.view addSubview:_containerView];
-
-    // Pin container to fill the entire parent view
-    [LayoutUtil pinView:_containerView toParentView:_controller.view edges:UIRectEdgeAll];
-
-    // Ensure container is above background view
-    [_controller.view bringSubviewToFront:_containerView];
-
-    // Get initial content height from container
-    CGFloat contentHeight = [_containerView contentHeight];
-    if (contentHeight > 0) {
-      _controller.contentHeight = @(contentHeight);
-    }
-
-    // Emit onMount event when container is mounted
-    [OnMountEvent emit:_eventEmitter];
-  }
-}
-
-- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
-  if ([childComponentView isKindOfClass:[TrueSheetContainerView class]]) {
-    _containerView.delegate = nil;
-
-    // Detach touch handler
-    if (_touchHandler) {
-      [_touchHandler detachFromView:_containerView];
-    }
-
-    // Unpin and remove from view hierarchy
-    [LayoutUtil unpinView:_containerView];
-    [_containerView removeFromSuperview];
+#pragma mark - TrueSheetContainerViewDelegate
 
-    _containerView = nil;
-  }
-}
+/**
+ * Debounced sheet update to handle rapid content/header size changes.
+ */
+- (void)updateSheetIfNeeded {
+  if (!_controller.isPresented || _isSheetUpdatePending)
+    return;
 
-- (void)prepareForRecycle {
-  [super prepareForRecycle];
+  _isSheetUpdatePending = YES;
 
-  // Dismiss controller if presented
-  if (_controller && _controller.presentingViewController) {
-    [_controller dismissViewControllerAnimated:YES completion:nil];
-  }
+  dispatch_async(dispatch_get_main_queue(), ^{
+    self->_isSheetUpdatePending = NO;
+    self->_controller.layoutTransitioning = YES;
 
-  // Unregister from the registry
-  // Note: Re-registration will happen automatically when the component is reused
-  [TrueSheetModule unregisterViewWithTag:@(self.tag)];
+    [self->_controller.sheetPresentationController animateChanges:^{
+      [self->_controller setupSheetDetents];
+    }];
+  });
 }
 
-#pragma mark - TrueSheetContainerViewDelegate
-
 - (void)containerViewContentDidChangeSize:(CGSize)newSize {
-  // Clamp content height to container height to prevent unbounded growth with scrollable content
-  CGFloat containerHeight = _controller.containerHeight;
-  CGFloat contentHeight = containerHeight > 0 ? MIN(newSize.height, containerHeight) : newSize.height;
-
-  _controller.contentHeight = @(contentHeight);
-
-  // Update detents if sheet is already presented
-  if (_controller.isPresented) {
-    // Tell controller that we are transitioning from layout changes.
-    // Controller viewDidLayoutSubviews will handle position notification.
-    _controller.layoutTransitioning = YES;
+  _controller.contentHeight = @(newSize.height);
+  [self updateSheetIfNeeded];
+}
 
-    [_controller.sheetPresentationController animateChanges:^{
-      [self->_controller setupSheetDetents];
-    }];
-  }
+- (void)containerViewHeaderDidChangeSize:(CGSize)newSize {
+  _controller.headerHeight = @(newSize.height);
+  [self updateSheetIfNeeded];
 }
 
 #pragma mark - TrueSheetViewControllerDelegate
 
 - (void)viewControllerWillPresent {
   NSInteger index = [_controller currentDetentIndex];
-  CGFloat position = _controller.currentPosition;
-
   _controller.activeDetentIndex = index;
-
-  [OnWillPresentEvent emit:_eventEmitter index:index position:position];
-
-  // Emit onChangeSize event to layout our container on JS
-  CGSize controllerSize = _controller.view.frame.size;
-  [OnSizeChangeEvent emit:_eventEmitter width:controllerSize.width height:controllerSize.height];
+  [OnWillPresentEvent emit:_eventEmitter index:index position:_controller.currentPosition];
 }
 
 - (void)viewControllerDidPresent {
-  NSInteger index = [_controller currentDetentIndex];
-  CGFloat position = _controller.currentPosition;
-
-  [OnDidPresentEvent emit:_eventEmitter index:index position:position];
+  [OnDidPresentEvent emit:_eventEmitter index:[_controller currentDetentIndex] position:_controller.currentPosition];
 }
 
 - (void)viewControllerDidDrag:(UIGestureRecognizerState)state index:(NSInteger)index position:(CGFloat)position {
@@ -361,16 +381,13 @@ using namespace facebook::react;
     case UIGestureRecognizerStateBegan:
       [OnDragBeginEvent emit:_eventEmitter index:index position:position];
       break;
-
     case UIGestureRecognizerStateChanged:
       [OnDragChangeEvent emit:_eventEmitter index:index position:position];
       break;
-
     case UIGestureRecognizerStateEnded:
     case UIGestureRecognizerStateCancelled:
       [OnDragEndEvent emit:_eventEmitter index:index position:position];
       break;
-
     default:
       break;
   }
@@ -382,7 +399,6 @@ using namespace facebook::react;
 
 - (void)viewControllerDidDismiss {
   _controller.activeDetentIndex = -1;
-
   [OnDidDismissEvent emit:_eventEmitter];
 }
 
@@ -390,7 +406,6 @@ using namespace facebook::react;
   if (_controller.activeDetentIndex != index) {
     _controller.activeDetentIndex = index;
   }
-
   [OnDetentChangeEvent emit:_eventEmitter index:index position:position];
 }
 
@@ -399,29 +414,28 @@ using namespace facebook::react;
 }
 
 - (void)viewControllerDidChangeSize:(CGSize)size {
-  [OnSizeChangeEvent emit:_eventEmitter width:size.width height:size.height];
+  [self updateStateWithSize:size];
 }
 
 #pragma mark - Private Helpers
 
 - (UIViewController *)findPresentingViewController {
   UIWindow *keyWindow = [WindowUtil keyWindow];
-
-  if (!keyWindow) {
+  if (!keyWindow)
     return nil;
-  }
 
   UIViewController *rootViewController = keyWindow.rootViewController;
+  if (!rootViewController)
+    return nil;
 
-  // Find the top-most presented view controller
+  // Find topmost presented view controller
   while (rootViewController.presentedViewController) {
     UIViewController *presented = rootViewController.presentedViewController;
 
-    // Skip TrueSheetViewController if it's being dismissed
+    // Skip TrueSheetViewController if being dismissed
     if ([presented isKindOfClass:[TrueSheetViewController class]] && presented.isBeingDismissed) {
       break;
     }
-
     rootViewController = presented;
   }
 

package/ios/TrueSheetViewController.h

@@ -41,12 +41,14 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSArray *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 dimmed;
-@property (nonatomic, strong, nullable) NSNumber *dimmedIndex;
+@property (nonatomic, strong, nullable) NSNumber *dimmedDetentIndex;
 @property (nonatomic, copy, nullable) NSString *blurTint;
+@property (nonatomic, assign) BOOL pageSizing;
 @property (nonatomic, assign) BOOL layoutTransitioning;
 @property (nonatomic, assign) BOOL isPresented;
 @property (nonatomic, assign) NSInteger activeDetentIndex;
@@ -57,8 +59,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setupSheetProps;
 - (NSInteger)currentDetentIndex;
 - (CGFloat)currentPosition;
-- (CGFloat)currentHeight;
-- (CGFloat)containerHeight;
+- (CGFloat)bottomInset;
 
 @end