Skip to content

add error state when !isNumber to Numeric component #823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 10, 2019
Merged

add error state when !isNumber to Numeric component #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f65f533
add error state when !isNumber to Numeric component
VeraZab Jan 9, 2019
ece388f
extend scss class
VeraZab Jan 9, 2019
f0b6396
make outline color on focus sienna as well
VeraZab Jan 9, 2019
9bd9bfd
get back defaults
VeraZab Jan 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions src/components/widgets/NumericInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,25 @@ export default class NumericInput extends Component {
constructor(props) {
super(props);

this.state = {value: props.value};
this.state = {
value: props.value,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is not a new code addition, but assigning props to state is such an antipattern.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's our way of not having plotly.js reject the value and override with its default

numericInputClassName: this.getNumericInputClassName(props.value),
};

this.onChange = this.onChange.bind(this);
this.updateValue = this.updateValue.bind(this);
this.onKeyDown = this.onKeyDown.bind(this);
this.onWheel = this.onWheel.bind(this);
}

getNumericInputClassName(value) {
return isNumeric(value) || value === ''
? `numeric-input__number ${this.props.editableClassName ? this.props.editableClassName : ''}`
: `numeric-input__number--error ${
this.props.editableClassName ? this.props.editableClassName : ''
}`;
}

componentWillReceiveProps(nextProps) {
if (nextProps.value !== this.state.value) {
this.setState({value: nextProps.value});
Expand Down Expand Up @@ -49,17 +61,28 @@ export default class NumericInput extends Component {
}

onChange(value) {
this.setState({value});
this.setState({value, numericInputClassName: this.getNumericInputClassName(value)});
}

updateValue(newValue) {
const {max, min, integerOnly, value: propsValue} = this.props;
const {max, min, integerOnly} = this.props;
let updatedValue = newValue;

if (updatedValue === '') {
this.setState({
value: this.props.value,
numericInputClassName: this.getNumericInputClassName(this.props.value),
});
return;
}

// When the user blurs on non-numeric data reset the component
// to the last known good value (this.props.value).
if (!isNumeric(updatedValue)) {
this.setState({value: propsValue});
this.setState({
value: updatedValue,
numericInputClassName: this.getNumericInputClassName(updatedValue),
});
return;
}

Expand Down Expand Up @@ -151,7 +174,7 @@ export default class NumericInput extends Component {
return (
<div className="numeric-input__wrapper">
<EditableText
className={`numeric-input__number ${this.props.editableClassName}`}
className={this.state.numericInputClassName}
placeholder={this.props.placeholder}
text={this.state.value}
type="text"
Expand Down
11 changes: 11 additions & 0 deletions src/styles/components/widgets/_numeric-input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,17 @@
font-family: inherit;
}

.numeric-input__number--error {
@extend .numeric-input__number;
border-color: var(--color-sienna);
}

.numeric-input__number--error:focus {
@extend .numeric-input__number;
border-color: var(--color-sienna);
outline-color: var(--color-sienna);
}

.numeric-input__caret-box {
display: inline-block;
max-height: 32px;
Expand Down