Navigation bar hierarchy fix (#8252)

* Navigation bar hierarchy fix

* fix for comments

Author: markdevocht

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 {

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;

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]]) {

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",

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"