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

package/android/src/main/java/com/lodev09/truesheet/TrueSheetContainerView.kt

@@ -37,7 +37,7 @@ class TrueSheetContainerView(reactContext: ThemedReactContext) :
 
   var insetAdjustment: String = "automatic"
   var scrollViewBottomInset: Int = 0
-  var scrollViewPinningEnabled: Boolean = false
+  var scrollableEnabled: Boolean = false
   var scrollableOptions: ReadableMap? = null
     set(value) {
       field = value
@@ -53,9 +53,9 @@ class TrueSheetContainerView(reactContext: ThemedReactContext) :
     clipToPadding = false
   }
 
-  fun setupContentScrollViewPinning() {
+  fun setupScrollable() {
     val bottomInset = if (insetAdjustment == "automatic") scrollViewBottomInset else 0
-    contentView?.setupScrollViewPinning(scrollViewPinningEnabled, bottomInset)
+    contentView?.setupScrollable(scrollableEnabled, bottomInset)
   }
 
   fun setupKeyboardHandler() {

package/android/src/main/java/com/lodev09/truesheet/TrueSheetContentView.kt

@@ -52,9 +52,9 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
     }
   }
 
-  fun setupScrollViewPinning(enabled: Boolean, bottomInset: Int) {
+  fun setupScrollable(enabled: Boolean, bottomInset: Int) {
     if (!enabled) {
-      clearScrollViewPinning()
+      clearScrollable()
       return
     }
 
@@ -89,7 +89,7 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
     }
   }
 
