From 2cbe004ed8169195fb2c11c40eaf1e04ff70b463 Mon Sep 17 00:00:00 2001 From: huawei Date: Tue, 11 Oct 2016 15:38:33 +0800 Subject: [PATCH 1/5] don't reset childIndex for initial loop --- ViewPager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ViewPager.js b/ViewPager.js index dba9b45..6142750 100644 --- a/ViewPager.js +++ b/ViewPager.js @@ -153,7 +153,7 @@ var ViewPager = React.createClass({ this.state.scrollValue.setValue(constrainedPage > 0 ? 1 : 0); } - this.childIndex = Math.min(this.childIndex, constrainedPage); +// this.childIndex = Math.min(this.childIndex, constrainedPage); this.fling = false; } From 2e6bf8bd8782560aa3746b41b2f51eed26bf89fb Mon Sep 17 00:00:00 2001 From: huawei Date: Tue, 19 Dec 2017 11:49:40 +0800 Subject: [PATCH 2/5] Proptypes --- ViewPager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ViewPager.js b/ViewPager.js index 6142750..8235782 100644 --- a/ViewPager.js +++ b/ViewPager.js @@ -1,7 +1,7 @@ 'use strict'; var React = require('react'); -var { PropTypes } = React; +var PropTypes = require('prop-types'); var ReactNative = require('react-native'); var { From ffac80d878fc8cb10ad4a9c46244b0c889aaddaa Mon Sep 17 00:00:00 2001 From: huawei Date: Tue, 19 Dec 2017 11:52:47 +0800 Subject: [PATCH 3/5] proptypes --- DefaultViewPageIndicator.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/DefaultViewPageIndicator.js b/DefaultViewPageIndicator.js index 320d4a2..825f598 100644 --- a/DefaultViewPageIndicator.js +++ b/DefaultViewPageIndicator.js @@ -2,6 +2,8 @@ var React = require('react'); var ReactNative = require('react-native'); +var PropTypes = require('prop-types'); + var { Dimensions, StyleSheet, @@ -48,9 +50,9 @@ var styles = StyleSheet.create({ var DefaultViewPageIndicator = React.createClass({ propTypes: { - goToPage: React.PropTypes.func, - activePage: React.PropTypes.number, - pageCount: React.PropTypes.number + goToPage: PropTypes.func, + activePage: PropTypes.number, + pageCount: PropTypes.number }, getInitialState() { From 51eb3b6cc0654eaf8928d3dfd8d2a28c4d3608a7 Mon Sep 17 00:00:00 2001 From: huawei Date: Tue, 19 Dec 2017 11:57:12 +0800 Subject: [PATCH 4/5] remove react.class --- ViewPager.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ViewPager.js b/ViewPager.js index 8235782..8328e4f 100644 --- a/ViewPager.js +++ b/ViewPager.js @@ -21,7 +21,7 @@ var DefaultViewPageIndicator = require('./DefaultViewPageIndicator'); var deviceWidth = Dimensions.get('window').width; var ViewPagerDataSource = require('./ViewPagerDataSource'); -var ViewPager = React.createClass({ +export default class ViewPager extend React.Component{ mixins: [TimerMixin], statics: { @@ -329,7 +329,7 @@ var ViewPager = React.createClass({ ); } -}); +}; var styles = StyleSheet.create({ indicators: { @@ -342,5 +342,3 @@ var styles = StyleSheet.create({ backgroundColor: 'transparent', }, }); - -module.exports = ViewPager; From 25d1b661944f5c5578e38e0b5b33ef9af1fbe406 Mon Sep 17 00:00:00 2001 From: huawei Date: Tue, 19 Dec 2017 11:58:21 +0800 Subject: [PATCH 5/5] remove react.class --- DefaultViewPageIndicator.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/DefaultViewPageIndicator.js b/DefaultViewPageIndicator.js index 825f598..fcc7356 100644 --- a/DefaultViewPageIndicator.js +++ b/DefaultViewPageIndicator.js @@ -48,7 +48,7 @@ var styles = StyleSheet.create({ }, }); -var DefaultViewPageIndicator = React.createClass({ +export default class DefaultViewPageIndicator extends React.component{ propTypes: { goToPage: PropTypes.func, activePage: PropTypes.number, @@ -102,6 +102,4 @@ var DefaultViewPageIndicator = React.createClass({ ); }, -}); - -module.exports = DefaultViewPageIndicator; +};