@lodev09/react-native-true-sheet 4.0.0-beta.25 → 4.0.0-beta.27

package/ios/TrueSheetFooterView.mm

@@ -67,7 +67,7 @@ using namespace facebook::react;
     return;
   }
   _bottomInset = bottomInset;
-  [self pushBottomInsetState];
+  [self pushStateWithMode:EventQueue::UpdateMode::unstable_Immediate];
 }
 
 // Skipped while the keyboard is open — an absolute footer rises above the
@@ -77,22 +77,36 @@ using namespace facebook::react;
     return;
   }
   _keyboardVisible = keyboardVisible;
-  [self pushBottomInsetState];
+  [self pushStateWithMode:EventQueue::UpdateMode::unstable_Immediate];
 }
 
-- (void)pushBottomInsetState {
+// The keyboard slide is a transform the shadow tree can't see — mirror it so
+// measure() (and Pressability's press region) match where the footer is drawn.
+// Async: no layout reads it.
+- (void)setKeyboardOffset:(CGFloat)keyboardOffset {
+  if (_currentKeyboardOffset == keyboardOffset) {
+    return;
+  }
+  _currentKeyboardOffset = keyboardOffset;
+  [self pushStateWithMode:EventQueue::UpdateMode::Asynchronous];
+}
+
+// Every push carries all fields — RN's EventQueue drops a still-queued update
+// for the same view when the next one is enqueued.
+- (void)pushStateWithMode:(EventQueue::UpdateMode)mode {
   if (!_state) {
     return;
   }
 
   TrueSheetFooterViewState newState;
   newState.bottomInset = _keyboardVisible ? 0 : _bottomInset;
+  newState.translateY = -_currentKeyboardOffset;
   newState.initialized = true;
-  // Immediate so the inset lands before anything reads the footer's height —
-  // the async path races the keyboard caret scroll and detent setup, leaving
-  // them an inset stale (same reason Android bridges through
-  // TrueSheetStateUpdater).
-  _state->updateState(std::move(newState), EventQueue::UpdateMode::unstable_Immediate);
+  // Inset changes go Immediate so they land before anything reads the
+  // footer's height — the async path races the keyboard caret scroll and
+  // detent setup, leaving them an inset stale (same reason Android bridges
+  // through TrueSheetStateUpdater).
+  _state->updateState(std::move(newState), mode);
   _didPushBottomInset = YES;
 }
 
@@ -123,6 +137,11 @@ using namespace facebook::react;
 
 - (void)collectAccessibilityElementsFromView:(UIView *)view into:(NSMutableArray *)elements {
   for (UIView *subview in view.subviews) {
+    // Fabric hides `display: none` views instead of unmounting them
+    if (subview.hidden) {
+      continue;
+    }
+
     if (subview.isAccessibilityElement || subview.accessibilityLabel || subview.accessibilityIdentifier) {
       [elements addObject:subview];
     } else if (subview.accessibilityElements.count > 0) {
@@ -210,7 +229,7 @@ using namespace facebook::react;
   [self setKeyboardVisible:YES];
 
   CGFloat slide = [self keyboardSlideForHeight:height];
-  _currentKeyboardOffset = slide;
+  [self setKeyboardOffset:slide];
 
   [UIView animateWithDuration:duration
     delay:0
@@ -225,8 +244,9 @@ using namespace facebook::react;
 }
 
 - (void)keyboardWillHide:(NSTimeInterval)duration curve:(UIViewAnimationOptions)curve {
+  // Offset first — the visible push replaces it in the queue, one commit
+  [self setKeyboardOffset:0];
   [self setKeyboardVisible:NO];
-  _currentKeyboardOffset = 0;
 
   [UIView animateWithDuration:duration
                         delay:0
@@ -261,8 +281,8 @@ using namespace facebook::react;
 
   // avoidKeyboard flipped off mid-keyboard — drop the slide already applied
   if (![self floatsAboveKeyboard]) {
+    [self setKeyboardOffset:0];
     [self setKeyboardVisible:NO];
-    _currentKeyboardOffset = 0;
     self.transform = CGAffineTransformIdentity;
     return;
   }
@@ -270,7 +290,7 @@ using namespace facebook::react;
   [self setKeyboardVisible:YES];
 
   CGFloat slide = [self keyboardSlideForHeight:height];
-  _currentKeyboardOffset = slide;
+  [self setKeyboardOffset:slide];
   self.transform = CGAffineTransformMakeTranslation(0, -slide);
 }
 

package/ios/TrueSheetView.mm

@@ -284,6 +284,8 @@ using namespace facebook::react;
 
   _controller.placement = newProps.placement;
 
+  _controller.foldOptions = newProps.foldOptions;
+
   _controller.grabber = newProps.grabber;
 
   // Grabber options - check if any non-default values are set
@@ -866,7 +868,11 @@ using namespace facebook::react;
 - (void)containerViewFooterDidChangeSize:(CGSize)newSize {
   [self syncFooterMetrics];
   [self setupSheetDetentsForSizeChange];
-  [_controller setupAccessibilityContainer];
+  [_controller refreshAccessibilityContainer];
+}
+
+- (void)containerViewDidMountTransaction {
+  [_controller refreshAccessibilityContainerIfFooterChanged];
 }
 
 - (void)containerViewPeekDidChangeSize:(CGSize)newSize {
@@ -882,11 +888,12 @@ using namespace facebook::react;
 
 - (void)viewControllerWillPresentAtIndex:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent {
   _controller.activeDetentIndex = index;
+  // Before emitting, so an input focused in onWillPresent raises a tracked keyboard
+  [_containerView setupKeyboardObserverWithViewController:_controller];
   [TrueSheetLifecycleEvents emitWillPresent:_eventEmitter index:index position:position detent:detent];
 }
 
 - (void)viewControllerDidPresentAtIndex:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent {
-  [_containerView setupKeyboardObserverWithViewController:_controller];
   [TrueSheetLifecycleEvents emitDidPresent:_eventEmitter index:index position:position detent:detent];
 
   if (_pendingPropsUpdate) {

package/ios/TrueSheetViewController.h

@@ -84,6 +84,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) facebook::react::TrueSheetViewBackgroundBlur backgroundBlur;
 @property (nonatomic, assign) facebook::react::TrueSheetViewPresentation presentation;
 @property (nonatomic, assign) facebook::react::TrueSheetViewPlacement placement;
+@property (nonatomic, assign) facebook::react::TrueSheetViewFoldOptionsStruct foldOptions;
 @property (nonatomic, assign) facebook::react::TrueSheetViewInsetAdjustment insetAdjustment;
 @property (nonatomic, assign) BOOL scrollingExpandsSheet;
 @property (nonatomic, assign) CGFloat footerKeyboardOffset;
@@ -109,6 +110,13 @@ NS_ASSUME_NONNULL_BEGIN
  * announced — ahead of the grow/shrink animation, unlike keyboardSheetGrown.
  */
 @property (nonatomic, assign) CGFloat keyboardHeight;
+
+/**
+ * How far UIKit grows the sheet for the iPadOS minimized keyboard, which it
+ * treats as docked. Taken off every detent so the sheet stays put.
+ */
+@property (nonatomic, assign) CGFloat minimizedKeyboardOverlap;
+
 @property (nonatomic, readonly) BOOL isTopmostPresentedController;
 @property (nonatomic, readonly) BOOL isStackedBehindChild;
 @property (nonatomic, weak, nullable) UIView *accessibilityContentView;
@@ -130,6 +138,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) CGFloat appliedFooterBottomInset;
 
 - (void)setupAccessibilityContainer;
+- (void)refreshAccessibilityContainer;
+- (void)refreshAccessibilityContainerIfFooterChanged;
+
 - (void)applyActiveDetent;
 - (void)setupActiveDetentWithIndex:(NSInteger)index;
 - (void)resizeToDetentIndex:(NSInteger)index;
@@ -138,6 +149,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setupSheetDetents;
 - (void)setupSheetDetentsForSizeChange;
 - (void)setupSheetDetentsForDetentsChange;
+- (void)invalidateDetents;
 - (void)setupDraggable;
 - (void)setupAnchorViewInView:(UIView *)parentView;