Skip to content

Commit

Permalink
Fix react-native-elements#2374 - Use correct PropType for styles (rea…
Browse files Browse the repository at this point in the history
…ct-native-elements#2375)

This fixes the `PropTypes` as reported in react-native-elements#2374
  • Loading branch information
arabold authored Jun 3, 2020
1 parent a422a07 commit 380fd67
Show file tree
Hide file tree
Showing 24 changed files with 116 additions and 116 deletions.
14 changes: 7 additions & 7 deletions src/avatar/Avatar.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,16 +211,16 @@ AvatarComponent.propTypes = {
]),
onPress: PropTypes.func,
onLongPress: PropTypes.func,
containerStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
source: PropTypes.node,
avatarStyle: PropTypes.object,
avatarStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
rounded: PropTypes.bool,
title: PropTypes.string,
titleStyle: PropTypes.object,
overlayContainerStyle: PropTypes.object,
titleStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
overlayContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
activeOpacity: PropTypes.number,
icon: PropTypes.object,
iconStyle: PropTypes.object,
iconStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
size: PropTypes.oneOfType([
PropTypes.oneOf(['small', 'medium', 'large', 'xlarge']),
PropTypes.number,
Expand All @@ -233,9 +233,9 @@ AvatarComponent.propTypes = {
type: PropTypes.string,
color: PropTypes.string,
underlayColor: PropTypes.string,
style: PropTypes.object,
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
}),
placeholderStyle: PropTypes.object,
placeholderStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
renderPlaceholderContent: nodeType,
imageProps: PropTypes.object,
ImageComponent: PropTypes.elementType,
Expand Down
6 changes: 3 additions & 3 deletions src/badge/Badge.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ const Badge = props => {
};

Badge.propTypes = {
containerStyle: PropTypes.object,
badgeStyle: PropTypes.object,
textStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
badgeStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
textStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
value: PropTypes.node,
onPress: PropTypes.func,
Component: PropTypes.elementType,
Expand Down
14 changes: 7 additions & 7 deletions src/buttons/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,24 +168,24 @@ class Button extends Component {

Button.propTypes = {
title: PropTypes.string,
titleStyle: PropTypes.object,
titleStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
titleProps: PropTypes.object,
buttonStyle: PropTypes.object,
buttonStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
type: PropTypes.oneOf(['solid', 'clear', 'outline']),
loading: PropTypes.bool,
loadingStyle: PropTypes.object,
loadingStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
loadingProps: PropTypes.object,
onPress: PropTypes.func,
containerStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
icon: nodeType,
iconContainerStyle: PropTypes.object,
iconContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
iconRight: PropTypes.bool,
linearGradientProps: PropTypes.object,
TouchableComponent: PropTypes.elementType,
ViewComponent: PropTypes.elementType,
disabled: PropTypes.bool,
disabledStyle: PropTypes.object,
disabledTitleStyle: PropTypes.object,
disabledStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
disabledTitleStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
raised: PropTypes.bool,
theme: PropTypes.object,
};
Expand Down
18 changes: 9 additions & 9 deletions src/buttons/ButtonGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@ ButtonGroup.propTypes = {
Component: PropTypes.elementType,
onPress: PropTypes.func,
buttons: PropTypes.array,
containerStyle: PropTypes.object,
textStyle: PropTypes.object,
selectedTextStyle: PropTypes.object,
selectedButtonStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
textStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
selectedTextStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
selectedButtonStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
underlayColor: PropTypes.string,
selectedIndex: PropTypes.number,
selectedIndexes: PropTypes.arrayOf(PropTypes.number),
Expand All @@ -221,17 +221,17 @@ ButtonGroup.propTypes = {
color: PropTypes.string,
width: PropTypes.number,
}),
buttonStyle: PropTypes.object,
buttonStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
selectMultiple: PropTypes.bool,
theme: PropTypes.object,
disabled: PropTypes.oneOfType([
PropTypes.bool,
PropTypes.arrayOf(PropTypes.number),
]),
disabledStyle: PropTypes.object,
disabledTextStyle: PropTypes.object,
disabledSelectedStyle: PropTypes.object,
disabledSelectedTextStyle: PropTypes.object,
disabledStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
disabledTextStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
disabledSelectedStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
disabledSelectedTextStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
vertical: PropTypes.bool,
};

Expand Down
18 changes: 9 additions & 9 deletions src/card/Card.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,19 +131,19 @@ Card.propTypes = {
PropTypes.element,
PropTypes.arrayOf(PropTypes.element),
]),
containerStyle: PropTypes.object,
wrapperStyle: PropTypes.object,
overlayStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
wrapperStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
overlayStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
title: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
titleStyle: PropTypes.object,
titleStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
featuredTitle: PropTypes.string,
featuredTitleStyle: PropTypes.object,
featuredTitleStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
featuredSubtitle: PropTypes.string,
featuredSubtitleStyle: PropTypes.object,
dividerStyle: PropTypes.object,
featuredSubtitleStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
dividerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
image: PropTypes.node,
imageStyle: PropTypes.object,
imageWrapperStyle: PropTypes.object,
imageStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
imageWrapperStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
imageProps: PropTypes.object,
titleNumberOfLines: PropTypes.number,
theme: PropTypes.object,
Expand Down
6 changes: 3 additions & 3 deletions src/checkbox/CheckBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ CheckBox.propTypes = {
titleProps: PropTypes.object,
center: PropTypes.bool,
right: PropTypes.bool,
containerStyle: PropTypes.object,
wrapperStyle: PropTypes.object,
textStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
wrapperStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
textStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
onPress: PropTypes.func,
onLongPress: PropTypes.func,
checkedTitle: PropTypes.string,
Expand Down
2 changes: 1 addition & 1 deletion src/divider/Divider.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const Divider = ({ style, theme, ...rest }) => (
);

Divider.propTypes = {
style: PropTypes.object,
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
theme: PropTypes.object,
};

Expand Down
12 changes: 6 additions & 6 deletions src/header/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const Children = ({ style, placement, children }) => (

Children.propTypes = {
placement: PropTypes.oneOf(['left', 'center', 'right']),
style: PropTypes.object,
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
children: PropTypes.oneOfType([nodeType, PropTypes.node]),
};

Expand Down Expand Up @@ -144,13 +144,13 @@ Header.propTypes = {
leftComponent: nodeType,
centerComponent: nodeType,
rightComponent: nodeType,
leftContainerStyle: PropTypes.object,
centerContainerStyle: PropTypes.object,
rightContainerStyle: PropTypes.object,
leftContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
centerContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
rightContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
backgroundColor: PropTypes.string,
backgroundImage: PropTypes.node,
backgroundImageStyle: PropTypes.object,
containerStyle: PropTypes.object,
backgroundImageStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
statusBarProps: PropTypes.object,
barStyle: PropTypes.oneOf(['default', 'light-content', 'dark-content']),
children: PropTypes.oneOfType([
Expand Down
6 changes: 3 additions & 3 deletions src/icons/Icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ Icon.propTypes = {
underlayColor: PropTypes.string,
reverse: PropTypes.bool,
raised: PropTypes.bool,
containerStyle: PropTypes.object,
iconStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
iconStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
onPress: PropTypes.func,
reverseColor: PropTypes.string,
disabled: PropTypes.bool,
disabledStyle: PropTypes.object,
disabledStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
solid: PropTypes.bool,
brand: PropTypes.bool,
};
Expand Down
4 changes: 2 additions & 2 deletions src/image/Image.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ Image.propTypes = {
...ImageNative.propTypes,
ImageComponent: PropTypes.elementType,
PlaceholderContent: nodeType,
containerStyle: PropTypes.object,
placeholderStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
placeholderStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
transition: PropTypes.bool,
};

Expand Down
16 changes: 8 additions & 8 deletions src/input/Input.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,21 +162,21 @@ class Input extends React.Component {
}

Input.propTypes = {
containerStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
disabled: PropTypes.bool,
disabledInputStyle: PropTypes.object,
inputContainerStyle: PropTypes.object,
disabledInputStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
inputContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
leftIcon: nodeType,
leftIconContainerStyle: PropTypes.object,
leftIconContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
rightIcon: nodeType,
rightIconContainerStyle: PropTypes.object,
inputStyle: PropTypes.object,
rightIconContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
inputStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
InputComponent: PropTypes.elementType,
errorProps: PropTypes.object,
errorStyle: PropTypes.object,
errorStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
errorMessage: PropTypes.string,
label: PropTypes.node,
labelStyle: PropTypes.object,
labelStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
labelProps: PropTypes.object,
theme: PropTypes.object,
renderErrorMessage: PropTypes.bool,
Expand Down
16 changes: 8 additions & 8 deletions src/list/ListItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -301,17 +301,17 @@ const styles = {
};

ListItem.propTypes = {
containerStyle: PropTypes.object,
contentContainerStyle: PropTypes.object,
rightContentContainerStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
contentContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
rightContentContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
Component: PropTypes.elementType,
onPress: PropTypes.func,
onLongPress: PropTypes.func,
title: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
titleStyle: PropTypes.object,
titleStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
titleProps: PropTypes.object,
subtitle: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
subtitleStyle: PropTypes.object,
subtitleStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
subtitleProps: PropTypes.object,
leftIcon: nodeType,
leftAvatar: nodeType,
Expand All @@ -320,10 +320,10 @@ ListItem.propTypes = {
rightAvatar: nodeType,
rightElement: nodeType,
rightTitle: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
rightTitleStyle: PropTypes.object,
rightTitleStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
rightTitleProps: PropTypes.object,
rightSubtitle: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
rightSubtitleStyle: PropTypes.object,
rightSubtitleStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
rightSubtitleProps: PropTypes.object,
input: PropTypes.object,
buttonGroup: PropTypes.object,
Expand All @@ -333,7 +333,7 @@ ListItem.propTypes = {
chevron: nodeType,
checkmark: nodeType,
disabled: PropTypes.bool,
disabledStyle: PropTypes.object,
disabledStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
topDivider: PropTypes.bool,
bottomDivider: PropTypes.bool,
pad: PropTypes.number,
Expand Down
4 changes: 2 additions & 2 deletions src/overlay/Overlay.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ const Overlay = ({
Overlay.propTypes = {
children: PropTypes.element.isRequired,
isVisible: PropTypes.bool.isRequired,
backdropStyle: PropTypes.object,
overlayStyle: PropTypes.object,
backdropStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
overlayStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
onBackdropPress: PropTypes.func,
fullScreen: PropTypes.bool,
ModalComponent: PropTypes.elementType,
Expand Down
10 changes: 5 additions & 5 deletions src/pricing/PricingCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,17 @@ const PricingButton = props => {
};

PricingCard.propTypes = {
containerStyle: PropTypes.object,
wrapperStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
wrapperStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
title: PropTypes.string,
price: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
info: PropTypes.arrayOf(PropTypes.string),
button: PropTypes.oneOfType([PropTypes.element, PropTypes.object]),
color: PropTypes.string,
onButtonPress: PropTypes.func,
titleStyle: PropTypes.object,
pricingStyle: PropTypes.object,
infoStyle: PropTypes.object,
titleStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
pricingStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
infoStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
theme: PropTypes.object,
};

Expand Down
10 changes: 5 additions & 5 deletions src/searchbar/SearchBar-android.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ SearchBar.propTypes = {
cancelIcon: nodeType,
loadingProps: PropTypes.object,
showLoading: PropTypes.bool,
containerStyle: PropTypes.object,
leftIconContainerStyle: PropTypes.object,
rightIconContainerStyle: PropTypes.object,
inputContainerStyle: PropTypes.object,
inputStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
leftIconContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
rightIconContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
inputContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
inputStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
onClear: PropTypes.func,
onCancel: PropTypes.func,
onFocus: PropTypes.func,
Expand Down
10 changes: 5 additions & 5 deletions src/searchbar/SearchBar-default.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ SearchBar.propTypes = {
searchIcon: nodeType,
loadingProps: PropTypes.object,
showLoading: PropTypes.bool,
containerStyle: PropTypes.object,
leftIconContainerStyle: PropTypes.object,
rightIconContainerStyle: PropTypes.object,
inputContainerStyle: PropTypes.object,
inputStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
leftIconContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
rightIconContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
inputContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
inputStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
onClear: PropTypes.func,
onFocus: PropTypes.func,
onBlur: PropTypes.func,
Expand Down
10 changes: 5 additions & 5 deletions src/searchbar/SearchBar-ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,11 @@ SearchBar.propTypes = {
onFocus: PropTypes.func,
onBlur: PropTypes.func,
onChangeText: PropTypes.func,
containerStyle: PropTypes.object,
leftIconContainerStyle: PropTypes.object,
rightIconContainerStyle: PropTypes.object,
inputContainerStyle: PropTypes.object,
inputStyle: PropTypes.object,
containerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
leftIconContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
rightIconContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
inputContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
inputStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
placeholderTextColor: PropTypes.string,
showCancel: PropTypes.bool,
};
Expand Down
Loading

0 comments on commit 380fd67

Please sign in to comment.