@lodev09/react-native-true-sheet 4.0.0-beta.10 → 4.0.0-beta.11

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

@@ -21,15 +21,13 @@ void TrueSheetContentViewShadowNode::layout(LayoutContext layoutContext) {
   updateNaturalHeightIfNeeded(layoutContext);
 }
 
-// The content's committed height follows the container instead of its own
-// content when it can grow/shrink along the main axis or uses a percent
-// height. Reporting that height as the natural height would echo the sheet's
-// own size back as a content size change — e.g. flex: 1 content tracking a
-// drag frame by frame.
+// Even auto-height content can be constrained by the container when a
+// descendant ScrollView shrinks to fit. Its committed height then hides
+// content growth, so only a fixed, non-flexible height can be used directly.
 static bool isHeightContainerDerived(const yoga::Style &style) {
   return style.flexGrow().unwrapOrDefault(0) > 0 ||
       style.flexShrink().unwrapOrDefault(0) > 0 ||
-      style.dimension(Dimension::Height).isPercent();
+      !style.dimension(Dimension::Height).isPoints();
 }
 
 // The natural height is the height the content wants when unbounded — the

package/ios/TrueSheetContentView.mm

@@ -168,6 +168,8 @@ using namespace facebook::react;
   if (_scrollableHandle > 0 && !_detectedScrollView) {
     [self.delegate contentViewScrollViewDidChange];
   }
+
+  [self updateKeyboardInset];
 }
 
 #pragma mark - Scrollable
@@ -183,6 +185,13 @@ using namespace facebook::react;
   _detectedScrollView.scrollView.contentInset = contentInset;
 }
 
+- (void)updateKeyboardInset {
+  CGFloat keyboardHeight = _keyboardObserver.currentHeight;
+  if (_detectedScrollView && keyboardHeight > 0) {
+    [self setKeyboardInset:[self keyboardInsetWithHeight:keyboardHeight]];
+  }
+}
+
 - (void)clearScrollable {
   [self setKeyboardInset:0];
   _appliedKeyboardOffset = 0;
@@ -213,26 +222,22 @@ using namespace facebook::react;
   [self applyContentInsetAdjustment];
 
   // If keyboard is currently showing, re-apply the keyboard inset to the new ScrollView
-  CGFloat keyboardHeight = _keyboardObserver ? _keyboardObserver.currentHeight : 0;
-  if (keyboardHeight > 0) {
-    [self setKeyboardInset:[self keyboardInsetWithHeight:keyboardHeight]];
-  }
+  [self updateKeyboardInset];
 }
 
-// A relative footer stays behind the keyboard below the content, so its
-// height shields that much of the keyboard's overlap. An absolute footer
-// floats within the viewport — its clearance is the content padding's job
-// (the caret reveal accounts for it, see footerOcclusion).
+// Short or nested scroll views can end above the sheet's bottom edge.
+// Measure their actual keyboard overlap, including space occupied by a relative footer.
 - (CGFloat)keyboardInsetWithHeight:(CGFloat)height {
-  CGFloat inset = height;
-  if (self.footerView && !_keyboardObserver.viewController.absoluteFooter) {
-    inset = MAX(0, height - self.footerView.frame.size.height);
-  }
+  UIScrollView *scrollView = _detectedScrollView.scrollView;
+  UIWindow *window = scrollView.window;
+  CGRect scrollFrame = [scrollView convertRect:scrollView.bounds toView:window];
+  CGFloat keyboardTop = CGRectGetMaxY(window.bounds) - height;
+  CGFloat inset = MAX(0, CGRectGetMaxY(scrollFrame) - keyboardTop);
 
   // UIKit stacks the safe area on top of contentInset while the adjustment
   // behavior is automatic — take it out so the total lands on the keyboard edge.
   if (_appliedContentInsetAdjustment) {
-    inset = MAX(0, inset - _detectedScrollView.scrollView.safeAreaInsets.bottom);
+    inset = MAX(0, inset - scrollView.safeAreaInsets.bottom);
   }
 
   // Track how much of keyboardOffset actually lands in the inset so the caret
@@ -242,7 +247,6 @@ using namespace facebook::react;
 
   // Content that already fits above the keyboard has nothing to reveal — the
   // inset would only open blank scroll range below it (huge gap at the bottom).
-  UIScrollView *scrollView = _detectedScrollView.scrollView;
   if (scrollView.contentSize.height <= scrollView.bounds.size.height - adjustedInset) {
     _appliedKeyboardOffset = 0;
     return 0;
@@ -334,12 +338,14 @@ using namespace facebook::react;
 
   CGFloat inset = [self keyboardInsetWithHeight:height];
   [UIView animateWithDuration:duration
-                        delay:0
-                      options:curve | UIViewAnimationOptionBeginFromCurrentState
-                   animations:^{
-                     [self setKeyboardInset:inset];
-                   }
-                   completion:nil];
+    delay:0
+    options:curve | UIViewAnimationOptionBeginFromCurrentState
+    animations:^{
+      [self setKeyboardInset:inset];
+    }
+    completion:^(BOOL finished) {
+      [self updateKeyboardInset];
+    }];
 
   // Defer scroll until the next run loop so content insets are applied first
   if (firstResponder) {
@@ -363,7 +369,7 @@ using namespace facebook::react;
   dispatch_async(dispatch_get_main_queue(), ^{
     // Typing can grow the content (e.g. a multiline input) past the fits-above-
     // the-keyboard threshold — keep the inset in sync before revealing the caret.
-    [self setKeyboardInset:[self keyboardInsetWithHeight:self->_keyboardObserver.currentHeight]];
+    [self updateKeyboardInset];
     [self scrollToFocusedCaretAnimated:YES];
   });
 }

package/package.json

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