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

package/ios/services/RNAOA11yItemDelegate/RNAOA11yItemDelegate.h

@@ -12,13 +12,12 @@
 
 @interface RNAOA11yItemDelegate : NSObject
 
-- (instancetype _Nonnull)initWithView:
-(UIView<RNAOViewItemProtocol> *_Nonnull)delegate;
+- (instancetype _Nonnull)initWithView:(UIView<RNAOViewItemProtocol> *_Nonnull)delegate;
 
 @property (nonatomic, weak) UIView *linkView;
-@property (atomic, strong) NSNumber* position;
-@property NSString* orderKey;
-@property NSNumber* orderFocusType;
+@property (nonatomic, strong) NSNumber *position;
+@property (nonatomic, copy) NSString *orderKey;
+@property (nonatomic, strong) NSNumber *orderFocusType;
 
 - (void)willRemoveSubview:(UIView *)subview;
 - (void)didAddSubview:(UIView *)subview;
@@ -27,5 +26,4 @@
 
 @end
 
-
 #endif /* RNAOA11yItemDelegate_h */

package/ios/services/RNAOA11yItemDelegate/RNAOA11yItemDelegate.mm

@@ -8,146 +8,157 @@
 #import <Foundation/Foundation.h>
 #import "RNAOA11yItemDelegate.h"
 #import "RNAOA11yOrderLinking.h"
-#import "RNAOA11yItemProtocol.h"
 
 typedef NS_ENUM(NSInteger, A11yOrderType) {
-    A11yOrderTypeDefault = 0,
-    A11yOrderTypeChild = 1,
-    A11yOrderTypeLegacy = 2,
+  A11yOrderTypeDefault = 0,
+  A11yOrderTypeChild = 1,
+  A11yOrderTypeLegacy = 2,
 };
 
-
 @implementation RNAOA11yItemDelegate {
   __weak UIView<RNAOViewItemProtocol> *_delegate;
+  __weak UIView *_focusDelegateView;
   BOOL _isLinked;
 }
 
