Move logic for setting testId, label on tab item

Author: kmichalikk

ios/bottom-tabs/host/RNSTabBarController.mm

@@ -97,6 +97,7 @@ - (void)reactMountingTransactionDidMount
   [self updateReactChildrenControllersIfNeeded];
   [self updateSelectedViewControllerIfNeeded];
   [self updateTabBarAppearanceIfNeeded];
+  [self updateTabBarA11yIfNeeded];
   [self updateOrientationIfNeeded];
 }
 
@@ -184,6 +185,20 @@ - (void)updateTabBarAppearance
                                              imageLoader:[self.tabsHostComponentView reactImageLoader]];
 }
 
+- (void)updateTabBarA11yIfNeeded
+{
+  for (RNSTabsScreenViewController *tabViewController in self.viewControllers) {
+    auto screenView = static_cast<RNSBottomTabsScreenComponentView *>(tabViewController.tabScreenComponentView);
+    if (!screenView.tabBarItemNeedsA11yUpdate) {
+      continue;
+    }
+
+    screenView.tabBarItemNeedsA11yUpdate = NO;
+    tabViewController.tabBarItem.accessibilityIdentifier = screenView.tabItemTestID;
+    tabViewController.tabBarItem.accessibilityLabel = screenView.tabItemAccessibilityLabel;
+  }
+}
+
 #if !defined(NDEBUG)
 - (void)assertExactlyOneFocusedTab
 {

ios/bottom-tabs/screen/RNSBottomTabsScreenComponentView.h

@@ -87,6 +87,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, readonly) BOOL overrideScrollViewContentInsetAdjustmentBehavior;
 
+@property (nonatomic, nullable) NSString *tabItemTestID;
+@property (nonatomic, nullable) NSString *tabItemAccessibilityLabel;
+@property (nonatomic) BOOL tabBarItemNeedsA11yUpdate;
+
 @property (nonatomic) RNSScrollEdgeEffect bottomScrollEdgeEffect;
 @property (nonatomic) RNSScrollEdgeEffect leftScrollEdgeEffect;
 @property (nonatomic) RNSScrollEdgeEffect rightScrollEdgeEffect;

ios/bottom-tabs/screen/RNSBottomTabsScreenComponentView.mm

@@ -260,7 +260,6 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
   bool tabBarItemNeedsRecreation{false};
   bool tabBarItemNeedsUpdate{false};
   bool scrollEdgeEffectsNeedUpdate{false};
-  bool tabBarItemNeedsA11yUpdate{false};
 
   if (newComponentProps.title != oldComponentProps.title ||
       newComponentProps.isTitleUndefined != oldComponentProps.isTitleUndefined) {
@@ -297,14 +296,13 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
   }
 
   if (newComponentProps.tabBarItemTestID != oldComponentProps.tabBarItemTestID) {
-    _controller.tabItemTestID = RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemTestID);
-    tabBarItemNeedsA11yUpdate = YES;
+    _tabItemTestID = RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemTestID);
+    _tabBarItemNeedsA11yUpdate = YES;
   }
 
   if (newComponentProps.tabBarItemAccessibilityLabel != oldComponentProps.tabBarItemAccessibilityLabel) {
-    _controller.tabItemAccessibilityLabel =
-        RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemAccessibilityLabel);
-    tabBarItemNeedsA11yUpdate = YES;
+    _tabItemAccessibilityLabel = RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemAccessibilityLabel);
+    _tabBarItemNeedsA11yUpdate = YES;
   }
 
   if (newComponentProps.standardAppearance != oldComponentProps.standardAppearance) {
@@ -426,6 +424,7 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
   if (tabBarItemNeedsRecreation) {
     [self createTabBarItem];
     tabBarItemNeedsUpdate = YES;
+    _tabBarItemNeedsA11yUpdate = YES;
   }
 
   if (tabBarItemNeedsUpdate) {
@@ -435,10 +434,6 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
     tabItemNeedsAppearanceUpdate = YES;
   }
 
-  if (tabBarItemNeedsA11yUpdate) {
-    [_controller updateTabItemA11yProps];
-  }
-
   if (tabItemNeedsAppearanceUpdate) {
     [_controller tabItemAppearanceHasChanged];
   }

ios/bottom-tabs/screen/RNSTabsScreenViewController.h

@@ -17,8 +17,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong, readonly, nullable) RNSBottomTabsScreenComponentView *tabScreenComponentView;
 @property (nonatomic, weak, readonly, nullable) id<RNSBottomTabsSpecialEffectsSupporting> tabsSpecialEffectsDelegate;
-@property (nonatomic, nullable) NSString *tabItemTestID;
-@property (nonatomic, nullable) NSString *tabItemAccessibilityLabel;
 
 /**
  * Tell the controller that the tab screen it owns has got its react-props-focus changed.

ios/bottom-tabs/screen/RNSTabsScreenViewController.mm

@@ -130,12 +130,6 @@ - (RNSOrientation)evaluateOrientation
   return self.tabScreenComponentView.orientation;
 }
 
-- (void)updateTabItemA11yProps
-{
-  self.tabBarItem.accessibilityIdentifier = _tabItemTestID;
-  self.tabBarItem.accessibilityLabel = _tabItemAccessibilityLabel;
-}
-
 #endif // !TARGET_OS_TV
 
 @end