Skip to content

[iOS] Avoid redundant recursion in RCTView accessibilityLabel #31222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

[iOS] Avoid redundant recursion in RCTView accessibilityLabel #31222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3118c53
Avoid redundant recursion in RCTView accessibilityLabel
mrmacete Mar 23, 2021
b6baa8e
Avoid redundant recursion in RCTViewComponentView accessibilityLabel
mrmacete Mar 23, 2021
b2cee92
Avoid mixed redundant recursion
mrmacete Mar 23, 2021
8c4b6ad
Fix static initialization
mrmacete Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,13 @@ - (NSObject *)accessibilityElement
NSMutableString *result = [NSMutableString stringWithString:@""];
for (UIView *subview in view.subviews) {
NSString *label = subview.accessibilityLabel;
if (!label) {
static Class otherClass = nil;
static BOOL otherClassLookedUp = NO;
if (!otherClass && !otherClassLookedUp) {
otherClass = NSClassFromString(@"RCTView");
otherClassLookedUp = YES;
}
if (!label && ![subview isKindOfClass:[RCTViewComponentView class]] && ![subview isKindOfClass:otherClass]) {
label = RCTRecursiveAccessibilityLabel(subview);
}
if (label && label.length > 0) {
Expand Down
8 changes: 7 additions & 1 deletion React/Views/RCTView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,13 @@ - (UIView *)react_findClipView
NSMutableString *str = [NSMutableString stringWithString:@""];
for (UIView *subview in view.subviews) {
NSString *label = subview.accessibilityLabel;
if (!label) {
static Class otherClass = nil;
static BOOL otherClassLookedUp = NO;
if (!otherClass && !otherClassLookedUp) {
otherClass = NSClassFromString(@"RCTViewComponentView");
otherClassLookedUp = YES;
}
if (!label && ![subview isKindOfClass:[RCTView class]] && ![subview isKindOfClass:otherClass]) {
label = RCTRecursiveAccessibilityLabel(subview);
}
if (label && label.length > 0) {
Expand Down