Merge pull request #106 from shixiaoquan/master

解决ViewPager的禁用滚动设置无效的问题
zbtang · Feb 3, 2018 · ba1cd91 · ba1cd91
2 parents 13ec027 + c916de7
commit ba1cd91
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/docs/viewpager.md b/docs/viewpager.md
@@ -8,7 +8,7 @@
 | onPageScroll | function |  |  |
 | onPageScrollStateChanged | function |  |  |
 | onPageSelected | function |  |  |
-| scrollEnabled | bool | false |  |
+| horizontalScroll | bool | true |  |
 
 
 | Method | Params | Default | Note |

diff --git a/viewpager/ViewPager.js b/viewpager/ViewPager.js
@@ -89,6 +89,7 @@ export default class ViewPager extends Component {
             onLayout: this._onScrollViewLayout,
             horizontal: true,
             pagingEnabled: this.props.horizontalScroll ? true : false,
+            scrollEnabled: this.props.horizontalScroll ? true : false,
             scrollsToTop: false,
             showsHorizontalScrollIndicator: false,
             showsVerticalScrollIndicator: false,