Skip to content

Commit f39d092

Browse files
Ziqi Chenfacebook-github-bot
Ziqi Chen
authored andcommittedJul 12, 2018
removed tabbar for iOS 9 compatibility issues
Summary: Removed Accessibility Trait TabBar for iOS compatibility Issues, since tabbar is only available on iOS 10+ Reviewed By: PeteTheHeat Differential Revision: D8822469 fbshipit-source-id: 34bf00eb930f631a5a4effa0a4159da07c1573f6
1 parent 934c50f commit f39d092

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed
 

‎Libraries/Components/View/ViewAccessibility.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ export type AccessibilityRole =
4444
| 'button'
4545
| 'image'
4646
| 'keyboardkey'
47-
| 'text'
48-
| 'tabbar';
47+
| 'text';
4948

5049
module.exports = {
5150
AccessibilityTraits: [
@@ -79,6 +78,5 @@ module.exports = {
7978
'image',
8079
'keyboardkey',
8180
'text',
82-
'tabbar',
8381
],
8482
};

‎React/Views/RCTViewManager.m

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ @implementation RCTConvert(UIAccessibilityTraits)
3333
@"header": @(UIAccessibilityTraitHeader),
3434
@"search": @(UIAccessibilityTraitSearchField),
3535
@"image": @(UIAccessibilityTraitImage),
36-
@"tabbar": @(UIAccessibilityTraitTabBar),
3736
@"selected": @(UIAccessibilityTraitSelected),
3837
@"plays": @(UIAccessibilityTraitPlaysSound),
3938
@"key": @(UIAccessibilityTraitKeyboardKey),

‎ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityRoleUtil.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ public enum AccessibilityRole {
3333
BUTTON("android.widget.Button"),
3434
IMAGE("android.widget.ImageView"),
3535
KEYBOARD_KEY("android.inputmethodservice.Keyboard$Key"),
36-
TEXT("android.widget.ViewGroup"),
37-
TAB_BAR("android.widget.TabWidget");
36+
TEXT("android.widget.ViewGroup");
3837

3938
@Nullable private final String mValue;
4039

@@ -90,7 +89,6 @@ public static void setRole(AccessibilityNodeInfoCompat nodeInfo, final Accessibi
9089
private static final String IMAGE = "image";
9190
private static final String KEYBOARDKEY = "keyboardkey";
9291
private static final String TEXT = "text";
93-
private static final String TABBAR = "tabbar";
9492

9593
public static void updateAccessibilityRole(View view, String role) {
9694
if (role == null) {
@@ -111,9 +109,6 @@ public static void updateAccessibilityRole(View view, String role) {
111109
case TEXT:
112110
setRole(view, AccessibilityRoleUtil.AccessibilityRole.TEXT);
113111
break;
114-
case TABBAR:
115-
setRole(view, AccessibilityRoleUtil.AccessibilityRole.TAB_BAR);
116-
break;
117112
default:
118113
view.setAccessibilityDelegate(null);
119114
}

0 commit comments

Comments
 (0)
Please sign in to comment.