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

package/ios/TrueSheetContentView.mm

@@ -53,98 +53,55 @@ using namespace facebook::react;
   }
 }
 
-- (void)unpinScrollView {
+- (void)unpinScrollViewFromParentView:(UIView *)parentView {
   // Unpin previous scroll view if exists
   if (_pinnedScrollView) {
-    [LayoutUtil unpinView:_pinnedScrollView];
+    [LayoutUtil unpinView:_pinnedScrollView fromParentView:parentView];
   }
 }
 
-- (void)setupScrollViewPinning:(BOOL)pinned {
+- (void)setupScrollViewPinning:(BOOL)pinned withHeaderView:(UIView *)headerView {
+  // Pin to container view (parent of content view)
+  UIView *containerView = self.superview;
+
   if (!pinned) {
-    [self unpinScrollView];
+    [self unpinScrollViewFromParentView:containerView];
+    _pinnedScrollView = nil;
     return;
   }
 
   // Auto-detect and pin scroll views for proper sheet scrolling behavior
-  // Pinning ensures ScrollView fills the sheet area and scrolls correctly with the sheet
-  UIView *topSibling = nil;
-  RCTScrollViewComponentView *scrollView = [self findScrollView:&topSibling];
-
-  if (scrollView && scrollView != _pinnedScrollView) {
-    [self unpinScrollView];
-
-    // Pin to container view to enable proper scrolling within the sheet
-    UIView *containerView = self.superview;
-    if (containerView) {
-      if (topSibling) {
-        // Pin ScrollView below the top sibling
-        [LayoutUtil pinView:scrollView
-               toParentView:containerView
-                withTopView:topSibling
-                      edges:UIRectEdgeLeft | UIRectEdgeRight | UIRectEdgeBottom];
-      } else {
-        // No top sibling, pin to all edges of container (original behavior)
-        [LayoutUtil pinView:scrollView toParentView:containerView edges:UIRectEdgeAll];
-      }
-
-      _pinnedScrollView = scrollView;
+  // Pinning ensures ScrollView fills the available area and scrolls correctly with the sheet
+  RCTScrollViewComponentView *scrollView = [self findScrollView];
+
+  if (scrollView && containerView) {
+    // Always unpin first to remove old constraints
+    [self unpinScrollViewFromParentView:containerView];
+
+    if (headerView) {
+      // Pin ScrollView below the header view
+      [LayoutUtil pinView:scrollView
+             toParentView:containerView
+              withTopView:headerView
+                    edges:UIRectEdgeLeft | UIRectEdgeRight | UIRectEdgeBottom];
+    } else {
+      // No header, pin to all edges of container
+      [LayoutUtil pinView:scrollView toParentView:containerView edges:UIRectEdgeAll];
     }
+
+    _pinnedScrollView = scrollView;
   }
 }
 
 - (RCTScrollViewComponentView *)findScrollView {
-  return [self findScrollView:nil];
-}
-
-- (RCTScrollViewComponentView *)findScrollView:(UIView **)outTopSibling {
-  if (self.subviews.count == 0) {
-    return nil;
-  }
-
-  RCTScrollViewComponentView *scrollView = nil;
-  UIView *topSibling = nil;
-
   // Check first-level children for scroll views (ScrollView or FlatList)
   for (UIView *subview in self.subviews) {
     if ([subview isKindOfClass:RCTScrollViewComponentView.class]) {
-      scrollView = static_cast<RCTScrollViewComponentView *>(subview);
-
-      // Find the view positioned directly above this ScrollView by frame position
-      if (self.subviews.count > 1) {
-        CGFloat scrollViewTop = CGRectGetMinY(scrollView.frame);
-        CGFloat closestDistance = CGFLOAT_MAX;
-
-        for (UIView *sibling in self.subviews) {
-          // Skip the ScrollView itself
-          if (sibling == scrollView) {
-            continue;
-          }
-
-          CGFloat siblingBottom = CGRectGetMaxY(sibling.frame);
-
-          // Check if this sibling is positioned above the ScrollView
-          if (siblingBottom <= scrollViewTop) {
-            CGFloat distance = scrollViewTop - siblingBottom;
-
-            // Find the closest view above (smallest distance)
-            if (distance < closestDistance) {
-              closestDistance = distance;
-              topSibling = sibling;
-            }
-          }
-        }
-      }
-
-      break;  // Found ScrollView, no need to continue
+      return (RCTScrollViewComponentView *)subview;
     }
   }
 
-  if (outTopSibling) {
-    *outTopSibling = topSibling;
-  }
-
-  return scrollView;
+  return nil;
 }
 
 - (void)prepareForRecycle {
@@ -152,7 +109,7 @@ using namespace facebook::react;
 
   // Remove scroll view constraints
   if (_pinnedScrollView) {
-    [LayoutUtil unpinView:_pinnedScrollView];
+    [LayoutUtil unpinView:_pinnedScrollView fromParentView:self.superview];
     _pinnedScrollView = nil;
   }
 }

package/ios/TrueSheetFooterView.mm

@@ -48,7 +48,7 @@ using namespace facebook::react;
   }
 
   // Remove existing constraints before applying new ones
-  [LayoutUtil unpinView:self];
+  [LayoutUtil unpinView:self fromParentView:parentView];
 
   // Pin footer to bottom and sides of container with specific height
   [LayoutUtil pinView:self
@@ -90,7 +90,7 @@ using namespace facebook::react;
   [super prepareForRecycle];
 
   // Remove footer constraints
-  [LayoutUtil unpinView:self];
+  [LayoutUtil unpinView:self fromParentView:self.superview];
 
   _lastHeight = 0;
   _didInitialLayout = NO;

package/ios/TrueSheetHeaderView.h

@@ -0,0 +1,29 @@
+//
+//  Created by Jovanni Lo (@lodev09)
+//  Copyright (c) 2024-present. All rights reserved.
+//
+//  This source code is licensed under the MIT license found in the
+//  LICENSE file in the root directory of this source tree.
+//
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol TrueSheetHeaderViewDelegate <NSObject>
+@optional
+- (void)headerViewDidChangeSize:(CGSize)size;
+@end
+
+@interface TrueSheetHeaderView : RCTViewComponentView
+
+@property (nonatomic, weak, nullable) id<TrueSheetHeaderViewDelegate> delegate;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif

package/ios/TrueSheetHeaderView.mm

@@ -0,0 +1,60 @@
+//
+//  Created by Jovanni Lo (@lodev09)
+//  Copyright (c) 2024-present. All rights reserved.
+//
+//  This source code is licensed under the MIT license found in the
+//  LICENSE file in the root directory of this source tree.
+//
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "TrueSheetHeaderView.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 "utils/LayoutUtil.h"
+
+using namespace facebook::react;
+
+@implementation TrueSheetHeaderView {
+  CGSize _lastSize;
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider {
+  return concreteComponentDescriptorProvider<TrueSheetHeaderViewComponentDescriptor>();
+}
+
+- (instancetype)initWithFrame:(CGRect)frame {
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const TrueSheetHeaderViewProps>();
+    _props = defaultProps;
+
+    _lastSize = CGSizeZero;
+  }
+  return self;
+}
+
+- (void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics
+           oldLayoutMetrics:(const facebook::react::LayoutMetrics &)oldLayoutMetrics {
+  [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+
+  CGSize newSize = CGSizeMake(layoutMetrics.frame.size.width, layoutMetrics.frame.size.height);
+
+  // Notify delegate when header size changes
+  if (!CGSizeEqualToSize(newSize, _lastSize)) {
+    _lastSize = newSize;
+    if ([self.delegate respondsToSelector:@selector(headerViewDidChangeSize:)]) {
+      [self.delegate headerViewDidChangeSize:newSize];
+    }
+  }
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  _lastSize = CGSizeZero;
+}
+
+@end
+
+#endif