Skip to content

Commit cefeaad

Browse files
authored
Merge pull request ptomasroos#626 from ollija/master
Fix View.propTypes -warning on RN 0.44
2 parents 6458a77 + 8f919a9 commit cefeaad

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

DefaultTabBar.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const React = require('react');
2-
const ReactNative = require('react-native');
2+
const { ViewPropTypes } = ReactNative = require('react-native');
33
const {
44
StyleSheet,
55
Text,
@@ -17,9 +17,9 @@ const DefaultTabBar = React.createClass({
1717
activeTextColor: React.PropTypes.string,
1818
inactiveTextColor: React.PropTypes.string,
1919
textStyle: Text.propTypes.style,
20-
tabStyle: View.propTypes.style,
20+
tabStyle: ViewPropTypes.style,
2121
renderTab: React.PropTypes.func,
22-
underlineStyle: View.propTypes.style,
22+
underlineStyle: ViewPropTypes.style,
2323
},
2424

2525
getDefaultProps() {

ScrollableTabBar.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const React = require('react');
2-
const ReactNative = require('react-native');
2+
const { ViewPropTypes } = ReactNative = require('react-native');
33
const {
44
View,
55
Animated,
@@ -23,12 +23,12 @@ const ScrollableTabBar = React.createClass({
2323
activeTextColor: React.PropTypes.string,
2424
inactiveTextColor: React.PropTypes.string,
2525
scrollOffset: React.PropTypes.number,
26-
style: View.propTypes.style,
27-
tabStyle: View.propTypes.style,
28-
tabsContainerStyle: View.propTypes.style,
26+
style: ViewPropTypes.style,
27+
tabStyle: ViewPropTypes.style,
28+
tabsContainerStyle: ViewPropTypes.style,
2929
textStyle: Text.propTypes.style,
3030
renderTab: React.PropTypes.func,
31-
underlineStyle: View.propTypes.style,
31+
underlineStyle: ViewPropTypes.style,
3232
onScroll:React.PropTypes.func,
3333
},
3434

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const {
33
PropTypes,
44
Component,
55
} = React;
6-
const ReactNative = require('react-native');
6+
const { ViewPropTypes } = ReactNative = require('react-native');
77
const {
88
Dimensions,
99
View,
@@ -34,7 +34,7 @@ const ScrollableTabView = React.createClass({
3434
onChangeTab: PropTypes.func,
3535
onScroll: PropTypes.func,
3636
renderTabBar: PropTypes.any,
37-
style: View.propTypes.style,
37+
style: ViewPropTypes.style,
3838
contentProps: PropTypes.object,
3939
scrollWithoutAnimation: PropTypes.bool,
4040
locked: PropTypes.bool,

0 commit comments

Comments
 (0)