Skip to content

[0.73] Fix accessibilityRole #1997

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

Merged
merged 2 commits into from
Dec 20, 2023
Merged

[0.73] Fix accessibilityRole #1997

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ac40c7
Restore behavior of accessibilityRole
FalseLobster Dec 19, 2023
2ff2227
Merge branch '0.73-stable' of https://github.com/microsoft/react-nati…
FalseLobster Dec 19, 2023
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
10 changes: 9 additions & 1 deletion packages/react-native/React/Views/RCTViewManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,18 +292,26 @@ - (RCTShadowView *)shadowView
RCT_REMAP_VIEW_PROPERTY(transform, reactTransform, CATransform3D)
RCT_REMAP_VIEW_PROPERTY(transformOrigin, reactTransformOrigin, RCTTransformOrigin)

#if !TARGET_OS_OSX // [macOS]
RCT_CUSTOM_VIEW_PROPERTY(accessibilityRole, UIAccessibilityTraits, RCTView)
{
#if !TARGET_OS_OSX // [macOS]
UIAccessibilityTraits accessibilityRoleTraits =
json ? [RCTConvert UIAccessibilityTraits:json] : UIAccessibilityTraitNone;
if (view.reactAccessibilityElement.accessibilityRoleTraits != accessibilityRoleTraits) {
view.accessibilityRoleTraits = accessibilityRoleTraits;
view.reactAccessibilityElement.accessibilityRole = json ? [RCTConvert NSString:json] : nil;
[self updateAccessibilityTraitsForRole:view withDefaultView:defaultView];
}
#else // [macOS
if (json) {
view.reactAccessibilityElement.accessibilityRole = [RCTConvert accessibilityRoleFromTraits:json];
} else {
view.reactAccessibilityElement.accessibilityRole = defaultView.accessibilityRole;
}
#endif // macOS]
}

#if !TARGET_OS_OSX // [macOS]
RCT_CUSTOM_VIEW_PROPERTY(role, UIAccessibilityTraits, RCTView)
{
UIAccessibilityTraits roleTraits = json ? [RCTConvert UIAccessibilityTraits:json] : UIAccessibilityTraitNone;
Expand Down