fix: specify default values for getAccessibilityX

fixes #116
react-navigation · Aug 18, 2019 · 3c7918d · 3c7918d
1 parent fb98e7d
commit 3c7918d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/packages/bottom-tabs/src/navigators/createBottomTabNavigator.js b/packages/bottom-tabs/src/navigators/createBottomTabNavigator.js
@@ -27,6 +27,8 @@ type State = {
 class TabNavigationView extends React.PureComponent<Props, State> {
   static defaultProps = {
     lazy: true,
+    getAccessibilityRole: () => 'button',
+    getAccessibilityStates: ({ focused }) => (focused ? ['selected'] : []),
   };
 
   static getDerivedStateFromProps(nextProps, prevState) {

diff --git a/packages/bottom-tabs/src/views/BottomTabBar.js b/packages/bottom-tabs/src/views/BottomTabBar.js
@@ -356,18 +356,13 @@ class TabBarBottom extends React.Component<Props, State> {
               route,
             });
 
-            const accessibilityRole =
-              this.props.getAccessibilityRole({
-                route,
-              }) || 'button';
-
-            let accessibilityStates = this.props.getAccessibilityStates({
+            const accessibilityRole = this.props.getAccessibilityRole({
               route,
             });
 
-            if (!accessibilityStates) {
-              accessibilityStates = focused ? ['selected'] : [];
-            }
+            const accessibilityStates = this.props.getAccessibilityStates(
+              scene
+            );
 
             const testID = this.props.getTestID({ route });