@lodev09/react-native-true-sheet 3.11.13 → 3.11.14

package/ios/TrueSheetView.mm

@@ -382,7 +382,6 @@ using namespace facebook::react;
   [_controller.view addSubview:_containerView];
   [LayoutUtil pinView:_containerView toParentView:_controller.view edges:UIRectEdgeAll];
   [_controller.view bringSubviewToFront:_containerView];
-  _containerView.accessibilityViewIsModal = YES;
   _controller.accessibilityContentView = _containerView;
   [_controller setupAccessibilityContainer];
 

package/ios/TrueSheetViewController.mm

@@ -43,6 +43,7 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
 - (void)restoreWindowAccessibilityElements;
 - (void)setSheetAccessibilityElementsHidden:(BOOL)hidden;
 - (void)setAccessibilityContentElement:(UIView *)contentView;
+- (NSArray *)accessibilityGrabberElements;
 - (void)endInteractiveDismissState;
 - (void)emitInteractivePosition;
 - (void)animateInteractiveContainerToTransform:(CGAffineTransform)transform
@@ -52,6 +53,20 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
 
 @end
 
+// VoiceOver delivers the two-finger Z (escape) gesture by walking up the view
+// hierarchy from the focused element, so the sheet's root view handles it.
+@interface TrueSheetControllerView : UIView
+@property (nonatomic, weak) TrueSheetViewController *controller;
+@end
+
+@implementation TrueSheetControllerView
+
+- (BOOL)accessibilityPerformEscape {
+  return [self.controller accessibilityPerformEscape];
+}
+
+@end
+
 @implementation TrueSheetViewController {
   TrueSheetPositionState _lastEmittedPositionState;
   CGFloat _lastWidth;
@@ -214,6 +229,12 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
 
 #pragma mark - View Lifecycle
 
+- (void)loadView {
+  TrueSheetControllerView *view = [[TrueSheetControllerView alloc] init];
+  view.controller = self;
+  self.view = view;
+}
+
 - (void)viewDidLoad {
   [super viewDidLoad];
   self.view.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
@@ -321,6 +342,32 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
   }
 }
 
+- (NSArray *)accessibilityGrabberElements {
+  if (_grabberView && !_grabberView.hidden) {
+    return @[ _grabberView ];
+  }
+
+  // The system grabber is an accessibility element UIKit adds to the presented view
+  // (a sibling of our root view). Expose it so VoiceOver can resize or dismiss with it.
+  // UIKit also keeps a transparent bottom grabber there, so skip invisible views.
+  NSMutableArray *elements = [NSMutableArray array];
+  for (UIView *subview in self.presentationController.presentedView.subviews) {
+    if (subview != self.view && subview.isAccessibilityElement && !subview.hidden && subview.alpha > 0) {
+      [elements addObject:subview];
+    }
+  }
+  return elements;
+}
+
+- (BOOL)accessibilityPerformEscape {
+  if (!_isPresented || !self.dismissible) {
+    return NO;
+  }
+
+  [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
+  return YES;
+}
+
 - (void)setAccessibilityContentElement:(UIView *)contentView {
   BOOL hasAccessibilityFooterElements = [contentView isKindOfClass:[TrueSheetContainerView class]] &&
                                         [(TrueSheetContainerView *)contentView hasAccessibilityFooterElements];
@@ -333,12 +380,12 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
   // its accessibilityElements getter recomputes live, so a footer/content subtree
   // that remounts (e.g. swapping a footer button on a state change) stays
   // discoverable instead of leaving this snapshot pointing at destroyed views.
-  NSArray *accessibilityElements;
+  NSMutableArray *accessibilityElements = [[self accessibilityGrabberElements] mutableCopy];
   if (isAccessibilityModal) {
     NSArray *contentElements = contentView.accessibilityElements;
-    accessibilityElements = contentElements.count > 0 ? contentElements : @[ contentView ];
+    [accessibilityElements addObjectsFromArray:contentElements.count > 0 ? contentElements : @[ contentView ]];
   } else {
-    accessibilityElements = @[ contentView ];
+    [accessibilityElements addObject:contentView];
   }
 
   self.view.isAccessibilityElement = NO;
@@ -351,6 +398,15 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
     presentedView.accessibilityViewIsModal = isAccessibilityModal;
     presentedView.accessibilityElements = accessibilityElements;
 
+    // The system grabber is a sibling of our root view, so an escape performed while it
+    // is focused walks presentedView → window and never reaches TrueSheetControllerView.
+    if (@available(iOS 17.0, *)) {
+      __weak __typeof(self) weakSelf = self;
+      presentedView.accessibilityPerformEscapeBlock = ^BOOL {
+        return [weakSelf accessibilityPerformEscape];
+      };
+    }
+
     UIWindow *window = self.view.window;
     UIViewController *presentingViewController = [self accessibilityPresentingViewController];
     if (window && presentingViewController.view) {
@@ -1147,6 +1203,12 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
     _grabberView.onIncrement = nil;
     _grabberView.onDecrement = nil;
   }
+
+  // Only the topmost sheet may refresh, or a parent's prop update would steal the
+  // window accessibility override from the child presented over it.
+  if (_isPresented && self.isTopmostPresentedController) {
+    [self setupAccessibilityContainer];
+  }
 }
 
 - (void)handleGrabberTap {

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/package.json

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