-- (instancetype _Nonnull)initWithView:
-(UIView<RNAOA11yItemProtocol, RNAOViewItemProtocol> *_Nonnull)delegate {
+- (instancetype _Nonnull)initWithView:(UIView<RNAOViewItemProtocol> *_Nonnull)delegate {
   self = [super init];
   if (self) {
     _delegate = delegate;
-    _isLinked = false;
+    _isLinked = NO;
   }
   return self;
 }
 
+#pragma mark - Prop setters
+
 - (void)setPosition:(NSNumber *)position {
-  NSNumber *_lastPostion = _position;
+  NSNumber *lastPosition = _position;
   _position = position;
-  
-  if(_lastPostion != nil && _lastPostion != position) {
-    [self relink: position lastPosition: _lastPostion];
+  if (lastPosition != nil && ![lastPosition isEqualToNumber:position]) {
+    [self relink:position lastPosition:lastPosition];
   }
 }
 
-- (void)setOrderFocusType:(NSNumber *)orderFocusType {
-  if(_orderFocusType != nil && _orderFocusType != orderFocusType) {
-    _orderFocusType = orderFocusType;
-    [self relink: _position lastPosition: _position];
+- (void)setOrderKey:(NSString *)orderKey {
+  if ([_orderKey isEqualToString:orderKey]) return;
+  NSString *prevKey = _orderKey;
+  _orderKey = orderKey;
+  if (_isLinked) {
+    // Atomic: remove from old group and register in new group in one call.
+    // _isLinked = YES guarantees _position and _linkView are non-nil.
+    [[RNAOA11yOrderLinking sharedInstance] updateOrderKey:prevKey next:orderKey position:_position withView:_linkView];
+    _isLinked = (orderKey != nil);
   } else {
-    _orderFocusType = orderFocusType;
-  }
-}
-
-- (void)finalizeUpdates {
-  if(!_delegate) return;
-  if(_delegate.subviews.count > 0) {
-      [self setLinkView: _delegate.subviews[0]];
+    // Not yet registered — try now (handles old arch prop-arrival ordering).
+    [self link];
   }
 }
 
-- (void)setLinkView: (UIView*) view {
-  if(_isLinked) return;
-  _linkView = view;
-  
-  [self link];
-  UIView* firstAccessible = [self findFirstAccessibleChild: _delegate];
-  if(firstAccessible) {
-    [_delegate onFocusItemLinked: firstAccessible];
-  }
+- (void)setOrderFocusType:(NSNumber *)orderFocusType {
+  if ([_orderFocusType isEqualToNumber:orderFocusType]) return;
+  _orderFocusType = orderFocusType;
+  if (!_isLinked || _delegate.subviews.count == 0) return;
+  UIView *newView = [self getFocusView:_delegate.subviews[0]];
+  if (newView == nil || newView == _linkView) return;
+  [self clear];
+  [self setLinkView:newView];
 }
 
+#pragma mark - Subview lifecycle
 
 - (void)didAddSubview:(UIView *)subview {
-  if(!_linkView) {
-    _isLinked = false;
-    UIView* view = [self getFocusView: subview];
-    [self setLinkView: view];
+  if (!_linkView) {
+    _isLinked = NO;
+    [self setLinkView:[self getFocusView:subview]];
   }
 }
 
 - (void)willRemoveSubview:(UIView *)subview {
-  if(_linkView == subview) {
+  if (_linkView == subview) {
     [self clear];
-    UIView* firstAccessible = [self findFirstAccessibleChild: _delegate];
-    if(firstAccessible) {
-      [_delegate onFocusItemRemoved: subview];
-    }
   }
 }
 
-- (void)relink:(NSNumber *)position lastPosition:(NSNumber*)lastPosition {
-  if(!_delegate) return;
-  
-  if(_orderKey != nil && position != nil && _isLinked) {
-    UIView* view = _linkView ? _linkView : [self getFocusView: _delegate.subviews[0]];
-    [[RNAOA11yOrderLinking sharedInstance] update: position lastPosition:lastPosition withOrderKey: _orderKey withView: view];
-  }
+- (void)finalizeUpdates {
+  if (!_delegate || _delegate.subviews.count == 0) return;
+  [self setLinkView:[self getFocusView:_delegate.subviews[0]]];
+}
+
+#pragma mark - Registration
+
+- (void)setLinkView:(UIView *)view {
+  if (_isLinked) return;
+  _linkView = view;
+  [self link];
 }
 
 - (void)link {
-  if(!_delegate) return;
-  
-  if(self.position && self.orderKey && self.linkView && !_isLinked) {
-    [[RNAOA11yOrderLinking sharedInstance] add: _position withOrderKey:_orderKey withObject:self.linkView];
-    
-    _isLinked = true;
+  if (!_delegate) return;
+  if (_position && _orderKey && _linkView && !_isLinked) {
+    [[RNAOA11yOrderLinking sharedInstance] add:_position withOrderKey:_orderKey withObject:_linkView];
+    _isLinked = YES;
+    [self registerFocusDelegate];
+  }
+}
+
+- (void)registerFocusDelegate {
+  UIView *firstAccessible = [self findFirstAccessibleChild:_delegate];
+  UIView *focusView = firstAccessible ?: _linkView;
+  if (focusView) {
+    _focusDelegateView = focusView;
+    [_delegate onFocusItemLinked:focusView];
   }
 }
 
+- (void)relink:(NSNumber *)position lastPosition:(NSNumber *)lastPosition {
+  if (!_delegate || !_isLinked || !_orderKey || !position) return;
+  UIView *view = _delegate.subviews.count > 0
+      ? [self getFocusView:_delegate.subviews[0]]
+      : _linkView;
+  if (!view) return;
+  [[RNAOA11yOrderLinking sharedInstance] update:position lastPosition:lastPosition withOrderKey:_orderKey withView:view];
+}
+
 - (void)clear {
-  if(!_delegate) return;
-  _isLinked = false;
-  if(_position != nil && _orderKey != nil) {
-      [[RNAOA11yOrderLinking sharedInstance] remove:_position withOrderKey:_orderKey];
+  if (!_delegate) return;
+  if (_focusDelegateView) {
+    [_delegate onFocusItemRemoved:_focusDelegateView];
+    _focusDelegateView = nil;
+  }
+  _isLinked = NO;
+  if (_position && _orderKey) {
+    [[RNAOA11yOrderLinking sharedInstance] remove:_position withOrderKey:_orderKey];
   }
 }
 
+#pragma mark - Focus view resolution
+
 - (UIView *)getFocusView:(UIView *)subview {
-  if(!_delegate) return nil;
-    switch ([_orderFocusType intValue]) {
-        case A11yOrderTypeDefault:
-            return _delegate;
-        case A11yOrderTypeLegacy:
-            return subview;
-        case A11yOrderTypeChild:
-            return [self findFirstAccessibleChild: _delegate];
-        default:
-            return _delegate;
-    }
+  if (!_delegate) return nil;
+  switch ([_orderFocusType intValue]) {
+    case A11yOrderTypeChild:
+      return [self findFirstAccessibleChild:_delegate];
+    case A11yOrderTypeLegacy:
+      return subview;
+    case A11yOrderTypeDefault:
+    default:
+      return _delegate;
+  }
 }
 
 - (UIView *)findFirstAccessibleChild:(UIView *)parentView {
-    if (!parentView) {
-        return nil;
-    }
-    
-    for (UIView *child in parentView.subviews) {
-        if ([self isAccessibleView:child]) {
-            return child;
-        }
-        
-        UIView *accessibleChild = [self findFirstAccessibleChild:child];
-        if (accessibleChild != nil) {
-            return accessibleChild;
-        }
-    }
-    
-    return nil;
+  if (!parentView) return nil;
+  for (UIView *child in parentView.subviews) {
+    if ([self isAccessibleView:child]) return child;
+    UIView *found = [self findFirstAccessibleChild:child];
+    if (found) return found;
+  }
+  return nil;
 }
 
 - (BOOL)isAccessibleView:(UIView *)view {
-    return view.isAccessibilityElement && view.hidden == NO && view.alpha > 0;
+  return view.isAccessibilityElement && !view.hidden && view.alpha > 0;
 }
+
 @end

package/ios/services/RNAOA11yOrderLinking/RNAOA11yOrderLinking.h

@@ -15,10 +15,12 @@
 
 - (void)add:(NSNumber*)position withOrderKey:(NSString*)orderKey withObject:(NSObject*)obj;
 - (void)remove:(NSNumber*)position withOrderKey:(NSString*)orderKey;
-- (void)setContainer:(NSString*)orderKey withView:(UIView*) view;
-- (void)setContainer:(NSString*)orderKey withView:(UIView*) view withDebounce:(BOOL)debounced;
+- (void)setContainer:(NSString*)orderKey withView:(UIView*)view;
+- (void)setContainer:(NSString*)orderKey withView:(UIView*)view withDebounce:(BOOL)debounced;
+- (void)update:(NSNumber*)position lastPosition:(NSNumber*)lastPosition withOrderKey:(NSString*)orderKey withView:(UIView*)view;
+- (void)updateOrderKey:(NSString*)prev next:(NSString*)next position:(NSNumber*)position withView:(UIView*)view;
 - (void)removeContainer:(NSString*)orderKey;
-- (void)update:(NSNumber*)position lastPosition:(NSNumber*)_position withOrderKey:(NSString*)_orderKey withView:(UIView*) view;
+
 @end
 
 #endif /* RNAOA11yOrderLinking_h */

package/ios/services/RNAOA11yOrderLinking/RNAOA11yOrderLinking.mm

@@ -11,80 +11,80 @@
 #import "RNAOA11yRelationship.h"
 
 @implementation RNAOA11yOrderLinking {
-    NSMutableDictionary *_relationships;
+  NSMutableDictionary<NSString *, RNAOA11yRelationship *> *_relationships;
 }
 
 + (instancetype)sharedInstance {
-    static RNAOA11yOrderLinking *sharedInstance = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        sharedInstance = [[self alloc] init];
-    });
-    return sharedInstance;
+  static RNAOA11yOrderLinking *sharedInstance = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    sharedInstance = [[self alloc] init];
+  });
+  return sharedInstance;
 }
 
 - (id)init {
   if (self = [super init]) {
-      _relationships = [NSMutableDictionary dictionary];
+    _relationships = [NSMutableDictionary dictionary];
   }
-
   return self;
 }
 
-- (void)add:(NSNumber*)position withOrderKey:(NSString*)orderKey withObject:(NSObject*)obj {
-    RNAOA11yRelationship* relationship = [_relationships objectForKey: orderKey];
-    if(relationship == nil) {
-        relationship = [[RNAOA11yRelationship alloc] init];
-        [_relationships setObject: relationship forKey:orderKey];
-    }
-    [relationship add:position withObject:obj];
+- (RNAOA11yRelationship *)relationshipForKey:(NSString *)orderKey {
+  RNAOA11yRelationship *relationship = _relationships[orderKey];
+  if (relationship == nil) {
+    relationship = [[RNAOA11yRelationship alloc] init];
+    _relationships[orderKey] = relationship;
+  }
+  return relationship;
 }
 
--(void)remove:(NSNumber*)position withOrderKey:(NSString*)orderKey {
-    RNAOA11yRelationship* relationship = [_relationships objectForKey: orderKey];
-    if(relationship != nil) {
-        [relationship remove:position];
-    }
+- (void)add:(NSNumber *)position withOrderKey:(NSString *)orderKey withObject:(NSObject *)obj {
+  [[self relationshipForKey:orderKey] add:position withObject:obj];
 }
 
--(void)setContainer:(NSString*)orderKey withView:(UIView*)view withDebounce:(BOOL)debounced {
-    RNAOA11yRelationship* relationship = [_relationships objectForKey: orderKey];
-    if(relationship == nil) {
-        relationship = [[RNAOA11yRelationship alloc] init];
-        [_relationships setObject: relationship forKey:orderKey];
-    }
-
-    [relationship setContainer:view withDebounce: debounced];
+- (void)remove:(NSNumber *)position withOrderKey:(NSString *)orderKey {
+  RNAOA11yRelationship *relationship = _relationships[orderKey];
+  if (relationship == nil) return;
+  [relationship remove:position];
+  if ([relationship isEmpty]) {
+    [_relationships removeObjectForKey:orderKey];
+  }
 }
 
-- (void)setContainer:(NSString*)orderKey withView:(UIView*)view {
-  [self setContainer: orderKey withView:view withDebounce: NO];
+- (void)setContainer:(NSString *)orderKey withView:(UIView *)view withDebounce:(BOOL)debounced {
+  [[self relationshipForKey:orderKey] setContainer:view withDebounce:debounced];
 }
 
-- (void)update:(NSNumber*)position lastPosition:(NSNumber*)lastPosition withOrderKey:(NSString*)orderKey withView:(UIView*) view {
-    RNAOA11yRelationship* relationship = [_relationships objectForKey: orderKey];
-    if(relationship != nil) {
-        [relationship update:lastPosition withPosition:position withObject:view];
-    }
+- (void)setContainer:(NSString *)orderKey withView:(UIView *)view {
+  [self setContainer:orderKey withView:view withDebounce:NO];
 }
 
-- (void)removeContainer:(NSString*)orderKey {
-    RNAOA11yRelationship* relationship = [_relationships objectForKey: orderKey];
-    if(relationship != nil) {
-        [_relationships removeObjectForKey:orderKey];
-        [relationship clear];
-    }
-    [self setAccessibilityElements: nil];
+- (void)update:(NSNumber *)position lastPosition:(NSNumber *)lastPosition withOrderKey:(NSString *)orderKey withView:(UIView *)view {
+  [_relationships[orderKey] update:lastPosition withPosition:position withObject:view];
 }
 
--(UIView*)getContainer:(NSString*)orderKey withView:(UIView*) view {
-    RNAOA11yRelationship* relationship = [_relationships objectForKey: orderKey];
-    if(relationship != nil) {
-        return [relationship getContainer];
+- (void)updateOrderKey:(NSString *)prev next:(NSString *)next position:(NSNumber *)position withView:(UIView *)view {
+  if (prev != nil) {
+    RNAOA11yRelationship *old = _relationships[prev];
+    [old remove:position];
+    if ([old isEmpty]) {
+      [_relationships removeObjectForKey:prev];
     }
-
-    return nil;
+  }
+  if (next != nil) {
+    [[self relationshipForKey:next] add:position withObject:view];
+  }
 }
 
+- (void)removeContainer:(NSString *)orderKey {
+  RNAOA11yRelationship *relationship = _relationships[orderKey];
+  if (relationship != nil) {
+    UIView *container = [relationship getContainer];
+    [_relationships removeObjectForKey:orderKey];
+    [relationship clear];
+    [container setAccessibilityElements:nil];
+  }
+}
 
 @end

package/ios/services/RNAOA11yRelationship/RNAOA11yRelationship.h

@@ -20,6 +20,7 @@
 - (void)setContainer:(UIView*)view;
 - (void)setContainer:(UIView*)view withDebounce:(BOOL)debounced;
 - (UIView*)getContainer;
+- (BOOL)isEmpty;
 
 @property (nonatomic, strong) RNAODebouncer *debouncer;
 

package/ios/services/RNAOA11yRelationship/RNAOA11yRelationship.mm

@@ -12,63 +12,69 @@
 #import "RNAODebouncer.h"
 
 @implementation RNAOA11yRelationship {
-    __weak UIView *_container;
-    RNAOSortedMap *_positions;
-    BOOL _debounced;
+  __weak UIView *_container;
+  RNAOSortedMap *_positions;
 }
 
 - (instancetype)init {
-    self = [super init];
-    if (self) {
-        _positions = [[RNAOSortedMap alloc] init];
-        _container = nil;
-        _debounced = false;
-        self.debouncer = [[RNAODebouncer alloc] initWithInterval: 0.01];
-    }
-    return self;
+  self = [super init];
+  if (self) {
+    _positions = [[RNAOSortedMap alloc] init];
+  }
+  return self;
 }
 
-- (void)add:(NSNumber*)position withObject:(NSObject*)obj {
-    [_positions put:position withObject:obj];
-    if(_debounced) {
-      [self.debouncer debounceAction:^{
-        [self updateAccessibilityElements];
-      }];
-    }
+- (void)updateAccessibilityElements {
+  if (_container != nil) {
+    [_container setAccessibilityElements:[_positions getValues]];
+  }
 }
 
-- (void)updateAccessibilityElements {
-  if(_container != nil) {
-    [_container setAccessibilityElements: [_positions getValues]];
+- (void)scheduleAccessibilityUpdate {
+  if (self.debouncer) {
+    [self.debouncer debounceAction:^{ [self updateAccessibilityElements]; }];
+  } else {
+    [self updateAccessibilityElements];
   }
 }
 
--(void)remove:(NSNumber*)position {
-    [_positions remove:position];
+- (void)add:(NSNumber *)position withObject:(NSObject *)obj {
+  [_positions put:position withObject:obj];
+  [self scheduleAccessibilityUpdate];
 }
 
--(void)setContainer:(UIView*)view {
-    _container = view;
-    [self updateAccessibilityElements];
+- (void)remove:(NSNumber *)position {
+  [_positions remove:position];
+  [self scheduleAccessibilityUpdate];
 }
 
-- (void)setContainer:(UIView*)view withDebounce:(BOOL)debounced {
-  [self setContainer: view];
-  _debounced = debounced;
+- (void)update:(NSNumber *)lastPosition withPosition:(NSNumber *)position withObject:(NSObject *)obj {
+  [_positions update:lastPosition withPosition:position withObject:obj];
+  [self scheduleAccessibilityUpdate];
 }
 
-- (void)update:(NSNumber*)lastPosition withPosition:(NSNumber*)position withObject:(NSObject*)obj {
-    [_positions update:lastPosition withPosition:position withObject:obj];
-    [self updateAccessibilityElements];
+- (void)setContainer:(UIView *)view {
+  _container = view;
+  [self updateAccessibilityElements];
 }
 
--(void)clear {
-    [_positions clear];
+- (void)setContainer:(UIView *)view withDebounce:(BOOL)debounced {
+  if (debounced && !self.debouncer) {
+    self.debouncer = [[RNAODebouncer alloc] initWithInterval:0.01];
+  }
+  [self setContainer:view];
 }
 
--(UIView*)getContainer {
-    return _container;
+- (void)clear {
+  [_positions clear];
 }
 
+- (UIView *)getContainer {
+  return _container;
+}
+
+- (BOOL)isEmpty {
+  return [_positions isEmpty];
+}
 
 @end

package/ios/services/RNAOSortedMap/RNAOSortedMap.h

@@ -13,9 +13,10 @@
 
 - (void)put:(NSNumber*)position withObject:(NSObject*)obj;
 - (void)remove:(NSNumber*)position;
-- (void)update:(NSNumber*)position withPosition:(NSNumber*)position withObject:(NSObject*)obj;
+- (void)update:(NSNumber*)lastPosition withPosition:(NSNumber*)position withObject:(NSObject*)obj;
 - (void)clear;
 - (NSArray*)getValues;
+- (BOOL)isEmpty;
 
 @end