Skip to content

Commit

Permalink
Fix accessibilityRole (#2001)
Browse files Browse the repository at this point in the history
* Fix accessibilityRole prop

* whitespace
  • Loading branch information
FalseLobster authored Dec 20, 2023
1 parent 164469a commit fc059be
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion packages/react-native/React/Views/RCTViewManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -284,18 +284,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

0 comments on commit fc059be

Please sign in to comment.