diff --git a/src/components/affix/index.js b/src/components/affix/index.js index 0f85022e..c12b3a6d 100644 --- a/src/components/affix/index.js +++ b/src/components/affix/index.js @@ -11,7 +11,7 @@ export default class Affix extends PureComponent { static propTypes = { numberOfLines: PropTypes.number, - style: Animated.Text.propTypes.style, + style: PropTypes.object, color: PropTypes.string.isRequired, fontSize: PropTypes.number.isRequired, diff --git a/src/components/helper/index.js b/src/components/helper/index.js index 6060f9f5..ea45e856 100644 --- a/src/components/helper/index.js +++ b/src/components/helper/index.js @@ -11,7 +11,7 @@ export default class Helper extends PureComponent { disabled: PropTypes.bool, - style: Animated.Text.propTypes.style, + style: PropTypes.object, baseColor: PropTypes.string, errorColor: PropTypes.string, @@ -72,8 +72,8 @@ export default class Helper extends PureComponent { errorColor, } = this.props; - let text = errored? - error: + let text = errored ? + error : title; if (null == text) { @@ -83,8 +83,8 @@ export default class Helper extends PureComponent { let textStyle = { opacity, - color: !disabled && errored? - errorColor: + color: !disabled && errored ? + errorColor : baseColor, }; diff --git a/src/components/label/index.js b/src/components/label/index.js index 82eaf033..2098a9f0 100644 --- a/src/components/label/index.js +++ b/src/components/label/index.js @@ -43,7 +43,7 @@ export default class Label extends PureComponent { y1: PropTypes.number, }), - style: Animated.Text.propTypes.style, + style: PropTypes.object, label: PropTypes.string, }; @@ -69,10 +69,10 @@ export default class Label extends PureComponent { return null; } - let color = disabled? - baseColor: - restricted? - errorColor: + let color = disabled ? + baseColor : + restricted ? + errorColor : focusAnimation.interpolate({ inputRange: [-1, 0, 1], outputRange: [errorColor, baseColor, tintColor],