@lodev09/react-native-true-sheet 4.0.0-beta.3 → 4.0.0-beta.30

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewState.h

@@ -23,11 +23,10 @@ class TrueSheetViewState final {
   TrueSheetViewState() = default;
 
 #ifdef ANDROID
-  TrueSheetViewState(
-      TrueSheetViewState const &previousState,
-      folly::dynamic data)
+  TrueSheetViewState(TrueSheetViewState const &previousState, folly::dynamic data)
       : containerWidth(static_cast<float>(data["containerWidth"].getDouble())),
-        containerHeight(static_cast<float>(data["containerHeight"].getDouble())) {}
+        containerHeight(static_cast<float>(data["containerHeight"].getDouble())) {
+  }
 #endif
 
   float containerWidth{0};
@@ -49,4 +48,4 @@ class TrueSheetViewState final {
 #endif
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/ios/TrueSheetContainerView.h

@@ -16,11 +16,19 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ScrollableOptions : NSObject
 
+@property (nonatomic, assign) facebook::react::TrueSheetViewContentInsetAdjustment contentInsetAdjustment;
 @property (nonatomic, assign) CGFloat keyboardScrollOffset;
+@property (nonatomic, assign) CGFloat keyboardOffset;
 @property (nonatomic, assign) BOOL scrollingExpandsSheet;
 @property (nonatomic, assign) facebook::react::TrueSheetViewTopScrollEdgeEffect topScrollEdgeEffect;
 @property (nonatomic, assign) facebook::react::TrueSheetViewBottomScrollEdgeEffect bottomScrollEdgeEffect;
 
+/**
+ * Derived from `contentInsetAdjustment` — which of the two bottom insets apply
+ */
+@property (nonatomic, readonly) BOOL safeAreaInsetAdjustment;
+@property (nonatomic, readonly) BOOL footerInsetAdjustment;
+
 @end
 
 @class TrueSheetPeekView;
@@ -29,6 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)containerViewContentDidChangeSize:(CGSize)newSize;
 - (void)containerViewScrollViewDidChange;
+- (void)containerViewDidMountTransaction;
 
 @optional
 
@@ -46,20 +55,27 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, weak, nullable) id<TrueSheetContainerViewDelegate> delegate;
 
 /**
- * Inset adjustment mode for scrollable content
+ * Options for scrollable behavior
+ */
+@property (nonatomic, strong, nullable) ScrollableOptions *scrollableOptions;
+
+/**
+ * React tag of the user-provided scrollable within the content (see the `scrollableRef` prop)
  */
-@property (nonatomic, assign) facebook::react::TrueSheetViewInsetAdjustment insetAdjustment;
+@property (nonatomic, assign) NSInteger scrollableHandle;
 
 /**
- * Options for scrollable behavior
+ * Whether the resolved scrollable gets the bottom safe-area inset (UIKit's
+ * `contentInsetAdjustmentBehavior` set to `automatic`) — already gated by the
+ * sheet's `insetAdjustment`
  */
-@property (nonatomic, strong, nullable) ScrollableOptions *scrollableOptions;
+@property (nonatomic, assign) BOOL safeAreaInsetAdjustment;
 
 /**
- * Whether the sheet has an `auto` detent — bounds the pinned scrollable's
- * viewport to the container so the sheet height can derive from its content size
+ * Whether the resolved scrollable is padded by the absolute footer's height —
+ * already gated by the footer position and a plugged scrollable
  */
