react-native-a11y-order 0.9.1 → 0.11.0-rc1

package/ios/services/RNAOA11yAnnounceService/RNAOA11yAnnounceService.mm

@@ -13,99 +13,103 @@
 #import "RNAOA11yAnnounceHelper.h"
 
 @interface RNAOA11yAnnounceService ()
-
-//@property (nonatomic, copy) void (^debounceBlock)(void);
-
 @property (nonatomic, assign) BOOL isVoiceOverNulled;
 @property (nonatomic, assign) BOOL isAnnounceLocked;
-
 @property (nonatomic, strong) RNAODebouncer *announceDebouncer;
 @property (nonatomic, strong) RNAODebouncer *lockReleaseDebouncer;
-
 @property (nonatomic, strong) RNAOA11yAnnounceQueue *announceQueue;
-@property (strong, nonatomic) RNAOFocusChangeListener *voiceOverFocusListener;
-
+@property (nonatomic, strong) RNAOFocusChangeListener *voiceOverFocusListener;
+// One callback per announce:onFired: call (FIFO). Fired when the batch posts.
+// Dropped without calling on cancelAll — module resolves those promises as 'cancelled'.
+@property (nonatomic, strong) NSMutableArray<dispatch_block_t> *onFiredCallbacks;
 @property (nonatomic, assign, readonly) BOOL canAnnounce;
-
 @end
 
 @implementation RNAOA11yAnnounceService
 
 #pragma mark - Singleton
