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

package/ios/TrueSheetViewController.mm

@@ -308,14 +308,25 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
 }
 
 - (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;
 
+  // At a hard modal boundary XCTest skips nested elements, so flatten the
+  // container's children into the array. Otherwise expose the container itself:
+  // 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;
+  if (isAccessibilityModal) {
+    NSArray *contentElements = contentView.accessibilityElements;
+    accessibilityElements = contentElements.count > 0 ? contentElements : @[ contentView ];
+  } else {
+    accessibilityElements = @[ contentView ];
+  }
+
   self.view.isAccessibilityElement = NO;
   self.view.accessibilityViewIsModal = YES;
   self.view.accessibilityElements = accessibilityElements;
@@ -349,6 +360,37 @@ static char TrueSheetAccessibilityWindowPreviousElementsKey;
   [self restoreWindowAccessibilityElements];
 }
 
+#pragma mark - Presentation
+
+- (void)presentViewController:(UIViewController *)viewControllerToPresent
+                     animated:(BOOL)flag
+                   completion:(void (^)(void))completion {
+  // A non-sheet controller (e.g. an action sheet, alert, or image picker) is about
+  // to present over us. Clear our window accessibility override so UIKit's default
+  // traversal surfaces it for XCTest and assistive technologies; we reclaim the
+  // override when it dismisses. Nested sheets claim their own override.
+  if (![viewControllerToPresent isKindOfClass:[TrueSheetViewController class]]) {
+    self.view.window.accessibilityElements = nil;
+  }
+
+  [super presentViewController:viewControllerToPresent animated:flag completion:completion];
+}
+
+- (void)dismissViewControllerAnimated:(BOOL)flag completion:(void (^)(void))completion {
+  [super dismissViewControllerAnimated:flag
+                            completion:^{
+                              if (completion) {
+                                completion();
+                              }
+
+                              // Reclaim the window accessibility override once nothing
+                              // else is presented over us.
+                              if (self.isPresented && self.presentedViewController == nil) {
+                                [self setupAccessibilityContainer];
+                              }
+                            }];
+}
+
 - (void)emitWillDismissEvents {
   if (self.isBeingDismissed && !_isWillDismissEmitted) {
     _isWillDismissEmitted = YES;

package/package.json

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