Move Input#validPresent to utils#isValuePresent

old
Phil Myers 2018-02-27 13:19:57 -05:00
parent f24d12800f
commit 1dafc5676f
2 changed files with 9 additions and 8 deletions

View File

@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import { themr } from 'react-css-themr';
import { isValuePresent } from '../utils/utils';
import { INPUT } from '../identifiers';
import InjectedFontIcon from '../font_icon/FontIcon';
@ -159,13 +160,6 @@ const factory = (FontIcon) => {
this.inputNode.focus();
}
valuePresent = value => (
value !== null
&& value !== undefined
&& value !== ''
&& !(typeof value === 'number' && isNaN(value))
)
render() {
const { children, defaultValue, disabled, error, floating, hint, icon,
name, label: labelText, maxLength, multiline, required, role,
@ -180,7 +174,7 @@ const factory = (FontIcon) => {
[theme.withIcon]: icon,
}, this.props.className);
const valuePresent = this.valuePresent(value) || this.valuePresent(defaultValue);
const valuePresent = isValuePresent(value) || isValuePresent(defaultValue);
const inputElementProps = {
...others,

View File

@ -74,3 +74,10 @@ export const getAnimationModule = (animation, theme) => compose(
transformKeys(removeNamespace(animation)),
pickBy((v, k) => k.startsWith(animation)),
)(theme);
export const isValuePresent = value => (
value !== null
&& value !== undefined
&& value !== ''
&& !(typeof value === 'number' && isNaN(value))
);