Rename shouldRenderLabelBeneathIcon to tabDirection

react-navigation · Mar 15, 2019 · a384867 · a384867
1 parent 8d4bf58
commit a384867
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/views/BottomTabBar.js b/src/views/BottomTabBar.js
@@ -23,9 +23,9 @@ export type TabBarOptions = {
   showIcon: boolean,
   labelStyle: any,
   tabStyle: any,
+  tabDirection: any;
   adaptive?: boolean,
   style: any,
-  shouldRenderLabelBeneathIcon?: (options: { isLandscape: boolean }) => boolean;
 };
 
 type Props = TabBarOptions & {
@@ -170,10 +170,19 @@ class TabBarBottom extends React.Component<Props> {
 
   _shouldUseHorizontalLabels = () => {
     const { routes } = this.props.navigation.state;
-    const { isLandscape, dimensions, adaptive, tabStyle, shouldRenderLabelBeneathIcon } = this.props;
+    const { isLandscape, dimensions, adaptive, tabStyle, tabDirection } = this.props;
+
+    if (tabDirection) {
+      let direction;
+      if (typeof direction === 'string') {
+        direction = tabDirection;
+      } else {
+        direction = tabDirection({ deviceOrientation: isLandscape ? 'horizontal' : 'vertical' });
+      }
 
-    if (shouldRenderLabelBeneathIcon) {
-      return !shouldRenderLabelBeneathIcon({ isLandscape });
+      if (direction) {
+        return direction === 'row';
+      }
     }
 
     if (!adaptive) {