Skip to content

Commit bba6582

Browse files
authored
Restore behavior of accessibilityRole (#1997)
1 parent 55cdc99 commit bba6582

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

packages/react-native/React/Views/RCTViewManager.m

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,18 +292,26 @@ - (RCTShadowView *)shadowView
292292
RCT_REMAP_VIEW_PROPERTY(transform, reactTransform, CATransform3D)
293293
RCT_REMAP_VIEW_PROPERTY(transformOrigin, reactTransformOrigin, RCTTransformOrigin)
294294

295-
#if !TARGET_OS_OSX // [macOS]
296295
RCT_CUSTOM_VIEW_PROPERTY(accessibilityRole, UIAccessibilityTraits, RCTView)
297296
{
297+
#if !TARGET_OS_OSX // [macOS]
298298
UIAccessibilityTraits accessibilityRoleTraits =
299299
json ? [RCTConvert UIAccessibilityTraits:json] : UIAccessibilityTraitNone;
300300
if (view.reactAccessibilityElement.accessibilityRoleTraits != accessibilityRoleTraits) {
301301
view.accessibilityRoleTraits = accessibilityRoleTraits;
302302
view.reactAccessibilityElement.accessibilityRole = json ? [RCTConvert NSString:json] : nil;
303303
[self updateAccessibilityTraitsForRole:view withDefaultView:defaultView];
304304
}
305+
#else // [macOS
306+
if (json) {
307+
view.reactAccessibilityElement.accessibilityRole = [RCTConvert accessibilityRoleFromTraits:json];
308+
} else {
309+
view.reactAccessibilityElement.accessibilityRole = defaultView.accessibilityRole;
310+
}
311+
#endif // macOS]
305312
}
306313

314+
#if !TARGET_OS_OSX // [macOS]
307315
RCT_CUSTOM_VIEW_PROPERTY(role, UIAccessibilityTraits, RCTView)
308316
{
309317
UIAccessibilityTraits roleTraits = json ? [RCTConvert UIAccessibilityTraits:json] : UIAccessibilityTraitNone;

0 commit comments

Comments
 (0)