@lodev09/react-native-true-sheet 3.11.0-beta.13 → 3.11.0-beta.14

package/ios/TrueSheetContainerView.h

@@ -31,6 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
 @optional
 
 - (void)containerViewHeaderDidChangeSize:(CGSize)newSize;
+- (void)containerViewFooterDidChangeSize:(CGSize)newSize;
 
 @end
 
@@ -71,6 +72,8 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)layoutFooter;
 
+- (BOOL)hasAccessibilityFooterElements;
+
 /**
  * Setup scrollable content
  */

package/ios/TrueSheetContainerView.mm

@@ -88,11 +88,22 @@ using namespace facebook::react;
     [elements addObject:_contentView];
   }
   if (_footerView) {
-    [elements addObject:_footerView];
+    // Footer hosts are layout containers; expose their children when present so
+    // VoiceOver and XCTest can target the actual footer controls.
+    NSArray *footerElements = _footerView.accessibilityElements;
+    if (footerElements.count > 0) {
+      [elements addObjectsFromArray:footerElements];
+    } else {
+      [elements addObject:_footerView];
+    }
   }
   return elements;
 }
 
+- (BOOL)hasAccessibilityFooterElements {
+  return _footerView && _footerView.accessibilityElements.count > 0;
+}
+
 #pragma mark - Layout
 
 - (void)layoutSubviews {
@@ -251,6 +262,7 @@ using namespace facebook::react;
 #pragma mark - TrueSheetFooterViewDelegate
 
 - (void)footerViewDidChangeSize:(CGSize)newSize {
+  [self.delegate containerViewFooterDidChangeSize:newSize];
   if (@available(iOS 26.0, *)) {
     [self setupEdgeInteractions];
   }

package/ios/TrueSheetFooterView.mm

@@ -53,13 +53,19 @@ using namespace facebook::react;
 - (NSArray *)accessibilityElements {
   NSMutableArray *elements = [NSMutableArray array];
   [self collectAccessibilityElementsFromView:self into:elements];
-  return elements;
+  if (elements.count > 0) {
+    return elements;
+  }
+
+  return [super accessibilityElements];
 }
 
 - (void)collectAccessibilityElementsFromView:(UIView *)view into:(NSMutableArray *)elements {
   for (UIView *subview in view.subviews) {
     if (subview.isAccessibilityElement || subview.accessibilityLabel || subview.accessibilityIdentifier) {
       [elements addObject:subview];
+    } else if (subview.accessibilityElements.count > 0) {
+      [elements addObjectsFromArray:subview.accessibilityElements];
     } else {
       [self collectAccessibilityElementsFromView:subview into:elements];
     }

package/ios/TrueSheetView.mm

@@ -573,6 +573,10 @@ using namespace facebook::react;
   [self setupSheetDetentsForSizeChange];
 }
 
+- (void)containerViewFooterDidChangeSize:(CGSize)newSize {
+  [_controller setupAccessibilityContainer];
+}
+
 // When the ScrollView changes (e.g. conditional remount), re-pin the new ScrollView.
 - (void)containerViewScrollViewDidChange {
   [self setupScrollable];

package/ios/TrueSheetViewController.mm

@@ -7,6 +7,7 @@
 //
 
 #import "TrueSheetViewController.h"
+#import "TrueSheetContainerView.h"
 #import "TrueSheetContentView.h"
 #import "core/TrueSheetBlurView.h"
 #import "core/TrueSheetDetentCalculator.h"
@@ -18,6 +19,7 @@
 
 #import <React/RCTLog.h>
 #import <React/RCTScrollViewComponentView.h>
+#import <objc/runtime.h>
 #import <react/renderer/components/TrueSheetSpec/Props.h>
 
 using namespace facebook::react;
@@ -32,8 +34,14 @@ static BOOL TrueSheetPositionStateEquals(TrueSheetPositionState a, TrueSheetPosi
   return fabs(a.position - b.position) <= 0.01 && fabs(a.detent - b.detent) <= 0.01 && fabs(a.index - b.index) <= 0.01;
 }
 
+static char TrueSheetAccessibilityWindowOwnerKey;
+static char TrueSheetAccessibilityWindowPreviousElementsKey;
+
 @interface TrueSheetViewController ()
 
+- (UIViewController *)accessibilityPresentingViewController;
+- (void)restoreWindowAccessibilityElements;
+- (void)setSheetAccessibilityElementsHidden:(BOOL)hidden;
 - (void)setAccessibilityContentElement:(UIView *)contentView;
 
 @end
@@ -57,6 +65,8 @@ static BOOL TrueSheetPositionStateEquals(TrueSheetPositionState a, TrueSheetPosi
 
   UIView *_anchorView;
 
+  __weak UIWindow *_accessibilityWindow;
+
   TrueSheetBlurView *_blurView;
   TrueSheetGrabberView *_grabberView;
   TrueSheetDetentCalculator *_detentCalculator;
@@ -97,6 +107,7 @@ static BOOL TrueSheetPositionStateEquals(TrueSheetPositionState a, TrueSheetPosi
 }
 
 - (void)dealloc {
+  [self restoreWindowAccessibilityElements];
   [_transitioningTimer invalidate];
   _transitioningTimer = nil;
   [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -227,6 +238,7 @@ static BOOL TrueSheetPositionStateEquals(TrueSheetPositionState a, TrueSheetPosi
 
 - (void)viewDidAppear:(BOOL)animated {
   [super viewDidAppear:animated];
+  [self setSheetAccessibilityElementsHidden:NO];
 
   if (!_isPresented) {
     [_parentSheetController.delegate viewControllerDidBlur];
@@ -244,9 +256,10 @@ static BOOL TrueSheetPositionStateEquals(TrueSheetPositionState a, TrueSheetPosi
     });
 
     [self setupGestureRecognizer];
-    [self setupAccessibilityContainer];
     _isPresented = YES;
   }
+
+  [self setupAccessibilityContainer];
 }
 
 - (void)setupAccessibilityContainer {
@@ -258,17 +271,82 @@ static BOOL TrueSheetPositionStateEquals(TrueSheetPositionState a, TrueSheetPosi
   [self setAccessibilityContentElement:contentView];
 }
 
+- (UIViewController *)accessibilityPresentingViewController {
+  UIViewController *presentingViewController = self.presentingViewController;
+  while ([presentingViewController isKindOfClass:[TrueSheetViewController class]] &&
+         presentingViewController.presentingViewController) {
+    presentingViewController = presentingViewController.presentingViewController;
+  }
+  return presentingViewController;
+}
+
+- (void)restoreWindowAccessibilityElements {
+  UIWindow *window = _accessibilityWindow;
+  if (window) {
+    // The active sheet may temporarily own window accessibility traversal. Only
+    // restore the previous value when this controller still owns that override.
+    NSValue *ownerValue = objc_getAssociatedObject(window, &TrueSheetAccessibilityWindowOwnerKey);
+    if (ownerValue && ownerValue.nonretainedObjectValue == self) {
+      id previousElements = objc_getAssociatedObject(window, &TrueSheetAccessibilityWindowPreviousElementsKey);
+      window.accessibilityElements = previousElements == [NSNull null] ? nil : previousElements;
+      objc_setAssociatedObject(window, &TrueSheetAccessibilityWindowOwnerKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+      objc_setAssociatedObject(
+        window, &TrueSheetAccessibilityWindowPreviousElementsKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    }
+
+    _accessibilityWindow = nil;
+  }
+}
+
+- (void)setSheetAccessibilityElementsHidden:(BOOL)hidden {
+  self.view.accessibilityElementsHidden = hidden;
+
+  UIView *presentedView = self.presentationController.presentedView;
+  if (presentedView) {
+    presentedView.accessibilityElementsHidden = hidden;
+  }
+}
+
 - (void)setAccessibilityContentElement:(UIView *)contentView {
+  NSArray *contentElements = contentView.accessibilityElements;
+  NSArray *accessibilityElements = contentElements.count > 0 ? contentElements : @[ contentView ];
+  BOOL hasAccessibilityFooterElements = [contentView isKindOfClass:[TrueSheetContainerView class]] &&
+                                        [(TrueSheetContainerView *)contentView hasAccessibilityFooterElements];
+  // Footer controls exposed as separate accessibility elements can be skipped
+  // by XCTest when the presented sheet is a hard modal accessibility boundary.
+  BOOL isAccessibilityModal = _dimmed && !hasAccessibilityFooterElements;
+
   self.view.isAccessibilityElement = NO;
   self.view.accessibilityViewIsModal = YES;
-  self.view.accessibilityElements = @[ contentView ];
+  self.view.accessibilityElements = accessibilityElements;
 
   UIView *presentedView = self.presentationController.presentedView;
   if (presentedView) {
     presentedView.isAccessibilityElement = NO;
-    presentedView.accessibilityViewIsModal = YES;
-    presentedView.accessibilityElements = @[ contentView ];
+    presentedView.accessibilityViewIsModal = isAccessibilityModal;
+    presentedView.accessibilityElements = accessibilityElements;
+
+    UIWindow *window = self.view.window;
+    UIViewController *presentingViewController = [self accessibilityPresentingViewController];
+    if (window && presentingViewController.view) {
+      if (!_accessibilityWindow) {
+        _accessibilityWindow = window;
+        id previousElements = objc_getAssociatedObject(window, &TrueSheetAccessibilityWindowPreviousElementsKey);
+        if (!previousElements) {
+          previousElements = window.accessibilityElements ?: [NSNull null];
+          objc_setAssociatedObject(window, &TrueSheetAccessibilityWindowPreviousElementsKey, previousElements,
+            OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+        }
+      }
+      objc_setAssociatedObject(window, &TrueSheetAccessibilityWindowOwnerKey, [NSValue valueWithNonretainedObject:self],
+        OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+      window.accessibilityElements =
+        isAccessibilityModal ? @[ presentedView ] : @[ presentingViewController.view, presentedView ];
+      return;
+    }
   }
+
+  [self restoreWindowAccessibilityElements];
 }
 
 - (void)emitWillDismissEvents {
@@ -283,6 +361,7 @@ static BOOL TrueSheetPositionStateEquals(TrueSheetPositionState a, TrueSheetPosi
 
 - (void)emitDidDismissEvents {
   if (self.isBeingDismissed) {
+    [self restoreWindowAccessibilityElements];
     _isPresented = NO;
     _isWillDismissEmitted = NO;
 
@@ -290,6 +369,7 @@ static BOOL TrueSheetPositionStateEquals(TrueSheetPositionState a, TrueSheetPosi
     _anchorView = nil;
 
     [_parentSheetController.delegate viewControllerDidFocus];
+    [_parentSheetController setSheetAccessibilityElementsHidden:NO];
     [_parentSheetController setupAccessibilityContainer];
     _parentSheetController = nil;
 
@@ -300,6 +380,8 @@ static BOOL TrueSheetPositionStateEquals(TrueSheetPositionState a, TrueSheetPosi
 
 - (void)viewWillDisappear:(BOOL)animated {
   [super viewWillDisappear:animated];
+  [self restoreWindowAccessibilityElements];
+  [self setSheetAccessibilityElementsHidden:YES];
 
   // Dispatch to allow pan gesture to set _isDragging before checking
   // handleTransitionTracker will emit when sheet is transitioning to dismiss

package/package.json

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