diff --git a/Libraries/Components/View/ViewAccessibility.js b/Libraries/Components/View/ViewAccessibility.js index a12528fad..17ed43140 100644 --- a/Libraries/Components/View/ViewAccessibility.js +++ b/Libraries/Components/View/ViewAccessibility.js @@ -44,8 +44,7 @@ export type AccessibilityRole = | 'button' | 'image' | 'keyboardkey' - | 'text' - | 'tabbar'; + | 'text'; module.exports = { AccessibilityTraits: [ @@ -79,6 +78,5 @@ module.exports = { 'image', 'keyboardkey', 'text', - 'tabbar', ], }; diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m index 4443f525a..602dd280d 100644 --- a/React/Views/RCTViewManager.m +++ b/React/Views/RCTViewManager.m @@ -33,7 +33,6 @@ RCT_MULTI_ENUM_CONVERTER(UIAccessibilityTraits, (@{ @"header": @(UIAccessibilityTraitHeader), @"search": @(UIAccessibilityTraitSearchField), @"image": @(UIAccessibilityTraitImage), - @"tabbar": @(UIAccessibilityTraitTabBar), @"selected": @(UIAccessibilityTraitSelected), @"plays": @(UIAccessibilityTraitPlaysSound), @"key": @(UIAccessibilityTraitKeyboardKey), diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityRoleUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityRoleUtil.java index f063925a2..1635f6045 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityRoleUtil.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityRoleUtil.java @@ -33,8 +33,7 @@ public class AccessibilityRoleUtil { BUTTON("android.widget.Button"), IMAGE("android.widget.ImageView"), KEYBOARD_KEY("android.inputmethodservice.Keyboard$Key"), - TEXT("android.widget.ViewGroup"), - TAB_BAR("android.widget.TabWidget"); + TEXT("android.widget.ViewGroup"); @Nullable private final String mValue; @@ -90,7 +89,6 @@ public class AccessibilityRoleUtil { private static final String IMAGE = "image"; private static final String KEYBOARDKEY = "keyboardkey"; private static final String TEXT = "text"; - private static final String TABBAR = "tabbar"; public static void updateAccessibilityRole(View view, String role) { if (role == null) { @@ -111,9 +109,6 @@ public class AccessibilityRoleUtil { case TEXT: setRole(view, AccessibilityRoleUtil.AccessibilityRole.TEXT); break; - case TABBAR: - setRole(view, AccessibilityRoleUtil.AccessibilityRole.TAB_BAR); - break; default: view.setAccessibilityDelegate(null); }