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

package/android/src/main/java/com/a11yorder/views/A11yIndexView/A11yIndexView.java

@@ -1,74 +1,11 @@
 package com.a11yorder.views.A11yIndexView;
 
 import android.content.Context;
-import android.view.View;
-import android.view.accessibility.AccessibilityEvent;
 
-import com.a11yorder.events.EventHelper;
-import com.a11yorder.services.order.A11yOrderService;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.views.view.ReactViewGroup;
-
-
-public class A11yIndexView extends ReactViewGroup {
-  private final Context context;
-  private final A11yOrderService orderService;
+import com.a11yorder.core.A11yViewOrder;
 
+public class A11yIndexView extends A11yViewOrder {
   public A11yIndexView(Context context) {
     super(context);
-    this.context = context;
-    this.orderService = new A11yOrderService(this);
-  }
-
-  public void setIndex(int index) {
-    this.orderService.setIndex(index);
-  }
-
-  public void setOrderFocusType(int focusType) {
-    this.orderService.setFocusType(focusType);
-  }
-
-  public void setOrderKey(String orderKey) {
-    this.orderService.setOrderKey(orderKey);
-  }
-
-  @Override
-  public void onViewAdded(View child) {
-    super.onViewAdded(child);
-    this.orderService.link(child);
-  }
-
-  @Override
-  public void onViewRemoved(View child) {
-    super.onViewRemoved(child);
-    this.orderService.clear(child);
-  }
-
-  @Override
-  protected void onAttachedToWindow() {
-    super.onAttachedToWindow();
-    this.orderService.attach();
-  }
-
-  @Override
-  protected void onDetachedFromWindow() {
-    super.onDetachedFromWindow();
-    this.orderService.detach();
-  }
-
-  @Override
-  public boolean onRequestSendAccessibilityEvent(View child, AccessibilityEvent event) {
-    int eventType = event.getEventType();
-    boolean isSubChild = (child == orderService.getStoredView());
-
-    if (eventType == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED && isSubChild) {
-      EventHelper.screenReaderFocusChanged((ReactContext) context, this.getId(), true);
-    }
-
-    if (eventType == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED && isSubChild) {
-      EventHelper.screenReaderFocusChanged((ReactContext) context, this.getId(), false);
-    }
-
-    return super.onRequestSendAccessibilityEvent(child, event);
   }
 }

package/android/src/main/java/com/a11yorder/views/A11yIndexView/A11yIndexViewManager.java

@@ -6,7 +6,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.a11yorder.events.EventHelper;
+import com.a11yorder.events.ScreenReaderDescendantFocusChangedEvent;
 import com.a11yorder.events.ScreenReaderFocusChangedEvent;
+import com.a11yorder.events.ScreenReaderFocusedEvent;
 import com.a11yorder.utils.A11yHelper;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.module.annotations.ReactModule;
@@ -53,6 +55,11 @@ public class A11yIndexViewManager extends com.a11yorder.A11yIndexViewManagerSpec
     viewGroup.setOrderFocusType(value);
   }
 
+  @Override
+  public void setShouldGroupAccessibilityChildren(A11yIndexView view, int value) {
+    //stub
+  }
+
   @Override
   public void focus(A11yIndexView view) {
     this.focus((ReactViewGroup) view);
@@ -72,11 +79,31 @@ public class A11yIndexViewManager extends com.a11yorder.A11yIndexViewManagerSpec
     }
   }
 
+
+  @Override
+  @ReactProp(name = "autoFocus")
+  public void setAutoFocus(A11yIndexView view, boolean value) {
+    view.setAutoFocus(value);
+  }
+
+  @Override
+  public void setDescendantFocusChangedEnabled(A11yIndexView view, boolean value) {
+    //stub
+  }
+
+  @Override
+  public void setContainerType(A11yIndexView view, int value) {
+    //stub
+  }
+
+  @javax.annotation.Nullable
   @Override
   public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
     Map<String, Object> export = new HashMap<>();
 
+    export.put(ScreenReaderFocusedEvent.EVENT_NAME, EventHelper.buildDirectEventMap("onScreenReaderFocused"));
     export.put(ScreenReaderFocusChangedEvent.EVENT_NAME, EventHelper.buildDirectEventMap("onScreenReaderFocusChange"));
+    export.put(ScreenReaderDescendantFocusChangedEvent.EVENT_NAME, EventHelper.buildDirectEventMap("onScreenReaderDescendantFocusChanged"));
 
     return export;
   }

package/android/src/newarch/A11yCardViewManagerSpec.java

