@lodev09/react-native-true-sheet 4.0.0-beta.2 → 4.0.0-beta.20

package/ios/core/TrueSheetBlurView.h

@@ -14,8 +14,6 @@ NS_ASSUME_NONNULL_BEGIN
 @interface TrueSheetBlurView : UIVisualEffectView
 
 @property (nonatomic, assign) facebook::react::TrueSheetViewBackgroundBlur backgroundBlur;
-@property (nonatomic, strong, nullable) NSNumber *blurIntensity;
-@property (nonatomic, assign) BOOL blurInteraction;
 
 /// Adds the blur view to a parent view with proper constraints
 - (void)addToView:(UIView *)parentView;

package/ios/core/TrueSheetBlurView.mm

@@ -13,15 +13,13 @@
 
 using namespace facebook::react;
 
-@implementation TrueSheetBlurView {
-  UIViewPropertyAnimator *_blurAnimator;
-}
+@implementation TrueSheetBlurView
 
 #pragma mark - Initialization
 
 - (instancetype)init {
   if (self = [super init]) {
-    _blurInteraction = YES;
+    self.userInteractionEnabled = NO;
   }
   return self;
 }
@@ -38,45 +36,14 @@ using namespace facebook::react;
   [parentView insertSubview:self atIndex:0];
 }
 
-- (void)clearAnimator {
-  if (_blurAnimator) {
-    [_blurAnimator stopAnimation:YES];
-    _blurAnimator = nil;
-  }
-}
-
 - (void)applyBlurEffect {
-  self.userInteractionEnabled = self.blurInteraction;
-
   if (self.backgroundBlur == TrueSheetViewBackgroundBlur::None) {
-    [self clearAnimator];
     self.effect = nil;
     return;
   }
 
   UIBlurEffectStyle style = [BlurUtil blurEffectStyleFromEnum:self.backgroundBlur];
-  UIBlurEffect *blurEffect = [UIBlurEffect effectWithStyle:style];
-
-  CGFloat intensity =
-    (self.blurIntensity && [self.blurIntensity floatValue] >= 0) ? [self.blurIntensity floatValue] / 100.0 : 1.0;
-
-  if (intensity >= 1.0) {
-    [self clearAnimator];
-    self.effect = blurEffect;
-    return;
-  }
-
-  if (!_blurAnimator) {
-    __weak __typeof(self) weakSelf = self;
-    _blurAnimator = [[UIViewPropertyAnimator alloc] initWithDuration:1.0
-                                                               curve:UIViewAnimationCurveLinear
-                                                          animations:^{
-                                                            weakSelf.effect = blurEffect;
-                                                          }];
-  }
-
-  _blurAnimator.pausesOnCompletion = YES;
-  _blurAnimator.fractionComplete = intensity;
+  self.effect = [UIBlurEffect effectWithStyle:style];
 }
 
 @end

package/ios/core/TrueSheetDetentCalculator.h

@@ -24,6 +24,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) BOOL absoluteHeader;
 @property (nonatomic, strong, readonly, nullable) NSNumber *footerHeight;
 @property (nonatomic, readonly) BOOL absoluteFooter;
+@property (nonatomic, readonly) BOOL footerInsetAdjustment;
+@property (nonatomic, readonly) BOOL footerAvoidsKeyboard;
+@property (nonatomic, readonly) CGFloat appliedFooterBottomInset;
 @property (nonatomic, strong, readonly, nullable) NSNumber *peekContentHeight;
 
 @end
@@ -43,12 +46,15 @@ NS_ASSUME_NONNULL_BEGIN
  For peek (-2) detents, calculates based on header + footer height.
  */
 - (CGFloat)detentValueForIndex:(NSInteger)index;
+- (NSInteger)backgroundIndexForPosition:(CGFloat)position displayedIndex:(NSInteger)displayedIndex;
 
 /**
  Returns the height for auto (-1) detents: content + header + footer height.
  An absolute (floating) header or footer contributes no height.
+ A pinned footer contributes only its overlap above the keyboard. UIKit adds
+ the keyboard expansion separately. Pass 0 for the keyboard-free height.
  */
