Merge 6c6285e into 8ebfaef

react-component · Mar 20, 2018 · 7b0b4de · 7b0b4de
2 parents 8ebfaef + 6c6285e
commit 7b0b4de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/DefaultTabBar.native.tsx b/src/DefaultTabBar.native.tsx
@@ -193,6 +193,7 @@ export class DefaultTabBar extends React.PureComponent<PropsType, StateType> {
       styles = defaultStyles,
       tabsContainerStyle,
       renderUnderline,
+      keyboardShouldPersistTaps,
     } = this.props;
 
     const tabUnderlineStyle = {
@@ -231,6 +232,7 @@ export class DefaultTabBar extends React.PureComponent<PropsType, StateType> {
         bounces={false}
         scrollsToTop={false}
         scrollEnabled={tabs.length > page}
+        keyboardShouldPersistTaps={keyboardShouldPersistTaps}
       >
         <View
           style={{

diff --git a/src/Tabs.native.tsx b/src/Tabs.native.tsx
@@ -67,7 +67,7 @@ export class Tabs extends Component<PropsType, StateType> {
   }
 
   renderContent = (getSubElements = this.getSubElements()) => {
-    const { tabs, usePaged, destroyInactiveTab } = this.props;
+    const { tabs, usePaged, destroyInactiveTab, keyboardShouldPersistTaps } = this.props;
     const { currentTab = 0, containerWidth = 0 } = this.state;
 
     const AnimatedScrollView = this.AnimatedScrollView;
@@ -85,6 +85,7 @@ export class Tabs extends Component<PropsType, StateType> {
       directionalLockEnabled
       alwaysBounceVertical={false}
       keyboardDismissMode="on-drag"
+      keyboardShouldPersistTaps={keyboardShouldPersistTaps}
     >
       {
         tabs.map((tab, index) => {
@@ -148,14 +149,15 @@ export class Tabs extends Component<PropsType, StateType> {
   }
 
   render() {
-    const { tabBarPosition, styles = Styles, noRenderContent } = this.props;
+    const { tabBarPosition, styles = Styles, noRenderContent, keyboardShouldPersistTaps } = this.props;
     const { scrollX, scrollValue, containerWidth } = this.state;
     // let overlayTabs = (this.props.tabBarPosition === 'overlayTop' || this.props.tabBarPosition === 'overlayBottom');
     let overlayTabs = false;
 
     let tabBarProps = {
       ...this.getTabBarBaseProps(),
 
+      keyboardShouldPersistTaps,
       scrollX: scrollX,
       scrollValue: scrollValue,
       containerWidth: containerWidth,