-  fun clearScrollViewPinning() {
+  fun clearScrollable() {
     pinnedScrollView?.setPadding(
       pinnedScrollView!!.paddingLeft,
       pinnedScrollView!!.paddingTop,

package/android/src/main/java/com/lodev09/truesheet/TrueSheetView.kt

@@ -120,7 +120,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     if (child is TrueSheetContainerView) {
       child.delegate = this
       viewController.createSheet()
-      setupContentScrollViewPinning()
+      setupScrollable()
 
       val surfaceId = UIManagerHelper.getSurfaceId(this)
       eventDispatcher?.dispatchEvent(MountEvent(surfaceId, id))
@@ -186,7 +186,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
    * Reconfigures the sheet if it's currently presented.
    */
   fun finalizeUpdates() {
-    setupContentScrollViewPinning()
+    setupScrollable()
 
     if (viewController.isPresented) {
       viewController.sheetView?.setupBackground()
@@ -256,26 +256,26 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   fun setInsetAdjustment(insetAdjustment: String) {
     viewController.insetAdjustment = insetAdjustment
-    setupContentScrollViewPinning()
+    setupScrollable()
   }
 
   fun setScrollable(scrollable: Boolean) {
     viewController.scrollable = scrollable
-    setupContentScrollViewPinning()
+    setupScrollable()
   }
 
   fun setScrollableOptions(options: ReadableMap?) {
     viewController.scrollableOptions = options
-    setupContentScrollViewPinning()
+    setupScrollable()
   }
 
-  private fun setupContentScrollViewPinning() {
+  private fun setupScrollable() {
     viewController.containerView?.let {
       it.insetAdjustment = viewController.insetAdjustment
-      it.scrollViewPinningEnabled = viewController.scrollable
+      it.scrollableEnabled = viewController.scrollable
       it.scrollViewBottomInset = viewController.contentBottomInset
       it.scrollableOptions = viewController.scrollableOptions
-      it.setupContentScrollViewPinning()
+      it.setupScrollable()
     }
   }
 

package/ios/TrueSheetContainerView.h

@@ -39,12 +39,12 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, weak, nullable) id<TrueSheetContainerViewDelegate> delegate;
 
 /**
- * Enable ScrollView pinning
+ * Enable scrollable content
  */
-@property (nonatomic, assign) BOOL scrollViewPinningEnabled;
+@property (nonatomic, assign) BOOL scrollableEnabled;
 
 /**
- * Inset adjustment mode for pinned ScrollView
+ * Inset adjustment mode for scrollable content
  */
 @property (nonatomic, copy, nullable) NSString *insetAdjustment;
 
@@ -69,9 +69,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)layoutFooter;
 
 /**
- * Setup ScrollView pinning
+ * Setup scrollable content
  */
-- (void)setupContentScrollViewPinning;
+- (void)setupScrollable;
 
 /**
  * Setup keyboard observer for content and footer

package/ios/TrueSheetContainerView.mm

@@ -34,7 +34,7 @@ using namespace facebook::react;
   TrueSheetHeaderView *_headerView;
   TrueSheetFooterView *_footerView;
   TrueSheetKeyboardObserver *_keyboardObserver;
-  BOOL _scrollViewPinningSet;
+  BOOL _scrollableSet;
 }
 
 #pragma mark - Initialization
@@ -52,13 +52,18 @@ using namespace facebook::react;
     _contentView = nil;
     _headerView = nil;
     _footerView = nil;
-    _scrollViewPinningSet = NO;
+    _scrollableSet = NO;
   }
   return self;
 }
 
 #pragma mark - Layout
 
+- (void)layoutSubviews {
+  [super layoutSubviews];
+  [_contentView updateScrollViewHeight];
+}
+
 - (CGFloat)contentHeight {
   return _contentView ? _contentView.frame.size.height : 0;
 }
@@ -76,9 +81,9 @@ using namespace facebook::react;
   }
 }
 
-- (void)setScrollViewPinningEnabled:(BOOL)scrollViewPinningEnabled {
-  _scrollViewPinningEnabled = scrollViewPinningEnabled;
-  _scrollViewPinningSet = YES;
+- (void)setScrollableEnabled:(BOOL)scrollableEnabled {
+  _scrollableEnabled = scrollableEnabled;
+  _scrollableSet = YES;
 }
 
 - (void)setScrollableOptions:(NSDictionary *)scrollableOptions {
@@ -91,13 +96,13 @@ using namespace facebook::react;
   }
 }
 
-- (void)setupContentScrollViewPinning {
-  if (_scrollViewPinningSet && _contentView) {
+- (void)setupScrollable {
+  if (_scrollableSet && _contentView) {
     CGFloat bottomInset = 0;
     if ([_insetAdjustment isEqualToString:@"automatic"]) {
       bottomInset = [WindowUtil keyWindow].safeAreaInsets.bottom;
     }
-    [_contentView setupScrollViewPinning:_scrollViewPinningEnabled bottomInset:bottomInset];
+    [_contentView setupScrollable:_scrollableEnabled bottomInset:bottomInset];
   }
 }
 
@@ -164,11 +169,7 @@ using namespace facebook::react;
 }
 
 - (void)contentViewDidChangeChildren {
-  [self setupContentScrollViewPinning];
-}
-
-- (void)contentViewDidChangeInsets {
-  [self setupContentScrollViewPinning];
+  [self setupScrollable];
 }
 
 #pragma mark - TrueSheetHeaderViewDelegate

package/ios/TrueSheetContentView.h

@@ -23,7 +23,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)contentViewDidChangeSize:(CGSize)newSize;
 - (void)contentViewDidChangeChildren;
-- (void)contentViewDidChangeInsets;
 
 @end
 
@@ -33,14 +32,19 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) CGFloat keyboardScrollOffset;
 @property (nonatomic, weak, nullable) TrueSheetKeyboardObserver *keyboardObserver;
 
-- (RCTScrollViewComponentView *_Nullable)findScrollView:(UIView *_Nullable *_Nullable)outTopSibling;
+- (RCTScrollViewComponentView *_Nullable)findScrollView;
 
 /**
- * Setup ScrollView pinning
- * @param pinned Whether to pin the scroll view
+ * Setup scrollable content
+ * @param enabled Whether scrollable is enabled
  * @param bottomInset Bottom content inset for the scroll view
  */
-- (void)setupScrollViewPinning:(BOOL)pinned bottomInset:(CGFloat)bottomInset;
+- (void)setupScrollable:(BOOL)enabled bottomInset:(CGFloat)bottomInset;
+
+/**
+ * Update the pinned scroll view's height to fill the container
+ */
+- (void)updateScrollViewHeight;
 
 @end
 

package/ios/TrueSheetContentView.mm

@@ -16,20 +16,16 @@
 #import <react/renderer/components/TrueSheetSpec/RCTComponentViewHelpers.h>
 #import "TrueSheetView.h"
 #import "TrueSheetViewController.h"
-#import "utils/LayoutUtil.h"
 #import "utils/UIView+FirstResponder.h"
 
 using namespace facebook::react;
 
 @implementation TrueSheetContentView {
   RCTScrollViewComponentView *_pinnedScrollView;
-  UIView *_pinnedTopView;
   CGSize _lastSize;
-  UIEdgeInsets _contentInsets;
-  UIEdgeInsets _pinnedInsets;
   CGFloat _bottomInset;
+  CGFloat _originalScrollViewHeight;
   CGFloat _originalIndicatorBottomInset;
-  CGFloat _currentKeyboardHeight;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
@@ -50,14 +46,6 @@ using namespace facebook::react;
            oldLayoutMetrics:(const LayoutMetrics &)oldLayoutMetrics {
   [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
 
-  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;
@@ -77,12 +65,13 @@ using namespace facebook::react;
   [self.delegate contentViewDidChangeChildren];
 }
 
-#pragma mark - ScrollView Pinning
+#pragma mark - Scrollable
 
-- (void)clearPinning {
+- (void)clearScrollable {
   if (_pinnedScrollView) {
-    [LayoutUtil unpinView:_pinnedScrollView fromParentView:self];
-    [LayoutUtil unpinView:_pinnedScrollView fromParentView:self.superview];
+    CGRect frame = _pinnedScrollView.frame;
+    frame.size.height = _originalScrollViewHeight;
+    _pinnedScrollView.frame = frame;
 
     UIEdgeInsets contentInset = _pinnedScrollView.scrollView.contentInset;
     contentInset.bottom = 0;
@@ -93,70 +82,73 @@ using namespace facebook::react;
     _pinnedScrollView.scrollView.verticalScrollIndicatorInsets = indicatorInsets;
   }
   _pinnedScrollView = nil;
-  _pinnedTopView = nil;
-  _pinnedInsets = UIEdgeInsetsZero;
   _bottomInset = 0;
+  _originalScrollViewHeight = 0;
   _originalIndicatorBottomInset = 0;
 }
 
-- (void)setupScrollViewPinning:(BOOL)pinned bottomInset:(CGFloat)bottomInset {
-  UIView *containerView = self.superview;
+- (void)setupScrollable:(BOOL)enabled bottomInset:(CGFloat)bottomInset {
+  if (!enabled) {
+    [self clearScrollable];
+    return;
+  }
 
-  if (!pinned) {
-    [self clearPinning];
+  // Already set up with same inset
+  if (_pinnedScrollView && _bottomInset == bottomInset) {
     return;
   }
 
-  UIView *topSibling = nil;
-  RCTScrollViewComponentView *scrollView = [self findScrollView:&topSibling];
-
-  BOOL needsUpdate = scrollView != _pinnedScrollView || topSibling != _pinnedTopView ||
-                     !UIEdgeInsetsEqualToEdgeInsets(_contentInsets, _pinnedInsets) || _bottomInset != bottomInset;
-
-  if (scrollView && containerView && needsUpdate) {
-    [self clearPinning];
-
-    UIEdgeInsets insets =
-      UIEdgeInsetsMake(topSibling ? 0 : _contentInsets.top, _contentInsets.left, 0, _contentInsets.right);
-
-    if (topSibling) {
-      [LayoutUtil pinView:scrollView
-             toParentView:self
-              withTopView:topSibling
-                    edges:UIRectEdgeLeft | UIRectEdgeRight
-                   insets:insets];
-    } else {
-      [LayoutUtil pinView:scrollView
-             toParentView:self
-                    edges:UIRectEdgeTop | UIRectEdgeLeft | UIRectEdgeRight
-                   insets:insets];
-    }
+  RCTScrollViewComponentView *scrollView = [self findScrollView];
+  if (!scrollView) {
+    return;
+  }
+
+  // Only capture originals on first pin
+  if (!_pinnedScrollView) {
+    _originalScrollViewHeight = scrollView.frame.size.height;
+    _originalIndicatorBottomInset = scrollView.scrollView.verticalScrollIndicatorInsets.bottom;
+    _pinnedScrollView = scrollView;
+  }
 
-    [LayoutUtil pinView:scrollView toParentView:containerView edges:UIRectEdgeBottom];
+  _bottomInset = bottomInset;
 
-    BOOL isNewScrollView = scrollView != _pinnedScrollView;
-    if (isNewScrollView) {
-      _originalIndicatorBottomInset = scrollView.scrollView.verticalScrollIndicatorInsets.bottom;
-    }
+  [self updateScrollViewHeight];
 
-    _pinnedScrollView = scrollView;
-    _pinnedTopView = topSibling;
-    _pinnedInsets = _contentInsets;
-    _bottomInset = bottomInset;
-
-    UIEdgeInsets contentInset = scrollView.scrollView.contentInset;
-    contentInset.bottom = bottomInset;
-    scrollView.scrollView.contentInset = contentInset;
-
-    UIEdgeInsets indicatorInsets = scrollView.scrollView.verticalScrollIndicatorInsets;
-    indicatorInsets.bottom = _originalIndicatorBottomInset + bottomInset;
-    scrollView.scrollView.verticalScrollIndicatorInsets = indicatorInsets;
-  } else if (!scrollView && _pinnedScrollView) {
-    [self clearPinning];
+  UIEdgeInsets contentInset = scrollView.scrollView.contentInset;
+  contentInset.bottom = bottomInset;
+  scrollView.scrollView.contentInset = contentInset;
+
+  UIEdgeInsets indicatorInsets = scrollView.scrollView.verticalScrollIndicatorInsets;
+  indicatorInsets.bottom = _originalIndicatorBottomInset + bottomInset;
+  scrollView.scrollView.verticalScrollIndicatorInsets = indicatorInsets;
+}
+
+- (void)updateScrollViewHeight {
+  if (!_pinnedScrollView) {
+    return;
+  }
+
+  UIView *containerView = self.superview;
+  if (!containerView) {
+    return;
+  }
+
+  CGRect scrollViewFrameInContainer = [_pinnedScrollView.superview convertRect:_pinnedScrollView.frame
+                                                                        toView:containerView];
+  CGFloat newHeight = containerView.bounds.size.height - scrollViewFrameInContainer.origin.y;
+
+  if (newHeight > 0) {
+    CGRect frame = _pinnedScrollView.frame;
+    frame.size.height = newHeight;
+    _pinnedScrollView.frame = frame;
   }
 }
 
-- (RCTScrollViewComponentView *)findScrollView:(UIView **)outTopSibling {
+- (RCTScrollViewComponentView *)findScrollView {
+  if (_pinnedScrollView) {
+    return _pinnedScrollView;
+  }
+
   if (self.subviews.count == 0) {
     return nil;
   }
@@ -172,10 +164,6 @@ using namespace facebook::react;
     }
   }
 
-  if (outTopSibling) {
-    *outTopSibling = [self findTopSiblingForScrollView:scrollView];
-  }
-
   return scrollView;
 }
 
@@ -188,33 +176,6 @@ using namespace facebook::react;
   return nil;
 }
 
-- (UIView *)findTopSiblingForScrollView:(RCTScrollViewComponentView *)scrollView {
-  if (!scrollView || scrollView.superview != self || self.subviews.count <= 1) {
-    return nil;
-  }
-
-  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 - TrueSheetKeyboardObserverDelegate
 
 - (void)keyboardWillShow:(CGFloat)height duration:(NSTimeInterval)duration curve:(UIViewAnimationOptions)curve {
@@ -222,8 +183,6 @@ using namespace facebook::react;
     return;
   }
 
-  _currentKeyboardHeight = height;
-
   TrueSheetViewController *sheetController = _keyboardObserver.viewController;
   UIView *firstResponder = sheetController ? [sheetController.view findFirstResponder] : nil;
 
@@ -254,8 +213,6 @@ using namespace facebook::react;
     return;
   }
 
-  _currentKeyboardHeight = 0;
-
   [UIView animateWithDuration:duration
                         delay:0
                       options:curve | UIViewAnimationOptionBeginFromCurrentState
@@ -275,8 +232,7 @@ using namespace facebook::react;
 
 - (void)prepareForRecycle {
   [super prepareForRecycle];
-  _currentKeyboardHeight = 0;
-  [self clearPinning];
+  [self clearScrollable];
 }
 
 @end

package/ios/TrueSheetView.mm

@@ -254,7 +254,7 @@ using namespace facebook::react;
   _controller.insetAdjustment = _insetAdjustment;
 
   if (_containerView) {
-    _containerView.scrollViewPinningEnabled = _scrollable;
+    _containerView.scrollableEnabled = _scrollable;
     _containerView.insetAdjustment = _insetAdjustment;
     _containerView.scrollableOptions = _scrollableOptions;
   }
@@ -299,7 +299,7 @@ using namespace facebook::react;
     return;
 
   if (_containerView) {
-    [_containerView setupContentScrollViewPinning];
+    [_containerView setupScrollable];
   }
 
   if (_controller.isPresented) {
@@ -366,10 +366,10 @@ using namespace facebook::react;
     _controller.headerHeight = @(headerHeight);
   }
 
-  _containerView.scrollViewPinningEnabled = _scrollable;
+  _containerView.scrollableEnabled = _scrollable;
   _containerView.insetAdjustment = _insetAdjustment;
   _containerView.scrollableOptions = _scrollableOptions;
-  [_containerView setupContentScrollViewPinning];
+  [_containerView setupScrollable];
 
   if (_eventEmitter) {
     [TrueSheetLifecycleEvents emitMount:_eventEmitter];

package/ios/TrueSheetViewController.mm

@@ -340,7 +340,7 @@
 
   TrueSheetContentView *contentView = [self findContentView:presentedView];
   if (contentView) {
-    RCTScrollViewComponentView *scrollViewComponent = [contentView findScrollView:nil];
+    RCTScrollViewComponentView *scrollViewComponent = [contentView findScrollView];
     if (scrollViewComponent && scrollViewComponent.scrollView) {
       [GestureUtil attachPanGestureHandler:scrollViewComponent.scrollView
                                     target:self

package/package.json

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