-- (CGFloat)autoHeight;
+- (CGFloat)autoHeightForKeyboardHeight:(CGFloat)keyboardHeight;
 
 /**
  Returns the height for peek (-2) detents: header + footer + peek content height.

package/ios/core/TrueSheetDetentCalculator.mm

@@ -19,7 +19,7 @@
   if (index >= 0 && index < (NSInteger)detents.count) {
     CGFloat value = [detents[index] doubleValue];
     if (value == -1) {
-      return [self autoHeight] / self.delegate.screenHeight;
+      return [self autoHeightForKeyboardHeight:0] / self.delegate.screenHeight;
     }
     if (value == -2) {
       return [self peekHeight] / self.delegate.screenHeight;
@@ -29,10 +29,15 @@
   return 0;
 }
 
-- (CGFloat)autoHeight {
-  // An absolute (floating) header or footer overlaps the content, so it contributes no height
+- (CGFloat)autoHeightForKeyboardHeight:(CGFloat)keyboardHeight {
+  // An absolute (floating) header or footer overlaps the content, so it contributes no height —
+  // unless the footer pads the scrollable, then the content ends above it like a relative footer
   CGFloat headerHeight = self.delegate.absoluteHeader ? 0 : [self.delegate.headerHeight floatValue];
-  CGFloat footerHeight = self.delegate.absoluteFooter ? 0 : [self.delegate.footerHeight floatValue];
+  BOOL floatingFooter = self.delegate.absoluteFooter && !self.delegate.footerInsetAdjustment;
+  CGFloat footerHeight = floatingFooter ? 0 : [self.delegate.footerHeight floatValue];
+  if (self.delegate.absoluteFooter && !floatingFooter && !self.delegate.footerAvoidsKeyboard) {
+    footerHeight -= MIN(keyboardHeight, MAX(0, footerHeight - self.delegate.appliedFooterBottomInset));
+  }
   return [self.delegate.contentHeight floatValue] + headerHeight + footerHeight;
 }
 
@@ -93,6 +98,24 @@
   return 0;
 }
 
+- (NSInteger)backgroundIndexForPosition:(CGFloat)position displayedIndex:(NSInteger)displayedIndex {
+  NSInteger count = self.delegate.detents.count;
+  if (count == 0)
+    return -1;
+
+  CGFloat height = self.delegate.screenHeight - position;
+  NSInteger nextIndex = MAX(0, MIN(displayedIndex, count - 1));
+  CGFloat distance = fabs(height - [self resolvedHeightForIndex:nextIndex]);
+  for (NSInteger index = 0; index < count; index++) {
+    CGFloat nextDistance = fabs(height - [self resolvedHeightForIndex:index]);
+    if (nextDistance < distance) {
+      nextIndex = index;
+      distance = nextDistance;
+    }
+  }
+  return nextIndex;
+}
+
 - (BOOL)findSegmentForPosition:(CGFloat)position outIndex:(NSInteger *)outIndex outProgress:(CGFloat *)outProgress {
   NSArray<NSNumber *> *detents = self.delegate.detents;
   NSInteger count = detents.count;

package/ios/core/TrueSheetGrabberView.mm

@@ -91,6 +91,13 @@ static const CGFloat kHitPaddingVertical = 10.0;
   }
 }
 
+// Pad the pill evenly like the system grabber. The view frame itself stays inside
+// the sheet, since the reveal check reads the frame rather than this rect.
+- (CGRect)accessibilityFrame {
+  CGRect rect = CGRectInset(_vibrancyView.frame, -kHitPaddingHorizontal, -kHitPaddingVertical);
+  return UIAccessibilityConvertFrameToScreenCoordinates(rect, self);
+}
+
 - (void)accessibilityIncrement {
   if (_onIncrement) {
     _onIncrement();
@@ -144,14 +151,17 @@ static const CGFloat kHitPaddingVertical = 10.0;
   CGFloat topMargin = [self effectiveTopMargin];
   CGFloat parentWidth = self.superview ? self.superview.bounds.size.width : UIScreen.mainScreen.bounds.size.width;
 
+  // Keep the frame inside the sheet. A frame above the top edge reads as a clipped element
+  // to VoiceOver, and the sheet reveals it on focus by moving to the next detent.
   CGFloat frameWidth = pillWidth + kHitPaddingHorizontal * 2;
-  CGFloat frameHeight = pillHeight + kHitPaddingVertical * 2;
-  CGFloat frameY = topMargin - kHitPaddingVertical;
+  CGFloat frameY = MAX(0, topMargin - kHitPaddingVertical);
+  CGFloat pillY = topMargin - frameY;
+  CGFloat frameHeight = pillY + pillHeight + kHitPaddingVertical;
 
   self.frame = CGRectMake((parentWidth - frameWidth) / 2.0, frameY, frameWidth, frameHeight);
   self.backgroundColor = UIColor.clearColor;
 
-  CGRect pillRect = CGRectMake(kHitPaddingHorizontal, kHitPaddingVertical, pillWidth, pillHeight);
+  CGRect pillRect = CGRectMake(kHitPaddingHorizontal, pillY, pillWidth, pillHeight);
   _vibrancyView.frame = pillRect;
   _vibrancyView.layer.cornerRadius = [self effectiveCornerRadius];
   _vibrancyView.clipsToBounds = YES;

package/ios/core/TrueSheetKeyboardObserver.mm

@@ -98,6 +98,8 @@
       });
   }
 
+  _viewController.keyboardHeight = keyboardHeight;
+
   for (id<TrueSheetKeyboardObserverDelegate> delegate in _delegates) {
     if (keyboardHeight > 0) {
       [delegate keyboardWillShow:keyboardHeight duration:duration curve:curve];

package/ios/core/TrueSheetOverlayContainerView.h

@@ -0,0 +1,31 @@
+//
+//  Created by Jovanni Lo (@lodev09)
+//  Copyright (c) 2024-present. All rights reserved.
+//
+//  This source code is licensed under the MIT license found in the
+//  LICENSE file in the root directory of this source tree.
+//
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol TrueSheetOverlayContainerViewDelegate <NSObject>
+- (void)overlayContainerViewDidLayout:(CGSize)size;
+@end
+
+/**
+ * Window-level view hosting an overlay's children.
+ * Touches that miss every child fall through to the views beneath.
+ */
+@interface TrueSheetOverlayContainerView : UIView
+
+@property (nonatomic, weak, nullable) id<TrueSheetOverlayContainerViewDelegate> delegate;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif

