Revert "Only generate recursive accessibility label for accessible elements (#51988)"

cipolleschi · cipolleschi · commit 7f25e6cbf4c9 · 2025-06-17T10:36:53.000+02:00
This reverts commit 7e2f17f.
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@@ -1230,10 +1230,7 @@ - (NSString *)accessibilityLabel
     return label;
   }
 
-  if (self.isAccessibilityElement) {
-    return RCTRecursiveAccessibilityLabel(self.currentContainerView);
-  }
-  return nil;
+  return RCTRecursiveAccessibilityLabel(self.currentContainerView);
 }
 
 - (NSString *)accessibilityLabelForCoopting
diff --git a/packages/react-native/React/Views/RCTView.m b/packages/react-native/React/Views/RCTView.m
@@ -240,10 +240,7 @@ - (NSString *)accessibilityLabel
   if (label) {
     return label;
   }
-  if (self.isAccessibilityElement) {
-    return RCTRecursiveAccessibilityLabel(self);
-  }
-  return nil;
+  return RCTRecursiveAccessibilityLabel(self);
 }
 
 - (NSArray<UIAccessibilityCustomAction *> *)accessibilityCustomActions

Original file line number	Diff line number	Diff line change
`@@ -1230,10 +1230,7 @@ - (NSString *)accessibilityLabel`
`1230`	`1230`	`return label;`
`1231`	`1231`	`}`
`1232`	`1232`
`1233`		`- if (self.isAccessibilityElement) {`
`1234`		`- return RCTRecursiveAccessibilityLabel(self.currentContainerView);`
`1235`		`- }`
`1236`		`- return nil;`
	`1233`	`+ return RCTRecursiveAccessibilityLabel(self.currentContainerView);`
`1237`	`1234`	`}`
`1238`	`1235`
`1239`	`1236`	`- (NSString *)accessibilityLabelForCoopting`
Original file line number	Diff line number	Diff line change
`@@ -240,10 +240,7 @@ - (NSString *)accessibilityLabel`
`240`	`240`	`if (label) {`
`241`	`241`	`return label;`
`242`	`242`	`}`
`243`		`- if (self.isAccessibilityElement) {`
`244`		`- return RCTRecursiveAccessibilityLabel(self);`
`245`		`- }`
`246`		`- return nil;`
	`243`	`+ return RCTRecursiveAccessibilityLabel(self);`
`247`	`244`	`}`
`248`	`245`
`249`	`246`	`- (NSArray<UIAccessibilityCustomAction > )accessibilityCustomActions`