diff --git a/src/ActionButton/ActionButton.react.js b/src/ActionButton/ActionButton.react.js index 6a8a1186..7adcdd7d 100755 --- a/src/ActionButton/ActionButton.react.js +++ b/src/ActionButton/ActionButton.react.js @@ -71,7 +71,7 @@ const propTypes = { */ style: PropTypes.shape({ container: ViewPropTypes.style, - icon: Text.propTypes.style, // eslint-disable-line + icon: PropTypes.any, }), }; const defaultProps = { diff --git a/src/Avatar/Avatar.react.js b/src/Avatar/Avatar.react.js index 3ffacee6..f54677b5 100644 --- a/src/Avatar/Avatar.react.js +++ b/src/Avatar/Avatar.react.js @@ -37,7 +37,7 @@ const propTypes = { */ style: PropTypes.shape({ container: ViewPropTypes.style, - content: Text.propTypes.style, // eslint-disable-line + content: PropTypes.any, }), iconSet: PropTypes.string, /** diff --git a/src/Badge/Badge.react.js b/src/Badge/Badge.react.js index 05a9ae59..1bdd1640 100644 --- a/src/Badge/Badge.react.js +++ b/src/Badge/Badge.react.js @@ -42,7 +42,7 @@ const propTypes = { PropTypes.shape({ container: ViewPropTypes.style, strokeContainer: ViewPropTypes.style, - content: Text.propTypes.style, // eslint-disable-line + content: PropTypes.any, }), PropTypes.array, ]), diff --git a/src/BottomNavigation/BottomNavigationAction.react.js b/src/BottomNavigation/BottomNavigationAction.react.js index 9ec679a2..7c47b786 100644 --- a/src/BottomNavigation/BottomNavigationAction.react.js +++ b/src/BottomNavigation/BottomNavigationAction.react.js @@ -38,8 +38,8 @@ const propTypes = { */ style: PropTypes.shape({ container: ViewPropTypes.style, - active: Text.propTypes.style, // eslint-disable-line - disabled: Text.propTypes.style, // eslint-disable-line + active: PropTypes.any, + disabled: PropTypes.any, }), disabled: PropTypes.bool, }; diff --git a/src/Button/Button.react.js b/src/Button/Button.react.js index 325ae787..b8008aa8 100755 --- a/src/Button/Button.react.js +++ b/src/Button/Button.react.js @@ -50,7 +50,7 @@ const propTypes = { */ style: PropTypes.shape({ container: ViewPropTypes.style, - text: Text.propTypes.style, // eslint-disable-line + text: PropTypes.any, }), primary: PropTypes.bool, accent: PropTypes.bool, diff --git a/src/Checkbox/Checkbox.react.js b/src/Checkbox/Checkbox.react.js index 651d09a1..b660ee40 100644 --- a/src/Checkbox/Checkbox.react.js +++ b/src/Checkbox/Checkbox.react.js @@ -45,7 +45,7 @@ const propTypes = { container: ViewPropTypes.style, // FIXME: icon: PropTypes.any, // eslint-disable-line - label: Text.propTypes.style, // eslint-disable-line + label: PropTypes.any, }), /** * Size of icon diff --git a/src/Dialog/Title.react.js b/src/Dialog/Title.react.js index 1c9076a0..dcb593a6 100644 --- a/src/Dialog/Title.react.js +++ b/src/Dialog/Title.react.js @@ -10,7 +10,7 @@ const propTypes = { children: PropTypes.node.isRequired, style: PropTypes.shape({ titleContainer: ViewPropTypes.style, - titleText: Text.propTypes.style, // eslint-disable-line + titleText: PropTypes.any, }), }; const defaultProps = { diff --git a/src/Drawer/Section.react.js b/src/Drawer/Section.react.js index d2956eaa..027a6492 100644 --- a/src/Drawer/Section.react.js +++ b/src/Drawer/Section.react.js @@ -28,9 +28,9 @@ const propTypes = { container: ViewPropTypes.style, item: ViewPropTypes.style, subheader: ViewPropTypes.style, - icon: Text.propTypes.style, // eslint-disable-line - value: Text.propTypes.style, // eslint-disable-line - label: Text.propTypes.style, // eslint-disable-line + icon: PropTypes.any, + value: PropTypes.any, + label: PropTypes.any, }), key: PropTypes.string, /** diff --git a/src/IconToggle/IconToggle.react.js b/src/IconToggle/IconToggle.react.js index 72c9cf9f..e8550564 100644 --- a/src/IconToggle/IconToggle.react.js +++ b/src/IconToggle/IconToggle.react.js @@ -60,7 +60,7 @@ const propTypes = { style: PropTypes.oneOfType([ PropTypes.shape({ container: ViewPropTypes.style, - icon: Text.propTypes.style, // eslint-disable-line + icon: PropTypes.any }), PropTypes.array, ]), diff --git a/src/ListItem/ListItem.react.js b/src/ListItem/ListItem.react.js index ca957d6e..656154a8 100644 --- a/src/ListItem/ListItem.react.js +++ b/src/ListItem/ListItem.react.js @@ -43,11 +43,11 @@ const propTypes = { leftElementContainer: ViewPropTypes.style, centerElementContainer: ViewPropTypes.style, textViewContainer: ViewPropTypes.style, - primaryText: Text.propTypes.style, // eslint-disable-line + primaryText: PropTypes.any, firstLine: ViewPropTypes.style, - primaryTextContainer: Text.propTypes.style, // eslint-disable-line - secondaryText: Text.propTypes.style, // eslint-disable-line - tertiaryText: Text.propTypes.style, // eslint-disable-line + primaryTextContainer: PropTypes.any, + secondaryText: PropTypes.any, + tertiaryText: PropTypes.any, rightElementContainer: ViewPropTypes.style, leftElement: PropTypes.style, rightElement: PropTypes.style, diff --git a/src/Subheader/Subheader.react.js b/src/Subheader/Subheader.react.js index d2465631..3dfd0f19 100644 --- a/src/Subheader/Subheader.react.js +++ b/src/Subheader/Subheader.react.js @@ -12,7 +12,7 @@ const propTypes = { lines: PropTypes.number, style: PropTypes.shape({ contaienr: ViewPropTypes.style, - text: Text.propTypes.style, // eslint-disable-line + text: PropTypes.any, }), }; const defaultProps = { diff --git a/src/Toolbar/CenterElement.react.js b/src/Toolbar/CenterElement.react.js index c2a28790..b2460bc3 100644 --- a/src/Toolbar/CenterElement.react.js +++ b/src/Toolbar/CenterElement.react.js @@ -17,7 +17,7 @@ const propTypes = { searchValue: PropTypes.string.isRequired, searchable: PropTypes.shape({ autoFocus: PropTypes.bool, - autoCapitalize: TextInput.propTypes.autoCapitalize, // eslint-disable-line + autoCapitalize: PropTypes.string, autoCorrect: PropTypes.bool, onChangeText: PropTypes.func, onSubmitEditing: PropTypes.func, @@ -25,7 +25,7 @@ const propTypes = { }), style: PropTypes.shape({ centerElementContainer: ViewPropTypes.style, - titleText: Text.propTypes.style, // eslint-disable-line + titleText: PropTypes.any, }), centerElement: PropTypes.node, onPress: PropTypes.func, diff --git a/src/Toolbar/LeftElement.react.js b/src/Toolbar/LeftElement.react.js index c6490428..e81e7be0 100644 --- a/src/Toolbar/LeftElement.react.js +++ b/src/Toolbar/LeftElement.react.js @@ -13,7 +13,7 @@ const propTypes = { isSearchActive: PropTypes.bool.isRequired, style: PropTypes.shape({ leftElementContainer: ViewPropTypes.style, - leftElement: Text.propTypes.style, // eslint-disable-line + leftElement: PropTypes.any, }), size: PropTypes.number, leftElement: PropTypes.node, diff --git a/src/Toolbar/Toolbar.react.js b/src/Toolbar/Toolbar.react.js index 2c22248f..6ef73424 100644 --- a/src/Toolbar/Toolbar.react.js +++ b/src/Toolbar/Toolbar.react.js @@ -69,7 +69,7 @@ const propTypes = { // FIXME leftElement: PropTypes.any, // eslint-disable-line centerElementContainer: ViewPropTypes.style, - titleText: Text.propTypes.style, // eslint-disable-line + titleText: PropTypes.any, rightElementContainer: ViewPropTypes.style, rightElement: PropTypes.any, // eslint-disable-line }), diff --git a/src/utils/index.js b/src/utils/index.js index ebc97f9e..07e688b6 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,11 +1,11 @@ import { View, BackHandler, - ViewPropTypes as RNViewPropTypes, BackAndroid as DeprecatedBackAndroid, } from 'react-native'; +import PropTypes from 'prop-types'; -const ViewPropTypes = RNViewPropTypes || View.propTypes; // eslint-disable-line +const ViewPropTypes = { style: PropTypes.any }; const BackAndroid = BackHandler || DeprecatedBackAndroid; export { ViewPropTypes, BackAndroid };