From 387065ed75d5155d355dcfe2a14777ced3c4c887 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 6 Nov 2018 09:05:14 -0500 Subject: [PATCH] fixes error state in textarea --- src/components/field-types/Textarea/index.js | 6 ++++-- src/components/field-types/Textarea/index.scss | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/field-types/Textarea/index.js b/src/components/field-types/Textarea/index.js index eb256d0902..562d2c2b94 100644 --- a/src/components/field-types/Textarea/index.js +++ b/src/components/field-types/Textarea/index.js @@ -55,11 +55,13 @@ class Textarea extends Component { ? this.props.context.fields[this.props.name].valid : true; + const showError = valid === false && this.props.context.submitted; + const Required = this.props.required ? () => * : () => null; - let Error = valid === false && this.props.context.submitted + let Error = showError ? () => {this.errors.text} : () => null; @@ -68,7 +70,7 @@ class Textarea extends Component { : () => null; let className = 'interact textarea'; - className = this.props.valid !== false ? className : `${className} error`; + className = !showError ? className : `${className} error`; let style = this.props.style ? this.props.style diff --git a/src/components/field-types/Textarea/index.scss b/src/components/field-types/Textarea/index.scss index 97793ac354..c2e29e9f1a 100644 --- a/src/components/field-types/Textarea/index.scss +++ b/src/components/field-types/Textarea/index.scss @@ -32,7 +32,7 @@ &.error { textarea { - border: 2px solid $pink; + background-color: lighten($pink, 15%); } }