Merge branch 'master' into feat/skill-for-running-RNN-on-Engine-e2e-tests-

markdevocht · web-flow · commit cd857b6ed74d · 2026-03-22T09:46:34.000+02:00
diff --git a/ios/RNNBottomTabsController.mm b/ios/RNNBottomTabsController.mm
@@ -1,4 +1,5 @@
 #import "RNNBottomTabsController.h"
+#import "UITabBarController+RNNOptions.h"
 #import "UITabBarController+RNNUtils.h"
 
 @interface RNNBottomTabsController ()
@@ -100,6 +101,8 @@ - (void)createTabBarItems:(NSArray<UIViewController *> *)childViewControllers {
     for (UIViewController *child in childViewControllers) {
         [_bottomTabPresenter applyOptions:child.resolveOptions child:child];
     }
+
+    [self syncTabBarItemTestIDs];
 }
 
 - (void)mergeChildOptions:(RNNNavigationOptions *)options child:(UIViewController *)child {
@@ -111,6 +114,8 @@ - (void)mergeChildOptions:(RNNNavigationOptions *)options child:(UIViewControlle
     [_dotIndicatorPresenter mergeOptions:options
                          resolvedOptions:childViewController.resolveOptions
                                    child:childViewController];
+
+    [self syncTabBarItemTestIDs];
 }
 
 - (id<UITabBarControllerDelegate>)delegate {
@@ -123,6 +128,7 @@ - (void)render {
 
 - (void)viewDidLayoutSubviews {
     [super viewDidLayoutSubviews];
+    [self syncTabBarItemTestIDs];
     [self.presenter viewDidLayoutSubviews];
     [_dotIndicatorPresenter bottomTabsDidLayoutSubviews:self];
 }
diff --git a/ios/UINavigationController+RNNOptions.mm b/ios/UINavigationController+RNNOptions.mm
@@ -62,13 +62,52 @@ - (void)setNavigationBarClipsToBounds:(BOOL)clipsToBounds {
     self.navigationBar.clipsToBounds = clipsToBounds;
 }
 
-- (void)setBackButtonTestID:(NSString *)testID {
-    UIView *navigationBarContentView =
+- (UIView *)rnn_findBackButtonView {
+    UIView *contentView =
         [self.navigationBar findChildByClass:NSClassFromString(@"_UINavigationBarContentView")];
-    UIView *barButton =
-        [navigationBarContentView findChildByClass:NSClassFromString(@"_UIButtonBarButton")];
-    if (barButton)
-        barButton.accessibilityIdentifier = testID;
+    if (!contentView) {
+        contentView =
+            [self.navigationBar findChildByClass:NSClassFromString(@"UIKit.NavigationBarContentView")];
+    }
+    if (!contentView)
+        return nil;
+
+    Class buttonClass = NSClassFromString(@"_UIButtonBarButton");
+
+    return [contentView findDescendantByClass:buttonClass
+                                 passingTest:^BOOL(UIView *view) {
+        if ([view respondsToSelector:NSSelectorFromString(@"isBackButton")]) {
+            return [[view valueForKey:@"backButton"] boolValue];
+        }
+        return YES;
+    }];
+}
+
+- (void)rnn_applyTestID:(NSString *)testID toBackButtonView:(UIView *)barButton {
+    barButton.accessibilityIdentifier = testID;
+    barButton.isAccessibilityElement = YES;
+}
+
+- (void)setBackButtonTestID:(NSString *)testID {
+    if (!testID)
+        return;
+
+    UIView *barButton = [self rnn_findBackButtonView];
+    if (barButton) {
+        [self rnn_applyTestID:testID toBackButtonView:barButton];
+    } else {
+        __weak UINavigationController *weakSelf = self;
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.15 * NSEC_PER_SEC)),
+                       dispatch_get_main_queue(), ^{
+            UINavigationController *nc = weakSelf;
+            if (!nc)
+                return;
+            UIView *btn = [nc rnn_findBackButtonView];
+            if (btn) {
+                [nc rnn_applyTestID:testID toBackButtonView:btn];
+            }
+        });
+    }
 }
 
 - (CGFloat)getTopBarHeight {
diff --git a/ios/UITabBarController+RNNOptions.h b/ios/UITabBarController+RNNOptions.h
@@ -20,4 +20,6 @@
 
 - (void)hideTabBar:(BOOL)animated;
 
+- (void)syncTabBarItemTestIDs;
+
 @end
diff --git a/ios/UITabBarController+RNNOptions.mm b/ios/UITabBarController+RNNOptions.mm
@@ -1,9 +1,85 @@
 #import "RNNBottomTabsController.h"
 #import "UITabBar+utils.h"
 #import "UITabBarController+RNNOptions.h"
+#import <objc/runtime.h>
+
+static const NSTimeInterval RNNTabBarTestIDRetryDelay = 0.15;
+static const NSUInteger RNNTabBarTestIDMaxRetryAttempts = 5;
+static const void *RNNTabBarTestIDRetryScheduledKey = &RNNTabBarTestIDRetryScheduledKey;
+static const void *RNNTabBarTestIDRetryAttemptsKey = &RNNTabBarTestIDRetryAttemptsKey;
+static const void *RNNOriginalTabBarViewAccessibilityIdentifierKey =
+    &RNNOriginalTabBarViewAccessibilityIdentifierKey;
 
 @implementation UITabBarController (RNNOptions)
 
+- (void)rnn_storeOriginalAccessibilityIdentifierIfNeededForTabView:(UIView *)tabView {
+    if (objc_getAssociatedObject(tabView, RNNOriginalTabBarViewAccessibilityIdentifierKey))
+        return;
+
+    id originalAccessibilityIdentifier = tabView.accessibilityIdentifier ?: [NSNull null];
+    objc_setAssociatedObject(tabView, RNNOriginalTabBarViewAccessibilityIdentifierKey,
+                             originalAccessibilityIdentifier,
+                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (void)rnn_applyTestID:(NSString *)testID toTabView:(UIView *)tabView {
+    [self rnn_storeOriginalAccessibilityIdentifierIfNeededForTabView:tabView];
+    tabView.accessibilityIdentifier = testID;
+}
+
+- (void)rnn_restoreOriginalAccessibilityIdentifierForTabView:(UIView *)tabView {
+    id originalAccessibilityIdentifier =
+        objc_getAssociatedObject(tabView, RNNOriginalTabBarViewAccessibilityIdentifierKey);
+    if (!originalAccessibilityIdentifier)
+        return;
+
+    tabView.accessibilityIdentifier =
+        [originalAccessibilityIdentifier isKindOfClass:NSNull.class]
+            ? nil
+            : originalAccessibilityIdentifier;
+    objc_setAssociatedObject(tabView, RNNOriginalTabBarViewAccessibilityIdentifierKey, nil,
+                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (BOOL)rnn_isTabBarTestIDRetryScheduled {
+    return [objc_getAssociatedObject(self, RNNTabBarTestIDRetryScheduledKey) boolValue];
+}
+
+- (void)rnn_setTabBarTestIDRetryScheduled:(BOOL)scheduled {
+    objc_setAssociatedObject(self, RNNTabBarTestIDRetryScheduledKey, @(scheduled),
+                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (NSUInteger)rnn_tabBarTestIDRetryAttempts {
+    NSNumber *retryAttempts = objc_getAssociatedObject(self, RNNTabBarTestIDRetryAttemptsKey);
+    return retryAttempts.unsignedIntegerValue;
+}
+
+- (void)rnn_setTabBarTestIDRetryAttempts:(NSUInteger)retryAttempts {
+    objc_setAssociatedObject(self, RNNTabBarTestIDRetryAttemptsKey, @(retryAttempts),
+                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (BOOL)rnn_applyTabBarItemTestIDs {
+    NSArray<UITabBarItem *> *items = self.tabBar.items ?: @[];
+    BOOL appliedAllKnownTestIDs = YES;
+
+    for (NSUInteger tabIndex = 0; tabIndex < items.count; tabIndex++) {
+        UITabBarItem *item = items[tabIndex];
+        NSString *testID = item.accessibilityIdentifier;
+        UIView *tabView = [self.tabBar tabBarItemViewAtIndex:tabIndex];
+        if (testID.length > 0 && tabView) {
+            [self rnn_applyTestID:testID toTabView:tabView];
+        } else if (tabView) {
+            [self rnn_restoreOriginalAccessibilityIdentifierForTabView:tabView];
+        } else if (testID.length > 0) {
+            appliedAllKnownTestIDs = NO;
+        }
+    }
+
+    return appliedAllKnownTestIDs;
+}
+
 - (void)setCurrentTabIndex:(NSUInteger)currentTabIndex {
     [self setSelectedIndex:currentTabIndex];
 }
@@ -16,6 +92,38 @@ - (void)setTabBarTestID:(NSString *)testID {
     self.tabBar.accessibilityIdentifier = testID;
 }
 
+- (void)syncTabBarItemTestIDs {
+    if ([self rnn_applyTabBarItemTestIDs]) {
+        [self rnn_setTabBarTestIDRetryScheduled:NO];
+        [self rnn_setTabBarTestIDRetryAttempts:0];
+        return;
+    }
+
+    if ([self rnn_isTabBarTestIDRetryScheduled])
+        return;
+
+    NSUInteger retryAttempts = [self rnn_tabBarTestIDRetryAttempts];
+    if (retryAttempts >= RNNTabBarTestIDMaxRetryAttempts) {
+        [self rnn_setTabBarTestIDRetryAttempts:0];
+        return;
+    }
+
+    [self rnn_setTabBarTestIDRetryScheduled:YES];
+    [self rnn_setTabBarTestIDRetryAttempts:retryAttempts + 1];
+
+    __weak UITabBarController *weakSelf = self;
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW,
+                                 (int64_t)(RNNTabBarTestIDRetryDelay * NSEC_PER_SEC)),
+                   dispatch_get_main_queue(), ^{
+        UITabBarController *controller = weakSelf;
+        if (!controller)
+            return;
+
+        [controller rnn_setTabBarTestIDRetryScheduled:NO];
+        [controller syncTabBarItemTestIDs];
+    });
+}
+
 - (void)setTabBarStyle:(UIBarStyle)barStyle {
     self.tabBar.barStyle = barStyle;
 }
diff --git a/ios/Utils/UIView+Utils.h b/ios/Utils/UIView+Utils.h
@@ -12,6 +12,10 @@ typedef NS_ENUM(NSInteger, ViewType) {
 
 - (UIView *)findChildByClass:clazz;
 
+- (UIView *)findDescendantByClass:clazz;
+
+- (UIView *)findDescendantByClass:(Class)clazz passingTest:(BOOL (^)(UIView *view))test;
+
 - (ViewType)viewType;
 
 - (void)stopMomentumScrollViews;
diff --git a/ios/Utils/UIView+Utils.mm b/ios/Utils/UIView+Utils.mm
@@ -18,6 +18,28 @@ - (UIView *)findChildByClass:(id)clazz {
     return nil;
 }
 
+- (UIView *)findDescendantByClass:(id)clazz {
+    for (UIView *child in [self subviews]) {
+        if ([child isKindOfClass:clazz])
+            return child;
+        UIView *found = [child findDescendantByClass:clazz];
+        if (found)
+            return found;
+    }
+    return nil;
+}
+
+- (UIView *)findDescendantByClass:(Class)clazz passingTest:(BOOL (^)(UIView *view))test {
+    for (UIView *child in [self subviews]) {
+        if ([child isKindOfClass:clazz] && test(child))
+            return child;
+        UIView *found = [child findDescendantByClass:clazz passingTest:test];
+        if (found)
+            return found;
+    }
+    return nil;
+}
+
 - (ViewType)viewType {
 #ifdef RCT_NEW_ARCH_ENABLED
 	if ([self isKindOfClass:[RCTImageComponentView class]]) {
diff --git a/package.json b/package.json
@@ -123,7 +123,7 @@
     "eslint-plugin-jest": "^28.11.0",
     "eslint-plugin-prettier": "3.1.4",
     "github-release-notes": "https://github.com/yogevbd/github-release-notes/tarball/e601b3dba72dcd6cba323c1286ea6dd0c0110b58",
-    "husky": "4.2.5",
+
     "identity-obj-proxy": "3.0.0",
     "jest": "^29.6.3",
     "lint-staged": "10.2.11",
@@ -152,11 +152,7 @@
     "playground"
   ],
   "packageManager": "yarn@4.12.0",
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
+
   "lint-staged": {
     "*.{js,ts,tsx}": "eslint --fix",
     "*.{h,m,mm}": "node ./scripts/check-clang-format",
diff --git a/playground/package.json b/playground/package.json
@@ -61,7 +61,7 @@
     "eslint-plugin-jest": "^28.11.0",
     "eslint-plugin-prettier": "3.1.4",
     "github-release-notes": "https://github.com/yogevbd/github-release-notes/tarball/e601b3dba72dcd6cba323c1286ea6dd0c0110b58",
-    "husky": "4.2.5",
+
     "identity-obj-proxy": "3.0.0",
     "jest": "^29.6.3",
     "lint-staged": "10.2.11",
@@ -85,11 +85,7 @@
     "typedoc": "0.x.x",
     "typescript": "^5.8.3"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
+
   "lint-staged": {
     "*.{js,ts,tsx}": "eslint --fix",
     "*.{h,m,mm}": "node ./scripts/check-clang-format"
