@lodev09/react-native-true-sheet 4.0.0-beta.24 → 4.0.0-beta.26

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
@@ -317,6 +319,8 @@ using namespace facebook::react;
   _controller.dismissible = newProps.dismissible;
   _controller.draggable = newProps.draggable;
   _controller.dimmed = newProps.dimmed;
+  _controller.dimOpacity = newProps.dimOpacity < 0 ? nil : @(newProps.dimOpacity);
+  _controller.dimColor = RCTUIColorFromSharedColor(newProps.dimColor);
 
   if (newProps.dimmedDetentIndex >= 0) {
     _controller.dimmedDetentIndex = @(newProps.dimmedDetentIndex);
@@ -419,7 +423,8 @@ using namespace facebook::react;
   [self setupScrollable];
 
   if (_controller.isPresented) {
-    [self applySheetPropsUpdate];
+    _pendingPropsUpdate = YES;
+    [self setupSheetDetentsForSizeChange];
   } else if (_controller.isBeingPresented) {
     _pendingPropsUpdate = YES;
   } else if (_initialDetentIndex >= 0) {
@@ -630,6 +635,8 @@ using namespace facebook::react;
     _controller.peekContentHeight = @([_containerView peekContentHeight]);
   }
   _pendingSizeChange = NO;
+  // Props queued while the previous presentation dismissed — applied above.
+  _pendingPropsUpdate = NO;
 
   [self refreshFooterBottomInset];
   [_controller setupSheetDetents];
@@ -719,6 +726,20 @@ using namespace facebook::react;
     return;
   }
 
+  // Still animating in (isPresented flips at viewDidAppear): dismiss once the presentation lands
+  id<UIViewControllerTransitionCoordinator> presentCoordinator =
+    _controller.isBeingPresented ? _controller.transitionCoordinator : nil;
+  if (presentCoordinator) {
+    __weak __typeof(self) weakSelf = self;
+    [presentCoordinator animateAlongsideTransition:nil
+                                        completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
+                                          dispatch_async(dispatch_get_main_queue(), ^{
+                                            [weakSelf dismissAnimated:animated completion:completion];
+                                          });
+                                        }];
+    return;
+  }
+
   if (_controller.isBeingDismissed || !_controller.isPresented) {
     RCTLogWarn(@"TrueSheet: sheet is already dismissed. No need to dismiss it again.");
 
@@ -768,7 +789,8 @@ using namespace facebook::react;
 #pragma mark - TrueSheetContainerViewDelegate
 
 /**
- * Debounced sheet update to handle rapid content/header size changes.
+ * Coalesces prop and size changes outside Fabric's mount transaction so
+ * the footer's layout can mount inside UIKit's resize animation.
  */
 - (void)setupSheetDetentsForSizeChange {
   // Keep the footer's absorbed inset in sync with the latest measured heights
@@ -784,26 +806,52 @@ using namespace facebook::react;
   }
 
   // Not presented: presentAtIndex measures at present time.
-  // Dismissing: the sheet is going away — touching detents perturbs the
-  // presentation stack, visibly glitching the sheet behind.
-  if (!_controller.isPresented || _controller.isBeingDismissed)
+  if (!_controller.isPresented || _isSheetUpdatePending)
     return;
 
-  if (_isSheetUpdatePending)
+  // Dismissing: the sheet is going away — touching detents perturbs the
+  // presentation stack, visibly glitching the sheet behind. An interactive
+  // dismiss can still cancel, so retry once the transition resolves.
+  if (_controller.isBeingDismissed) {
+    id<UIViewControllerTransitionCoordinator> coordinator = _controller.transitionCoordinator;
+    if (coordinator) {
+      _isSheetUpdatePending = YES;
+
+      __weak __typeof(self) weakSelf = self;
+      [coordinator animateAlongsideTransition:nil
+                                   completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
+                                     dispatch_async(dispatch_get_main_queue(), ^{
+                                       __typeof(self) strongSelf = weakSelf;
+                                       if (!strongSelf)
+                                         return;
+
+                                       strongSelf->_isSheetUpdatePending = NO;
+                                       [strongSelf setupSheetDetentsForSizeChange];
+                                     });
+                                   }];
+    }
     return;
+  }
 
   _isSheetUpdatePending = YES;
 
   dispatch_async(dispatch_get_main_queue(), ^{
     self->_isSheetUpdatePending = NO;
-    if (!self->_containerView || self->_controller.isBeingDismissed)
+    if (!self->_containerView || !self->_controller.isPresented || self->_controller.isBeingDismissed)
       return;
 
     // Refresh here (not just on peek size events) since the peek's offset
     // within the content can change without its own size changing.
     self->_controller.peekContentHeight = @([self->_containerView peekContentHeight]);
     [self refreshFooterBottomInset];
+
+    // Size first: the props rebuild refreshes the heights itself, hiding the
+    // change from the controller and skipping its post-resize settle.
     [self->_controller setupSheetDetentsForSizeChange];
+    if (self->_pendingPropsUpdate) {
+      self->_pendingPropsUpdate = NO;
+      [self applySheetPropsUpdate];
+    }
   });
 }
 
@@ -820,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 {
@@ -836,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

@@ -78,10 +78,13 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) facebook::react::TrueSheetViewAccessibilityOptionsStruct accessibilityOptions;
 @property (nonatomic, assign) BOOL draggable;
 @property (nonatomic, assign) BOOL dimmed;
+@property (nonatomic, strong, nullable) UIColor *dimColor;
+@property (nonatomic, strong, nullable) NSNumber *dimOpacity;
 @property (nonatomic, strong, nullable) NSNumber *dimmedDetentIndex;
 @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;
@@ -107,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;
@@ -128,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;
@@ -136,6 +149,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setupSheetDetents;
 - (void)setupSheetDetentsForSizeChange;
 - (void)setupSheetDetentsForDetentsChange;
+- (void)invalidateDetents;
 - (void)setupDraggable;
 - (void)setupAnchorViewInView:(UIView *)parentView;