@lodev09/react-native-true-sheet 3.11.10 → 4.0.0-beta.1

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

@@ -0,0 +1,24 @@
+#pragma once
+
+#include <react/renderer/components/TrueSheetSpec/TrueSheetFooterViewShadowNode.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+
+/*
+ * Descriptor for <TrueSheetFooterView> component.
+ */
+class TrueSheetFooterViewComponentDescriptor final
+    : public ConcreteComponentDescriptor<TrueSheetFooterViewShadowNode> {
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+
+  void adopt(ShadowNode &shadowNode) const override {
+    auto &concreteShadowNode =
+        static_cast<TrueSheetFooterViewShadowNode &>(shadowNode);
+    concreteShadowNode.adjustLayoutWithState();
+
+    ConcreteComponentDescriptor::adopt(shadowNode);
+  }
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetFooterViewShadowNode.cpp

@@ -0,0 +1,56 @@
+#include "TrueSheetFooterViewShadowNode.h"
+
+#include <react/renderer/components/view/conversions.h>
+
+#include "TrueSheetInsets.h"
+
+namespace facebook::react {
+
+using namespace yoga;
+
+extern const char TrueSheetFooterViewComponentName[] = "TrueSheetFooterView";
+
+void TrueSheetFooterViewShadowNode::adjustLayoutWithState() {
+  ensureUnsealed();
+
+  auto state = std::static_pointer_cast<
+      const TrueSheetFooterViewShadowNode::ConcreteState>(getState());
+  auto stateData = state->getData();
+
+  auto &props = getConcreteProps();
+
+  // Until native pushes the real inset (which requires this node to already
+  // exist), seed a late-mounted footer's first layout with the precalculated
+  // inset — otherwise it lays out unpadded and forces a second sheet resize.
+  float bottomInset = stateData.bottomInset;
+  if (!stateData.initialized && props.autoBottomInset) {
+    bottomInset = TrueSheetInsets::bottomSafeArea();
+  }
+
+  // A footer pinned to the sheet's bottom edge owns the bottom safe-area
+  // inset — pad it on top of any style padding so its content clears the
+  // home indicator while the background fills the inset.
+  auto padding = props.yogaStyle.padding(Edge::Bottom);
+  if (bottomInset > 0) {
+    // Base bottom padding from the style — Edge::Bottom wins over
+    // Vertical/All, mirroring Yoga's own resolution. Points only.
+    float base = 0;
+    for (auto edge : {Edge::Bottom, Edge::Vertical, Edge::All}) {
+      auto length = props.yogaStyle.padding(edge);
+      if (length.isDefined()) {
+        base = length.isPoints() ? length.value().unwrap() : 0;
+        break;
+      }
+    }
+    padding = StyleLength::points(base + bottomInset);
+  }
+
+  if (yogaNode_.style().padding(Edge::Bottom) != padding) {
+    yoga::Style adjustedStyle = props.yogaStyle;
+    adjustedStyle.setPadding(Edge::Bottom, padding);
+    yogaNode_.setStyle(adjustedStyle);
+    yogaNode_.setDirty(true);
+  }
+}
+
+} // namespace facebook::react

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

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <jsi/jsi.h>
+#include <react/renderer/components/TrueSheetSpec/EventEmitters.h>
+#include <react/renderer/components/TrueSheetSpec/Props.h>
+#include <react/renderer/components/TrueSheetSpec/TrueSheetFooterViewState.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+
+namespace facebook::react {
+
+JSI_EXPORT extern const char TrueSheetFooterViewComponentName[];
+
+/*
+ * `ShadowNode` for <TrueSheetFooterView> component.
+ */
+class JSI_EXPORT TrueSheetFooterViewShadowNode final
+    : public ConcreteViewShadowNode<
+          TrueSheetFooterViewComponentName,
+          TrueSheetFooterViewProps,
+          TrueSheetFooterViewEventEmitter,
+          TrueSheetFooterViewState> {
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+ public:
+  void adjustLayoutWithState();
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetFooterViewState.cpp

@@ -0,0 +1,11 @@
+#include "TrueSheetFooterViewState.h"
+
+namespace facebook::react {
+
+#ifdef ANDROID
+folly::dynamic TrueSheetFooterViewState::getDynamic() const {
+  return folly::dynamic::object("bottomInset", bottomInset);
+}
+#endif
+
+} // namespace facebook::react

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

@@ -0,0 +1,41 @@
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook::react {
+
+/*
+ * State for <TrueSheetFooterView> component.
+ * Set from native with the sheet's bottom safe-area inset so the shadow node
+ * pads the footer's bottom edge (see TrueSheetFooterViewShadowNode).
+ */
+class TrueSheetFooterViewState final {
+ public:
+  TrueSheetFooterViewState() = default;
+
+#ifdef ANDROID
+  TrueSheetFooterViewState(
+      TrueSheetFooterViewState const &previousState,
+      folly::dynamic data)
+      : bottomInset(static_cast<float>(data["bottomInset"].getDouble())),
+        initialized(true) {}
+#endif
+
+  float bottomInset{0};
+  // True once native has pushed a real inset — until then the shadow node
+  // seeds the layout from TrueSheetInsets (see TrueSheetFooterViewShadowNode)
+  bool initialized{false};
+
+#ifdef ANDROID
+  folly::dynamic getDynamic() const;
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  }
+#endif
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetInsets.cpp

@@ -0,0 +1,18 @@
+#include "TrueSheetInsets.h"
+
+#include <atomic>
+
+namespace facebook::react {
+
+// Written from the UI thread, read from the layout thread
+static std::atomic<float> gBottomSafeArea{0};
+
+void TrueSheetInsets::setBottomSafeArea(float inset) {
+  gBottomSafeArea.store(inset, std::memory_order_relaxed);
+}
+
+float TrueSheetInsets::bottomSafeArea() {
+  return gBottomSafeArea.load(std::memory_order_relaxed);
+}
+
+} // namespace facebook::react

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

@@ -0,0 +1,16 @@
+#pragma once
+
+namespace facebook::react {
+
+/*
+ * Bottom safe-area inset published by the host platform (points/dp) so a
+ * late-mounted footer's first layout can be padded before any Fabric state
+ * lands (see TrueSheetFooterViewShadowNode).
+ */
+class TrueSheetInsets {
+ public:
+  static void setBottomSafeArea(float inset);
+  static float bottomSafeArea();
+};
+
+} // namespace facebook::react

package/ios/TrueSheetContainerView.h

@@ -45,11 +45,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, weak, nullable) id<TrueSheetContainerViewDelegate> delegate;
 
-/**
- * Enable scrollable content
- */
-@property (nonatomic, assign) BOOL scrollableEnabled;
-
 /**
  * Inset adjustment mode for scrollable content
  */
@@ -60,6 +55,18 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, strong, nullable) ScrollableOptions *scrollableOptions;
 
+/**
+ * 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
+ */
+@property (nonatomic, assign) BOOL hasAutoDetent;
+
+/**
+ * Bottom safe-area inset the footer absorbs as padding — the footer
+ * owns the sheet's bottom edge, so its background fills the inset
+ */
+@property (nonatomic, assign) CGFloat footerBottomInset;
+
 /**
  * Returns the current content height
  */
@@ -85,11 +92,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)attachPeekView:(TrueSheetPeekView *)peekView;
 
-/**
- * Updates footer layout constraints if needed
- */
-- (void)layoutFooter;
-
 /**
  * Re-applies the footer's keyboard slide to reflect a live `keyboardOffset` change.
  */

package/ios/TrueSheetContainerView.mm

@@ -26,7 +26,6 @@
 
 #import <React/RCTConversions.h>
 #import <React/RCTLog.h>
-#import <react/renderer/core/LayoutMetrics.h>
 
 using namespace facebook::react;
 
@@ -56,7 +55,6 @@ using namespace facebook::react;
   TrueSheetFooterView *_footerView;
   TrueSheetPeekView *__weak _peekView;
   TrueSheetKeyboardObserver *_keyboardObserver;
-  BOOL _scrollableSet;
 }
 
 #pragma mark - Initialization