@@ -0,0 +1,9 @@
+package com.a11yorder;
+
+import android.view.ViewGroup;
+
+import com.facebook.react.viewmanagers.A11yCardViewManagerInterface;
+import com.facebook.react.views.view.ReactViewManager;
+
+public abstract class A11yCardViewManagerSpec<T extends ViewGroup> extends ReactViewManager implements A11yCardViewManagerInterface<T> {
+}

package/android/src/oldarch/A11yCardViewManagerSpec.java

@@ -0,0 +1,8 @@
+package com.a11yorder;
+
+import android.view.ViewGroup;
+
+import com.facebook.react.views.view.ReactViewManager;
+
+public abstract class A11yCardViewManagerSpec<T extends ViewGroup> extends ReactViewManager {
+}

package/android/src/oldarch/A11yIndexViewManagerSpec.java

@@ -1,6 +1,7 @@
 package com.a11yorder;
 
 import com.a11yorder.views.A11yIndexView.A11yIndexView;
+import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.views.view.ReactViewManager;
 
 public abstract class A11yIndexViewManagerSpec<T extends A11yIndexView> extends ReactViewManager {
@@ -11,4 +12,12 @@ public abstract class A11yIndexViewManagerSpec<T extends A11yIndexView> extends
   public abstract void setOrderFocusType(T viewGroup, int value);
 
   public abstract void focus(T view);
+
+  public abstract void setAutoFocus(A11yIndexView view, boolean value);
+  public abstract void setDescendantFocusChangedEnabled(A11yIndexView view, boolean value);
+
+  public abstract void setContainerType(A11yIndexView view, int value);
+
+  public abstract void setShouldGroupAccessibilityChildren(A11yIndexView view, int value);
+
 }

package/ios/helpers/RNAOFabricEventHelper/RNAOFabricEventHelper.mm

@@ -32,8 +32,8 @@ using namespace facebook::react;
 
 + (void)onA11yViewFocusChange:(BOOL)isFocused withEmitter:(facebook::react::SharedViewEventEmitter) _eventEmitter {
   if (_eventEmitter) {
-    auto viewEventEmitter = std::static_pointer_cast<A11yViewEventEmitter const>(_eventEmitter);
-    facebook::react::A11yViewEventEmitter::OnScreenReaderFocusChange data = {
+    auto viewEventEmitter = std::static_pointer_cast<A11yIndexViewEventEmitter const>(_eventEmitter);
+    facebook::react::A11yIndexViewEventEmitter::OnScreenReaderFocusChange data = {
       .isFocused = isFocused,
     };
     viewEventEmitter->onScreenReaderFocusChange(data);
@@ -42,16 +42,16 @@ using namespace facebook::react;
 
 + (void)onA11yViewFocused:(facebook::react::SharedViewEventEmitter) _eventEmitter {
   if (_eventEmitter) {
-    auto viewEventEmitter = std::static_pointer_cast<A11yViewEventEmitter const>(_eventEmitter);
+    auto viewEventEmitter = std::static_pointer_cast<A11yIndexViewEventEmitter const>(_eventEmitter);
     viewEventEmitter->onScreenReaderFocused({});
   };
 }
 
 + (void)onA11yViewScreenReaderDescendantFocusChanged:(NSString*)status withId:(NSString*)nativeId withEmitter:(facebook::react::SharedViewEventEmitter) _eventEmitter {
   if (_eventEmitter) {
-    auto viewEventEmitter = std::static_pointer_cast<A11yViewEventEmitter const>(_eventEmitter);
+    auto viewEventEmitter = std::static_pointer_cast<A11yIndexViewEventEmitter const>(_eventEmitter);
     NSString* resultID = nativeId == nil ? @"" :nativeId;
-    facebook::react::A11yViewEventEmitter::OnScreenReaderDescendantFocusChanged data = {
+    facebook::react::A11yIndexViewEventEmitter::OnScreenReaderDescendantFocusChanged data = {
       .status = [status UTF8String],
       .nativeId = [resultID UTF8String],
     };

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,70 @@
 #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.autoFocus != newViewProps.autoFocus) {
+    [self setAutoFocus: newViewProps.autoFocus];
   }
-}
 
-- (void)prepareForRecycle
-{
-  [_a11yItemDelegate clear];
-  [super prepareForRecycle];
+  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;
+  }
 }
 
-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,27 @@ RCT_EXPORT_METHOD(focus:(nonnull NSNumber *)reactTag)
     }];
 }
 
+RCT_CUSTOM_VIEW_PROPERTY(autoFocus, BOOL, RNAOA11yIndexView)
+{
+  BOOL value = json ? [RCTConvert BOOL:json] : NO;
+  [view setAutoFocus: value];
+}
+
+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/base/RNAOA11yAutoFocusView.h

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