Skip to content

Commit 1ea1986

Browse files
committed
fixing proptypes
1 parent 37af048 commit 1ea1986

File tree

3 files changed

+39
-31
lines changed

3 files changed

+39
-31
lines changed

DefaultTabBar.js

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
const React = require('react');
2-
const { ViewPropTypes } = ReactNative = require('react-native');
2+
const ReactNative = require('react-native');
33
const {
44
StyleSheet,
55
Text,
66
View,
77
Animated,
8+
ViewPropTypes
89
} = ReactNative;
910
const Button = require('./Button');
11+
const PropTypes = require('prop-types');
12+
const createClass = require('create-react-class');
1013

11-
const DefaultTabBar = React.createClass({
14+
const DefaultTabBar = createClass({
1215
propTypes: {
13-
goToPage: React.PropTypes.func,
14-
activeTab: React.PropTypes.number,
15-
tabs: React.PropTypes.array,
16-
backgroundColor: React.PropTypes.string,
17-
activeTextColor: React.PropTypes.string,
18-
inactiveTextColor: React.PropTypes.string,
19-
textStyle: Text.propTypes.style,
16+
goToPage: PropTypes.func,
17+
activeTab: PropTypes.number,
18+
tabs: PropTypes.array,
19+
backgroundColor: PropTypes.string,
20+
activeTextColor: PropTypes.string,
21+
inactiveTextColor: PropTypes.string,
22+
textStyle: ViewPropTypes.style,
2023
tabStyle: ViewPropTypes.style,
21-
renderTab: React.PropTypes.func,
24+
renderTab: PropTypes.func,
2225
underlineStyle: ViewPropTypes.style,
2326
},
2427

@@ -103,4 +106,4 @@ const styles = StyleSheet.create({
103106
},
104107
});
105108

106-
module.exports = DefaultTabBar;
109+
module.exports = DefaultTabBar;

ScrollableTabBar.js

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const React = require('react');
2-
const { ViewPropTypes } = ReactNative = require('react-native');
2+
const ReactNative = require('react-native');
33
const {
44
View,
55
Animated,
@@ -8,28 +8,31 @@ const {
88
Text,
99
Platform,
1010
Dimensions,
11-
I18nManager
11+
I18nManager,
12+
ViewPropTypes
1213
} = ReactNative;
1314
const Button = require('./Button');
15+
const PropTypes = require('prop-types');
16+
const createClass = require('create-react-class');
1417

1518
const WINDOW_WIDTH = Dimensions.get('window').width;
1619

17-
const ScrollableTabBar = React.createClass({
20+
const ScrollableTabBar = createClass({
1821
propTypes: {
19-
goToPage: React.PropTypes.func,
20-
activeTab: React.PropTypes.number,
21-
tabs: React.PropTypes.array,
22-
backgroundColor: React.PropTypes.string,
23-
activeTextColor: React.PropTypes.string,
24-
inactiveTextColor: React.PropTypes.string,
25-
scrollOffset: React.PropTypes.number,
22+
goToPage: PropTypes.func,
23+
activeTab: PropTypes.number,
24+
tabs: PropTypes.array,
25+
backgroundColor: PropTypes.string,
26+
activeTextColor: PropTypes.string,
27+
inactiveTextColor: PropTypes.string,
28+
scrollOffset: PropTypes.number,
2629
style: ViewPropTypes.style,
2730
tabStyle: ViewPropTypes.style,
2831
tabsContainerStyle: ViewPropTypes.style,
29-
textStyle: Text.propTypes.style,
30-
renderTab: React.PropTypes.func,
32+
textStyle: ViewPropTypes.style,
33+
renderTab: PropTypes.func,
3134
underlineStyle: ViewPropTypes.style,
32-
onScroll:React.PropTypes.func,
35+
onScroll: PropTypes.func,
3336
},
3437

3538
getDefaultProps() {
@@ -240,4 +243,4 @@ const styles = StyleSheet.create({
240243
flexDirection: 'row',
241244
justifyContent: 'space-around',
242245
},
243-
});
246+
});

index.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
const React = require('react');
22
const {
3-
PropTypes,
43
Component,
54
} = React;
6-
const { ViewPropTypes } = ReactNative = require('react-native');
5+
const ReactNative = require('react-native');
76
const {
87
Dimensions,
98
View,
@@ -12,23 +11,26 @@ const {
1211
StyleSheet,
1312
InteractionManager,
1413
Platform,
14+
ViewPropTypes
1515
} = ReactNative;
1616
const TimerMixin = require('react-timer-mixin');
1717

1818
const SceneComponent = require('./SceneComponent');
1919
const DefaultTabBar = require('./DefaultTabBar');
2020
const ScrollableTabBar = require('./ScrollableTabBar');
21+
const PropTypes = require('prop-types');
22+
const createClass = require('create-react-class');
2123

2224

23-
const ScrollableTabView = React.createClass({
24-
mixins: [TimerMixin, ],
25+
const ScrollableTabView = createClass({
26+
mixins: [ TimerMixin, ],
2527
statics: {
2628
DefaultTabBar,
2729
ScrollableTabBar,
2830
},
2931

3032
propTypes: {
31-
tabBarPosition: PropTypes.oneOf(['top', 'bottom', 'overlayTop', 'overlayBottom', ]),
33+
tabBarPosition: PropTypes.oneOf([ 'top', 'bottom', 'overlayTop', 'overlayBottom', ]),
3234
initialPage: PropTypes.number,
3335
page: PropTypes.number,
3436
onChangeTab: PropTypes.func,
@@ -285,4 +287,4 @@ const styles = StyleSheet.create({
285287
scrollableContentAndroid: {
286288
flex: 1,
287289
},
288-
});
290+
});

0 commit comments

Comments
 (0)