[fix] TouchableHighlight default underlay style

This commit is contained in:
Nicolas Gallagher
2016-06-13 11:57:02 -07:00
parent 288e14cd70
commit 62cd335788
@@ -93,21 +93,22 @@ var TouchableHighlight = React.createClass({
getDefaultProps: () => DEFAULT_PROPS, getDefaultProps: () => DEFAULT_PROPS,
// Performance optimization to avoid constantly re-generating these objects. // Performance optimization to avoid constantly re-generating these objects.
computeSyntheticState: function(props) { computeSyntheticState: (props) => {
const { activeOpacity, style, underlayColor } = props;
return { return {
activeProps: { activeProps: {
style: { style: {
opacity: props.activeOpacity, opacity: activeOpacity,
} }
}, },
activeUnderlayProps: { activeUnderlayProps: {
style: { style: {
backgroundColor: props.underlayColor, backgroundColor: underlayColor,
} }
}, },
underlayProps: { underlayProps: {
style: { style: {
backgroundColor: props.style.backgroundColor || null backgroundColor: style && style.backgroundColor || null
} }
} }
}; };