@@ -74,7 +72,6 @@ using namespace facebook::react;
     _contentView = nil;
     _headerView = nil;
     _footerView = nil;
-    _scrollableSet = NO;
     self.isAccessibilityElement = NO;
   }
   return self;
@@ -109,13 +106,8 @@ using namespace facebook::react;
 
 #pragma mark - Layout
 
-- (void)layoutSubviews {
-  [super layoutSubviews];
-  [_contentView updateScrollViewHeight];
-}
-
 - (CGFloat)contentHeight {
-  return _contentView ? _contentView.frame.size.height : 0;
+  return _contentView ? _contentView.naturalHeight : 0;
 }
 
 - (CGFloat)headerHeight {
@@ -141,22 +133,13 @@ using namespace facebook::react;
   return CGRectGetMaxY([_peekView convertRect:_peekView.bounds toView:_contentView]);
 }
 
-- (void)layoutFooter {
-  if (_footerView) {
-    CGFloat height = _footerView.frame.size.height;
-    if (height > 0) {
-      [_footerView setupConstraintsWithHeight:height];
-    }
-  }
-}
-
 - (void)updateFooterKeyboardOffset {
   [_footerView applyKeyboardOffset];
 }
 
-- (void)setScrollableEnabled:(BOOL)scrollableEnabled {
-  _scrollableEnabled = scrollableEnabled;
-  _scrollableSet = YES;
+- (void)setFooterBottomInset:(CGFloat)footerBottomInset {
+  _footerBottomInset = footerBottomInset;
+  [_footerView setBottomInset:footerBottomInset];
 }
 
 - (void)setScrollableOptions:(ScrollableOptions *)scrollableOptions {
@@ -165,12 +148,13 @@ using namespace facebook::react;
 }
 
 - (void)setupScrollable {
-  if (_scrollableSet && _contentView) {
+  if (_contentView) {
     CGFloat bottomInset = 0;
     if (_insetAdjustment == TrueSheetViewInsetAdjustment::Automatic) {
       bottomInset = [WindowUtil keyWindow].safeAreaInsets.bottom;
     }
-    [_contentView setupScrollable:_scrollableEnabled bottomInset:bottomInset];
+    _contentView.hasAutoDetent = _hasAutoDetent;
+    [_contentView setupScrollableWithBottomInset:bottomInset];
     [_contentView applyScrollEdgeEffects:_scrollableOptions];
     if (@available(iOS 26.0, *)) {
       [self setupEdgeInteractions];
@@ -214,6 +198,7 @@ using namespace facebook::react;
     }
     _contentView = (TrueSheetContentView *)childComponentView;
     _contentView.delegate = self;
+    _contentView.footerView = _footerView;
 
     // Children mount bottom-up, so the content subtree is complete here.
     // Late-mounted peek views attach themselves instead (see TrueSheetPeekView).
@@ -240,6 +225,8 @@ using namespace facebook::react;
     }
     _footerView = (TrueSheetFooterView *)childComponentView;
     _footerView.delegate = self;
+    _contentView.footerView = _footerView;
+    [_footerView setBottomInset:_footerBottomInset];
     [self footerViewDidChangeSize:_footerView.frame.size];
   }
 }
@@ -259,6 +246,7 @@ using namespace facebook::react;
   if ([childComponentView isKindOfClass:[TrueSheetFooterView class]]) {
     _footerView.delegate = nil;
     _footerView = nil;
+    _contentView.footerView = nil;
     [self footerViewDidChangeSize:CGSizeZero];
   }
 
@@ -269,12 +257,6 @@ using namespace facebook::react;
   [super updateProps:props oldProps:oldProps];
 }
 