package/ios/core/TrueSheetOverlayContainerView.mm

@@ -0,0 +1,35 @@
+//
+//  Created by Jovanni Lo (@lodev09)
+//  Copyright (c) 2024-present. All rights reserved.
+//
+//  This source code is licensed under the MIT license found in the
+//  LICENSE file in the root directory of this source tree.
+//
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "TrueSheetOverlayContainerView.h"
+
+@implementation TrueSheetOverlayContainerView
+
+- (instancetype)initWithFrame:(CGRect)frame {
+  if (self = [super initWithFrame:frame]) {
+    self.backgroundColor = UIColor.clearColor;
+    self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+  }
+  return self;
+}
+
+- (nullable UIView *)hitTest:(CGPoint)point withEvent:(nullable UIEvent *)event {
+  UIView *hit = [super hitTest:point withEvent:event];
+  return hit == self ? nil : hit;
+}
+
+- (void)layoutSubviews {
+  [super layoutSubviews];
+  [self.delegate overlayContainerViewDidLayout:self.bounds.size];
+}
+
+@end
+
+#endif

package/ios/events/TrueSheetLifecycleEvents.h

@@ -33,6 +33,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (void)emitDidDismiss:(std::shared_ptr<const facebook::react::EventEmitter>)eventEmitter;
 
++ (void)emitDismissAttempt:(std::shared_ptr<const facebook::react::EventEmitter>)eventEmitter;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/events/TrueSheetLifecycleEvents.mm