-@property (nonatomic, assign) BOOL hasAutoDetent;
+@property (nonatomic, assign) BOOL footerInsetAdjustment;
 
 /**
  * Bottom safe-area inset the footer absorbs as padding — the footer

package/ios/TrueSheetContainerView.mm

@@ -17,7 +17,6 @@
 #import "TrueSheetViewController.h"
 #import "core/TrueSheetKeyboardObserver.h"
 #import "utils/UIView+ScrollEdgeInteraction.h"
-#import "utils/WindowUtil.h"
 
 #import <react/renderer/components/TrueSheetSpec/ComponentDescriptors.h>
 #import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
@@ -33,7 +32,9 @@ using namespace facebook::react;
 
 - (instancetype)init {
   if (self = [super init]) {
+    _contentInsetAdjustment = TrueSheetViewContentInsetAdjustment::Automatic;
     _keyboardScrollOffset = 0;
+    _keyboardOffset = 0;
     _scrollingExpandsSheet = YES;
     _topScrollEdgeEffect = TrueSheetViewTopScrollEdgeEffect::Hidden;
     _bottomScrollEdgeEffect = TrueSheetViewBottomScrollEdgeEffect::Hidden;
@@ -41,6 +42,16 @@ using namespace facebook::react;
   return self;
 }
 
+- (BOOL)safeAreaInsetAdjustment {
+  return _contentInsetAdjustment == TrueSheetViewContentInsetAdjustment::Automatic ||
+         _contentInsetAdjustment == TrueSheetViewContentInsetAdjustment::SafeArea;
+}
+
+- (BOOL)footerInsetAdjustment {
+  return _contentInsetAdjustment == TrueSheetViewContentInsetAdjustment::Automatic ||
+         _contentInsetAdjustment == TrueSheetViewContentInsetAdjustment::Footer;
+}
+
 @end
 
 @interface TrueSheetContainerView () <TrueSheetContentViewDelegate,
@@ -149,16 +160,20 @@ using namespace facebook::react;
 - (void)setScrollableOptions:(ScrollableOptions *)scrollableOptions {
   _scrollableOptions = scrollableOptions;
   _contentView.keyboardScrollOffset = scrollableOptions ? scrollableOptions.keyboardScrollOffset : 0;
+  _contentView.keyboardOffset = scrollableOptions ? scrollableOptions.keyboardOffset : 0;
+}
+
+- (void)setFooterInsetAdjustment:(BOOL)footerInsetAdjustment {
+  _footerInsetAdjustment = footerInsetAdjustment;
+  _contentView.footerInsetAdjustment = footerInsetAdjustment;
 }
 
 - (void)setupScrollable {
   if (_contentView) {
-    CGFloat bottomInset = 0;
-    if (_insetAdjustment == TrueSheetViewInsetAdjustment::Automatic) {
-      bottomInset = [WindowUtil keyWindow].safeAreaInsets.bottom;
-    }
-    _contentView.hasAutoDetent = _hasAutoDetent;
-    [_contentView setupScrollableWithBottomInset:bottomInset];
+    _contentView.scrollableHandle = _scrollableHandle;
+    _contentView.safeAreaInsetAdjustment = _safeAreaInsetAdjustment;
+    _contentView.footerInsetAdjustment = _footerInsetAdjustment;
+    [_contentView setupScrollable];
     [_contentView applyScrollEdgeEffects:_scrollableOptions];
     if (@available(iOS 26.0, *)) {
       [self setupEdgeInteractions];
@@ -203,6 +218,7 @@ using namespace facebook::react;
     _contentView = (TrueSheetContentView *)childComponentView;
     _contentView.delegate = self;
     _contentView.footerView = _footerView;
+    _contentView.footerInsetAdjustment = _footerInsetAdjustment;
 
     // Children mount bottom-up, so the content subtree is complete here.
     // Late-mounted peek views attach themselves instead (see TrueSheetPeekView).
@@ -232,22 +248,29 @@ using namespace facebook::react;
     _contentView.footerView = _footerView;
     [_footerView setBottomInset:_footerBottomInset];
     [self footerViewDidChangeSize:_footerView.frame.size];
+
+    // The observer is set up on present — a footer mounted after that (e.g. a
+    // conditional one) joins it here and rises above a keyboard that's already open
+    _footerView.keyboardObserver = _keyboardObserver;
+    [self updateFooterKeyboardOffset];
   }
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
-  if ([childComponentView isKindOfClass:[TrueSheetContentView class]]) {
+  if (childComponentView == _contentView) {
+    _contentView.keyboardObserver = nil;
     _contentView.delegate = nil;
     _contentView = nil;
   }
 
-  if ([childComponentView isKindOfClass:[TrueSheetHeaderView class]]) {
+  if (childComponentView == _headerView) {
     _headerView.delegate = nil;
     _headerView = nil;
     [self headerViewDidChangeSize:CGSizeZero];
   }
 
-  if ([childComponentView isKindOfClass:[TrueSheetFooterView class]]) {
+  if (childComponentView == _footerView) {
+    _footerView.keyboardObserver = nil;
     _footerView.delegate = nil;
     _footerView = nil;
     _contentView.footerView = nil;
@@ -271,6 +294,12 @@ using namespace facebook::react;
   [self.delegate containerViewScrollViewDidChange];
 }
 
+// Footer controls can mount, unmount, or hide deep in its subtree without
+// passing through its own mount hooks or changing its size.
+- (void)contentViewDidMountTransaction {
+  [self.delegate containerViewDidMountTransaction];
+}
+
 #pragma mark - TrueSheetHeaderViewDelegate
 
 - (void)headerViewDidChangeSize:(CGSize)newSize {
@@ -284,6 +313,7 @@ using namespace facebook::react;
 
 - (void)footerViewDidChangeSize:(CGSize)newSize {
   [self.delegate containerViewFooterDidChangeSize:newSize];
+  [_contentView updateBottomInset];
   if (@available(iOS 26.0, *)) {
     [self setupEdgeInteractions];
   }
@@ -311,10 +341,9 @@ using namespace facebook::react;
     return;
   }
 
-  if (_peekView != nil) {
-    RCTLogWarn(@"TrueSheet: Sheet can only have one peek component.");
-    return;
-  }
+  // Last-attached wins. During a screen transition the incoming peek mounts
+  // before the outgoing one detaches, and the outgoing detach is a no-op.
+  _peekView.delegate = nil;
 
   _peekView = peekView;
   peekView.delegate = self;
@@ -342,17 +371,8 @@ using namespace facebook::react;
 
   _keyboardObserver = [[TrueSheetKeyboardObserver alloc] init];
   _keyboardObserver.viewController = (TrueSheetViewController *)viewController;
-
-  if (_contentView) {
-    _contentView.keyboardObserver = _keyboardObserver;
-    [_keyboardObserver addDelegate:_contentView];
-  }
-
-  if (_footerView) {
-    _footerView.keyboardObserver = _keyboardObserver;
-    [_keyboardObserver addDelegate:_footerView];
-  }
-
+  _contentView.keyboardObserver = _keyboardObserver;
+  _footerView.keyboardObserver = _keyboardObserver;
   [_keyboardObserver start];
 }
 

package/ios/TrueSheetContentView.h

@@ -8,6 +8,7 @@
 
 #ifdef RCT_NEW_ARCH_ENABLED
 
+#import <React/RCTMountingTransactionObserving.h>
 #import <React/RCTSurfaceTouchHandler.h>
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
@@ -25,45 +26,73 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)contentViewDidChangeSize:(CGSize)newSize;
 - (void)contentViewScrollViewDidChange;
+- (void)contentViewDidMountTransaction;
 
 @end
 
-@interface TrueSheetContentView : RCTViewComponentView <TrueSheetKeyboardObserverDelegate>
+@interface TrueSheetContentView
+    : RCTViewComponentView <TrueSheetKeyboardObserverDelegate, RCTMountingTransactionObserving>
 
 @property (nonatomic, weak, nullable) id<TrueSheetContentViewDelegate> delegate;
 @property (nonatomic, assign) CGFloat keyboardScrollOffset;
+
+/**
+ * Adjustment added to the keyboard bottom inset applied to the detected
+ * scrollable — negative values reduce the inset (e.g. to cancel out safe-area
+ * padding already baked into the content's paddingBottom).
+ */
+@property (nonatomic, assign) CGFloat keyboardOffset;
+
 @property (nonatomic, weak, nullable) TrueSheetKeyboardObserver *keyboardObserver;
 
 /**
- * Sibling footer view — an absolute footer rises above the keyboard and
- * occludes the content's bottom edge, so it counts toward the keyboard inset.
+ * Sibling footer view — a relative footer shields part of the keyboard's
+ * overlap from the inset; an absolute footer extends the caret reveal target.
  */
 @property (nonatomic, weak, nullable) TrueSheetFooterView *footerView;
 
 /**
- * Whether the sheet has an `auto` detent. Deriving the sheet height from the
- * scroll content is circular with natural layout, so the pinned ScrollView's
- * viewport is force-bounded to the container only in this case.
+ * Content height measured unconstrained by the shadow node — the height the
+ * content wants regardless of container bounds (see
+ * TrueSheetContentViewShadowNode). Falls back to the frame height before the
+ * first state update.
  */