-#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
-- (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
-           oldLayoutMetrics:(const LayoutMetrics &)oldLayoutMetrics {
-  // Intentionally skip super - AutoLayout handles container's frame, not Yoga
-}
-
 #pragma mark - TrueSheetContentViewDelegate
 
 - (void)contentViewDidChangeSize:(CGSize)newSize {

package/ios/TrueSheetContentView.h

@@ -15,6 +15,7 @@
 #import "core/TrueSheetKeyboardObserver.h"
 
 @class TrueSheetViewController;
+@class TrueSheetFooterView;
 @class RCTScrollViewComponentView;
 @class ScrollableOptions;
 
@@ -33,19 +34,33 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) CGFloat keyboardScrollOffset;
 @property (nonatomic, weak, nullable) TrueSheetKeyboardObserver *keyboardObserver;
 
-- (RCTScrollViewComponentView *_Nullable)findScrollView;
+/**
+ * Sibling footer view — an absolute footer rises above the keyboard and
+ * occludes the content's bottom edge, so it counts toward the keyboard inset.
+ */
+@property (nonatomic, weak, nullable) TrueSheetFooterView *footerView;
 
 /**
- * Setup scrollable content
- * @param enabled Whether scrollable is enabled
- * @param bottomInset Bottom content inset for the scroll view
+ * 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.
+ */
+@property (nonatomic, assign) BOOL hasAutoDetent;
+
+/**
+ * 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.
  */
-- (void)setupScrollable:(BOOL)enabled bottomInset:(CGFloat)bottomInset;
+@property (nonatomic, readonly) CGFloat naturalHeight;
+
+- (RCTScrollViewComponentView *_Nullable)findScrollView;
 
 /**
- * Update the pinned scroll view's height to fill the container
+ * Pin the first ScrollView found in the content, wiring insets and keyboard handling
+ * @param bottomInset Bottom content inset for the scroll view
  */
-- (void)updateScrollViewHeight;
+- (void)setupScrollableWithBottomInset:(CGFloat)bottomInset;
 
 /**
  * Apply scroll edge effects to the pinned scroll view (iOS 26+)