@@ -66,6 +66,14 @@
   emitter->onDidDismiss({});
 }
 
++ (void)emitDismissAttempt:(std::shared_ptr<const facebook::react::EventEmitter>)eventEmitter {
+  if (!eventEmitter)
+    return;
+
+  auto emitter = std::static_pointer_cast<TrueSheetViewEventEmitter const>(eventEmitter);
+  emitter->onDismissAttempt({});
+}
+
 @end
 
 #endif  // RCT_NEW_ARCH_ENABLED

package/ios/tvos/TrueSheetStubs.mm

@@ -20,6 +20,7 @@
 #import <react/renderer/components/TrueSheetSpec/ComponentDescriptors.h>
 #import <react/renderer/components/TrueSheetSpec/TrueSheetContentViewComponentDescriptor.h>
 #import <react/renderer/components/TrueSheetSpec/TrueSheetFooterViewComponentDescriptor.h>
+#import <react/renderer/components/TrueSheetSpec/TrueSheetOverlayViewComponentDescriptor.h>
 #import <react/renderer/components/TrueSheetSpec/TrueSheetViewComponentDescriptor.h>
 
 #import <TrueSheetSpec/TrueSheetSpec.h>
@@ -94,6 +95,17 @@ using namespace facebook::react;
 
 @end
 
+@interface TrueSheetOverlayView : RCTViewComponentView
+@end
+
+@implementation TrueSheetOverlayView
+
++ (ComponentDescriptorProvider)componentDescriptorProvider {
+  return concreteComponentDescriptorProvider<TrueSheetOverlayViewComponentDescriptor>();
+}
+
+@end
+
 #pragma mark - Module
 
 @interface TrueSheetModule : NSObject <RCTBridgeModule, NativeTrueSheetModuleSpec>

package/ios/utils/UIView+ScrollEdgeInteraction.h

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setupEdgeInteractionWithScrollView:(nullable UIScrollView *)scrollView
                                       edge:(UIRectEdge)edge API_AVAILABLE(ios(26.0));
 - (void)cleanupEdgeInteraction API_AVAILABLE(ios(26.0));
+- (nullable UIScrollView *)edgeInteractionScrollView API_AVAILABLE(ios(26.0));
 
 @end
 

package/ios/utils/UIView+ScrollEdgeInteraction.mm

@@ -31,15 +31,37 @@ static const void *kEdgeEffectHintKey = &kEdgeEffectHintKey;
   objc_setAssociatedObject(self, kEdgeEffectHintKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
+- (nullable UIScrollView *)edgeInteractionScrollView API_AVAILABLE(ios(26.0)) {
+#if RNTS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+  for (id<UIInteraction> interaction in self.interactions) {
+    if ([interaction isKindOfClass:[UIScrollEdgeElementContainerInteraction class]]) {
+      return ((UIScrollEdgeElementContainerInteraction *)interaction).scrollView;
+    }
+  }
+#endif
+  return nil;
+}
+
 - (void)setupEdgeInteractionWithScrollView:(nullable UIScrollView *)scrollView
                                       edge:(UIRectEdge)edge API_AVAILABLE(ios(26.0)) {
-  [self cleanupEdgeInteraction];
-
   if (!scrollView) {
+    [self cleanupEdgeInteraction];
     return;
   }
 
 #if RNTS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+  // Update in place — this re-runs on every footer/header size change, and
+  // tearing the interaction down mid keyboard animation flashes the edge
+  // effect at the footer's final position.
+  for (id<UIInteraction> interaction in self.interactions) {
+    if ([interaction isKindOfClass:[UIScrollEdgeElementContainerInteraction class]]) {
+      UIScrollEdgeElementContainerInteraction *existing = (UIScrollEdgeElementContainerInteraction *)interaction;
+      existing.scrollView = scrollView;
+      existing.edge = edge;
+      return;
+    }
+  }
+
   // UIScrollEdgeElementContainerInteraction requires standard UIKit element
   // descendants (UILabel, UIControl, etc.) to trigger the edge effect.
   // RCTViewComponentView subviews are not recognized, so we add a