-@property (nonatomic, assign) BOOL hasAutoDetent;
+@property (nonatomic, readonly) CGFloat naturalHeight;
 
 /**
- * Content height with the pinned ScrollView's viewport replaced by its content
- * size — the height the content wants regardless of container bounds.
- * Falls back to the frame height when no ScrollView is pinned.
+ * React tag of the user-provided scrollable (see the `scrollableRef` prop).
+ * Setting a new handle clears the currently resolved ScrollView.
  */
-@property (nonatomic, readonly) CGFloat naturalHeight;
+@property (nonatomic, assign) NSInteger scrollableHandle;
+
+/**
+ * Sets the resolved ScrollView's `contentInsetAdjustmentBehavior` to
+ * `automatic` while plugged so UIKit applies the bottom safe-area inset to
+ * the scroll content. The previous behavior is restored on clear.
+ */
+@property (nonatomic, assign) BOOL safeAreaInsetAdjustment;
+
+/**
+ * Pads the resolved ScrollView's bottom content inset by the absolute
+ * footer's height so the last item scrolls into view above it. Stacks with
+ * the keyboard inset.
+ */
+@property (nonatomic, assign) BOOL footerInsetAdjustment;
 
 - (RCTScrollViewComponentView *_Nullable)findScrollView;
 
 /**
- * Pin the first ScrollView found in the content, wiring insets and keyboard handling
- * @param bottomInset Bottom content inset for the scroll view
+ * Re-applies the footer and keyboard insets — call when the footer's size changes
+ */
+- (void)updateBottomInset;
+
+/**
+ * Resolve the ScrollView from `scrollableHandle`, wiring keyboard handling
  */
-- (void)setupScrollableWithBottomInset:(CGFloat)bottomInset;
+- (void)setupScrollable;
 
 /**
- * Apply scroll edge effects to the pinned scroll view (iOS 26+)
+ * Apply scroll edge effects to the detected scroll view (iOS 26+)
  */
 - (void)applyScrollEdgeEffects:(nullable ScrollableOptions *)options;