+
 + (instancetype)shared {
-  static RNAOA11yAnnounceService *sharedInstance = nil;
+  static RNAOA11yAnnounceService *instance = nil;
   static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    sharedInstance = [[RNAOA11yAnnounceService alloc] init];
-  });
-  return sharedInstance;
+  dispatch_once(&onceToken, ^{ instance = [self new]; });
+  return instance;
 }
 
 - (instancetype)init {
-  if (self) {
-    _isVoiceOverNulled = YES;
-    
-    self.isAnnounceLocked = NO;
-    self.announceDebouncer =  [[RNAODebouncer alloc] initWithInterval: 0.3];
-    self.lockReleaseDebouncer =  [[RNAODebouncer alloc] initWithInterval: 1];
-    self.announceQueue = [[RNAOA11yAnnounceQueue alloc] init];
-    
-    self.voiceOverFocusListener = [[RNAOFocusChangeListener alloc] initWithDelegate: self];
-    [self.voiceOverFocusListener startListening];
+  if (self = [super init]) {
+    _isVoiceOverNulled    = YES;
+    _announceDebouncer    = [[RNAODebouncer alloc] initWithInterval:0.3];
+    _lockReleaseDebouncer = [[RNAODebouncer alloc] initWithInterval:1.0];
+    _announceQueue        = [RNAOA11yAnnounceQueue new];
+    _onFiredCallbacks     = [NSMutableArray new];
+    _voiceOverFocusListener = [[RNAOFocusChangeListener alloc] initWithDelegate:self];
+    [_voiceOverFocusListener startListening];
   }
   return self;
 }
 
-- (void)dealloc {
-  [self.voiceOverFocusListener stopListening];
-}
+- (void)dealloc { [_voiceOverFocusListener stopListening]; }
 
 - (BOOL)canAnnounce {
   return !self.announceQueue.isEmpty && !self.isAnnounceLocked && !self.isVoiceOverNulled;
 }
 
+#pragma mark - Focus delegate
+
 - (void)voiceOverFocusChanged:(id)focusedElement {
   self.isVoiceOverNulled = (focusedElement == nil);
-  
-  [self delayedAnnounce];
+  [self _scheduleAnnounce];
 }
 
+#pragma mark - Lock
+
 - (void)temporarilyLockAnnounce {
-    self.isAnnounceLocked = YES;
-    [self.lockReleaseDebouncer debounceAction:^{
-        self.isAnnounceLocked = NO;
-        [self delayedAnnounce];
-    }];
+  [self temporarilyLockAnnounce:1.0];
 }
 
 - (void)temporarilyLockAnnounce:(NSTimeInterval)interval {
-    self.lockReleaseDebouncer.debounceInterval = interval;
-    [self temporarilyLockAnnounce];
+  self.isAnnounceLocked = YES;
+  // Interval must be set before debounceAction: — it is read at call time.
+  self.lockReleaseDebouncer.debounceInterval = interval;
+  __weak RNAOA11yAnnounceService *weakSelf = self;
+  [self.lockReleaseDebouncer debounceAction:^{
+    weakSelf.isAnnounceLocked = NO;
+    [weakSelf _scheduleAnnounce];
+  }];
 }
 
-
 #pragma mark - Announce
+
 - (void)announce:(NSString *)announcement {
-  [self.announceQueue add: announcement];
-  
-  [self delayedAnnounce];
+  [self announce:announcement onFired:nil];
 }
 
-- (void)delayedAnnounce {
-  if(!self.canAnnounce) return;
+- (void)announce:(NSString *)announcement onFired:(nullable dispatch_block_t)onFired {
+  [self.announceQueue add:announcement];
+  if (onFired) [self.onFiredCallbacks addObject:onFired];
+  [self _scheduleAnnounce];
+}
 
-  [self.announceDebouncer debounceAction:^{
-    [self announceAction];
-  }];
+- (void)cancelAll {
+  [self.announceQueue clear];
+  [self.onFiredCallbacks removeAllObjects];
 }
 
-- (void)announceAction {
-  if(self.canAnnounce) {
-    [RNAOA11yAnnounceHelper announceWithList: self.announceQueue.list];
-    [self.announceQueue clear];
-  } else {
-    [self delayedAnnounce];
-  }
+#pragma mark - Private
+
+- (void)_scheduleAnnounce {
+  if (!self.canAnnounce) return;
+  __weak RNAOA11yAnnounceService *weakSelf = self;
+  [self.announceDebouncer debounceAction:^{ [weakSelf _announceNow]; }];
+}
+
+- (void)_announceNow {
+  if (!self.canAnnounce) return;
+  [RNAOA11yAnnounceHelper announceWithList:self.announceQueue.list];
+  [self.announceQueue clear];
+  for (dispatch_block_t cb in self.onFiredCallbacks.copy) { cb(); }
+  [self.onFiredCallbacks removeAllObjects];
 }
 
 @end

package/ios/views/RNAOA11yCardView/RNAOA11yCardView.h

@@ -0,0 +1,29 @@
+//
+//  RNAOA11yCardView.h
+//  react-native-a11y-order
+//
+
+#ifndef RNAOA11yCardView_h
+#define RNAOA11yCardView_h
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <React/RCTViewComponentView.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNAOA11yCardView : RCTViewComponentView
+@end
+
+NS_ASSUME_NONNULL_END
+
+#else
+
+#import <React/RCTView.h>
+
+@interface RNAOA11yCardView : RCTView
+@end
+
+#endif
+
+#endif /* RNAOA11yCardView_h */

package/ios/views/RNAOA11yCardView/RNAOA11yCardView.mm

@@ -0,0 +1,83 @@
+//
+//  RNAOA11yCardView.mm
+//  react-native-a11y-order
+//
+
+#import "RNAOA11yCardView.h"
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <react/renderer/components/RNA11yOrderSpec/ComponentDescriptors.h>
+#import <react/renderer/components/RNA11yOrderSpec/RCTComponentViewHelpers.h>
+#import "RCTFabricComponentsPlugins.h"
+
+using namespace facebook::react;
+
+#endif
+
+@implementation RNAOA11yCardView {
+  UIFocusGuide *_contentFocusGuide;
+  NSString *_overlayFocusGroupIdentifier;
+  NSString *_contentFocusGroupIdentifier;
+}
+
+- (nullable NSArray *)accessibilityElements {
+  return self.subviews;
+}
+
+- (void)willRemoveSubview:(UIView *)subview {
+  [super willRemoveSubview:subview];
+  if (@available(iOS 15.0, *)) {
+    NSString *identifier = subview.focusGroupIdentifier;
+    if ([identifier isEqualToString:_overlayFocusGroupIdentifier] ||
+        [identifier isEqualToString:_contentFocusGroupIdentifier]) {
+      subview.focusGroupIdentifier = nil;
+    }
+  }
+}
+
+- (void)assignFocusGroupIdentifierToChild:(UIView *)child atIndex:(NSInteger)index {
+  if (@available(iOS 15.0, *)) {
+    if (!_overlayFocusGroupIdentifier) {
+      _overlayFocusGroupIdentifier =
+          [NSString stringWithFormat:@"RNAOA11yCard-%p-overlay", self];
+      _contentFocusGroupIdentifier =
+          [NSString stringWithFormat:@"RNAOA11yCard-%p-content", self];
+    }
+    if (index == 0) {
+      child.focusGroupIdentifier = _overlayFocusGroupIdentifier;
+    } else if (index == 1) {
+      child.focusGroupIdentifier = _contentFocusGroupIdentifier;
+    }
+  }
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView
+                          index:(NSInteger)index {
+  [super mountChildComponentView:childComponentView index:index];
+  [self assignFocusGroupIdentifierToChild:childComponentView atIndex:index];
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider {
+  return concreteComponentDescriptorProvider<A11yCardViewComponentDescriptor>();
+}
+
+Class<RCTComponentViewProtocol> A11yCardViewCls(void) {
+  return RNAOA11yCardView.class;
+}
+
+#else
+
+- (void)didAddSubview:(UIView *)subview {
+  [super didAddSubview:subview];
+  NSUInteger index = [self.subviews indexOfObject:subview];
+  if (index != NSNotFound) {
+    [self assignFocusGroupIdentifierToChild:subview atIndex:(NSInteger)index];
+  }
+}
+
+#endif
+
+@end

package/ios/views/RNAOA11yCardView/RNAOA11yCardViewManager.h

@@ -0,0 +1,14 @@
+//
+//  RNAOA11yCardViewManager.h
+//  react-native-a11y-order
+//
+
+#ifndef RNAOA11yCardViewManager_h
+#define RNAOA11yCardViewManager_h
+
+#import <React/RCTViewManager.h>
+
+@interface RNAOA11yCardViewManager : RCTViewManager
+@end
+
+#endif /* RNAOA11yCardViewManager_h */

package/ios/views/RNAOA11yCardView/RNAOA11yCardViewManager.mm

@@ -0,0 +1,17 @@
+//
+//  RNAOA11yCardViewManager.mm
+//  react-native-a11y-order
+//
+
+#import "RNAOA11yCardView.h"
+#import "RNAOA11yCardViewManager.h"
+
+@implementation RNAOA11yCardViewManager
+
+RCT_EXPORT_MODULE(A11yCardView)
+
+- (UIView *)view {
+  return [[RNAOA11yCardView alloc] init];
+}
+
+@end

package/ios/views/RNAOA11yIndexView/RNAOA11yIndexView.h

@@ -1,48 +1,9 @@
-//
-//  RNAOA11yIndexView.h
-//  A11yOrder
-//
-//  Created by Artur Kalach on 13/07/2024.
-//  Copyright © 2024 Facebook. All rights reserved.
-//
-
 #ifndef RNAOA11yIndexView_h
 #define RNAOA11yIndexView_h
 
-#import <UIKit/UIKit.h>
-#import <React/RCTUITextField.h>
-#import "RNAOScreenReaderFocusDelegate.h"
-#import "RNAOViewItemProtocol.h"
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#import <React/RCTViewComponentView.h>
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface RNAOA11yIndexView : RCTViewComponentView<RNAOScreenReaderFocusDelegate, RNAOViewItemProtocol>
-
-- (void)setPosition: (NSNumber*)position;
-- (void)setOrderKey:(NSString *)orderKey;
-- (void)setOrderFocusType:(NSNumber *)orderFocusType;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-
-#else /* RCT_NEW_ARCH_ENABLED */
+#import "RNAOA11yViewOrder.h"
 
-
-#import <React/RCTView.h>
-@interface RNAOA11yIndexView : RCTView<RNAOScreenReaderFocusDelegate, RNAOViewItemProtocol>
-
-- (void)setPosition: (NSNumber*)position;
-- (void)setOrderKey:(NSString *)orderKey;
-- (void)setOrderFocusType:(NSNumber *)orderFocusType;
-@property (nonatomic, copy) RCTDirectEventBlock onScreenReaderFocusChange;
+@interface RNAOA11yIndexView : RNAOA11yViewOrder
 @end
 
-
-#endif /* RCT_NEW_ARCH_ENABLED */
 #endif /* RNAOA11yIndexView_h */

package/ios/views/RNAOA11yIndexView/RNAOA11yIndexView.mm

@@ -1,20 +1,4 @@
-//
-//  RNAOA11yIndexView.m
-//  A11yOrder
-//
-//  Created by Artur Kalach on 13/07/2024.
-//  Copyright © 2024 Facebook. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
 #import "RNAOA11yIndexView.h"
-#import <UIKit/UIKit.h>
-#import <React/RCTViewManager.h>
-#import "RNAOA11yOrderLinking.h"
-#import "RNAOA11yItemDelegate.h"
-#import "UIView+RNAOA11yOrder.h"
-#import "RNAOFabricEventHelper.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
 
@@ -23,154 +7,66 @@
 #import <react/renderer/components/RNA11yOrderSpec/EventEmitters.h>
 #import <react/renderer/components/RNA11yOrderSpec/Props.h>
 #import <react/renderer/components/RNA11yOrderSpec/RCTComponentViewHelpers.h>
-
 #import "RCTFabricComponentsPlugins.h"
 
 using namespace facebook::react;
 
 @interface RNAOA11yIndexView () <RCTA11yIndexViewViewProtocol>
-
 @end
 
 #endif
 
-@implementation RNAOA11yIndexView {
-  RNAOA11yItemDelegate* _a11yItemDelegate;
-}
-
-- (void)didAddSubview:(UIView *)subview {
-  [super didAddSubview:subview];
-  [_a11yItemDelegate didAddSubview:subview];
-}
-
-#ifndef RCT_NEW_ARCH_ENABLED
-- (void)layoutSubviews {
-  [super layoutSubviews];
-  [_a11yItemDelegate finalizeUpdates];
-}
-#endif
-
-- (void)willRemoveSubview:(UIView *)subview {
-  [super willRemoveSubview:subview];
-  [_a11yItemDelegate willRemoveSubview: subview];
-}
-
-- (void)setPosition: (NSNumber*)position {
-  [_a11yItemDelegate setPosition: position];
-}
-
-- (void)setOrderKey:(NSString *)orderKey {
-  [_a11yItemDelegate setOrderKey:orderKey];
-  
-}
-- (void)setOrderFocusType:(NSNumber *)orderFocusType {
-  [_a11yItemDelegate setOrderFocusType: orderFocusType];
-}
+@implementation RNAOA11yIndexView
 
 #ifdef RCT_NEW_ARCH_ENABLED
-- (instancetype)initWithFrame:(CGRect)frame
-{
+
+- (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const A11yIndexViewProps>();
     _props = defaultProps;
-    _a11yItemDelegate = [[RNAOA11yItemDelegate alloc] initWithView: self];
-  }
-  
-  return self;
-}
-#else
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  if (self = [super initWithFrame:frame]) {
-    _a11yItemDelegate = [[RNAOA11yItemDelegate alloc] initWithView: self];
   }
-  
   return self;
 }
-#endif
 
-#ifdef RCT_NEW_ARCH_ENABLED
-+ (ComponentDescriptorProvider)componentDescriptorProvider
-{
++ (ComponentDescriptorProvider)componentDescriptorProvider {
   return concreteComponentDescriptorProvider<A11yIndexViewComponentDescriptor>();
 }
 
-
-- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
-{
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps {
   const auto &oldViewProps = *std::static_pointer_cast<A11yIndexViewProps const>(_props);
   const auto &newViewProps = *std::static_pointer_cast<A11yIndexViewProps const>(props);
-  [super updateProps
-   :props oldProps:oldProps];
-  
-  BOOL isIndexChanged = oldViewProps.orderIndex != newViewProps.orderIndex || _a11yItemDelegate.position == nil;
-  if(isIndexChanged) {
+  [super updateProps:props oldProps:oldProps];
+
+  if (oldViewProps.orderIndex != newViewProps.orderIndex || [self delegatePosition] == nil) {
     [self setPosition: @(newViewProps.orderIndex)];
   }
-  
-  BOOL isOrderChanged = oldViewProps.orderKey != newViewProps.orderKey || _a11yItemDelegate.orderKey == nil;
-  if(isOrderChanged) {
+
+  if (oldViewProps.orderKey != newViewProps.orderKey || [self delegateOrderKey] == nil) {
     [self setOrderKey: [NSString stringWithUTF8String:newViewProps.orderKey.c_str()]];
   }
-  
-  BOOL isOrderFocusTypeChanged = oldViewProps.orderFocusType != newViewProps.orderFocusType || _a11yItemDelegate.orderFocusType == nil;
-  if(isOrderFocusTypeChanged) {
+
+  if (oldViewProps.orderFocusType != newViewProps.orderFocusType || [self delegateOrderFocusType] == nil) {
     [self setOrderFocusType: @(newViewProps.orderFocusType)];
   }
-}
-
-- (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask {
-  [super finalizeUpdates:updateMask];
-  [_a11yItemDelegate finalizeUpdates];
-}
 
-- (void)focusView {
-  UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, self);
-}
-
-- (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args {
-  NSString *FOCUS = @"focus";
-  if([commandName isEqual:FOCUS]) {
-    [self focusView];
+  if (self.groupChildrenMode != newViewProps.shouldGroupAccessibilityChildren) {
+    self.groupChildrenMode = newViewProps.shouldGroupAccessibilityChildren;
+  }
+  
+  if (self.descendantFocusChangedEnabled != newViewProps.descendantFocusChangedEnabled) {
+    [self setDescendantFocusChangedEnabled: newViewProps.descendantFocusChangedEnabled];
+  }
+  
+  if (oldViewProps.containerType != newViewProps.containerType) {
+      NSInteger containerType = newViewProps.containerType;
+      self.accessibilityContainerType = (UIAccessibilityContainerType)containerType;
   }
 }
 
-- (void)prepareForRecycle
-{
-  [_a11yItemDelegate clear];
-  [super prepareForRecycle];
-}
-
-Class<RCTComponentViewProtocol> A11yIndexViewCls(void)
-{
+Class<RCTComponentViewProtocol> A11yIndexViewCls(void) {
   return RNAOA11yIndexView.class;
 }
 
 #endif
 
-
-#ifdef RCT_NEW_ARCH_ENABLED
-- (void)onScreenReaderFocusChangeHandler:(BOOL)isFocused {
-  [RNAOFabricEventHelper onIndexViewFocusChange:isFocused withEmitter:_eventEmitter];
-}
-#else
-- (void)onScreenReaderFocusChangeHandler:(BOOL)isFocused {
-  if (self.onScreenReaderFocusChange) {
-    self.onScreenReaderFocusChange(@{@"isFocused" : @(isFocused)});
-  }
-}
-#endif
-
-- (void)onFocusItemLinked: (UIView*)view {
-  [view setScreenReaderFocusDelegate: self];
-}
-
-- (void)onFocusItemRemoved: (UIView*)view {
-  [view clearScreenReaderFocusDelegate];
-}
-
-- (void)onScreenReaderFocusChanged:(BOOL)focused {
-  [self onScreenReaderFocusChangeHandler: focused];
-}
-
 @end

package/ios/views/RNAOA11yIndexView/RNAOA11yIndexViewManager.mm

@@ -49,6 +49,21 @@ RCT_EXPORT_METHOD(focus:(nonnull NSNumber *)reactTag)
     }];
 }
 
+RCT_CUSTOM_VIEW_PROPERTY(descendantFocusChangedEnabled, BOOL, RNAOA11yIndexView)
+{
+  BOOL value = json ? [RCTConvert BOOL:json] : NO;
+  [view setDescendantFocusChangedEnabled: value];
+}
+
+RCT_CUSTOM_VIEW_PROPERTY(containerType, NSInteger, UIView)
+{
+    NSInteger viewContainerType = json ? [RCTConvert NSInteger:json] : 0;
+    view.accessibilityContainerType = (UIAccessibilityContainerType)viewContainerType;
+}
+
+RCT_EXPORT_VIEW_PROPERTY(onScreenReaderFocused, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onScreenReaderFocusChange, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onScreenReaderDescendantFocusChanged, RCTDirectEventBlock)
+
 
 @end

package/ios/views/RNAOA11yPaneTitleView/RNAOA11yPaneTitleView.mm

@@ -12,6 +12,7 @@
 #import "RNAOA11yPaneTitleView.h"
 #import "UIViewController+RNAOA11yOrder.h"
 #import "RNAOA11yAnnounceService.h"
+#import "RNAOSpeechAttributes.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
 
@@ -99,10 +100,10 @@ Class<RCTComponentViewProtocol> A11yPaneTitleCls(void)
 
   if(self.window && !_announced) {
     _announced = YES;
-    [[RNAOA11yAnnounceService shared] announce: _title];
+    [self _announce:_title];
   }
   if(!self.window && _announced && _detachMessage) {
-    [[RNAOA11yAnnounceService shared] announce: _detachMessage];
+    [self _announce:_detachMessage];
   }
 
   if (self.window) {
@@ -113,5 +114,14 @@ Class<RCTComponentViewProtocol> A11yPaneTitleCls(void)
   }
 }
 
+- (void)_announce:(NSString *)message {
+  if (@available(iOS 17.0, *)) {
+    NSAttributedString *attrStr = [RNAOSpeechAttributes attributedStringFor:message
+                                                                     options:@{ @"priority": @"high", @"queue": @NO }];
+    UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, attrStr);
+  } else {
+    [[RNAOA11yAnnounceService shared] announce:message];
+  }
+}
 
 @end

package/ios/views/base/RNAOA11yGroupChildrenView.h

@@ -0,0 +1,21 @@
+#ifndef RNAOA11yGroupChildrenView_h
+#define RNAOA11yGroupChildrenView_h
+
+#import "RNAOA11yScreenReaderView.h"
+
+#ifdef RCT_NEW_ARCH_ENABLED
+NS_ASSUME_NONNULL_BEGIN
+#endif
+
+// groupChildrenMode: -1 = defer to super (default), 0 = NO, 1 = YES
+@interface RNAOA11yGroupChildrenView : RNAOA11yScreenReaderView
+
+@property (nonatomic) int groupChildrenMode;
+
+@end
+
+#ifdef RCT_NEW_ARCH_ENABLED
+NS_ASSUME_NONNULL_END
+#endif
+
+#endif /* RNAOA11yGroupChildrenView_h */

package/ios/views/base/RNAOA11yGroupChildrenView.mm

@@ -0,0 +1,19 @@
+#import "RNAOA11yGroupChildrenView.h"
+
+@implementation RNAOA11yGroupChildrenView
+
+- (instancetype)initWithFrame:(CGRect)frame {
+  if (self = [super initWithFrame:frame]) {
+    _groupChildrenMode = -1;
+  }
+  return self;
+}
+
+- (BOOL)shouldGroupAccessibilityChildren {
+  if (_groupChildrenMode == -1) {
+    return [super shouldGroupAccessibilityChildren];
+  }
+  return (BOOL)_groupChildrenMode;
+}
+
+@end

package/ios/views/base/RNAOA11yManagedFocusView.h

@@ -0,0 +1,28 @@
+#ifndef RNAOA11yManagedFocusView_h
+#define RNAOA11yManagedFocusView_h
+
+#import "RNAOA11yGroupChildrenView.h"
+#import "RNAOA11yFocusService.h"
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNAOA11yManagedFocusView : RNAOA11yGroupChildrenView<RNAOA11yFocusServiceSubscriber>
+@property BOOL descendantFocusChangedEnabled;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#else
+
+@interface RNAOA11yManagedFocusView : RNAOA11yGroupChildrenView<RNAOA11yFocusServiceSubscriber>
+@property BOOL descendantFocusChangedEnabled;
+@property (nonatomic, copy) RCTDirectEventBlock onScreenReaderDescendantFocusChanged;
+@property (nonatomic, copy) RCTDirectEventBlock onScreenReaderFocusChange;
+@property (nonatomic, copy) RCTDirectEventBlock onScreenReaderFocused;
+@end
+
+#endif
+
+#endif /* RNAOA11yManagedFocusView_h */