Skip to content

Commit

Permalink
text field style fix
Browse files Browse the repository at this point in the history
  • Loading branch information
chrismcv committed Oct 16, 2015
1 parent 1e0a4a5 commit d311e64
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/text-field.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,8 @@ const TextField = React.createClass({
inputProps.onChange = this._handleInputChange;
}
if (this.props.children) {
inputElement = React.cloneElement(this.props.children, {...inputProps, ...this.props.children.props});
let childInputStyle = this.mergeStyles(inputStyle, this.props.children.style);
inputElement = React.cloneElement(this.props.children, {...inputProps, ...this.props.children.props, style:childInputStyle});
}
else {
inputElement = multiLine ? (
Expand Down

0 comments on commit d311e64

Please sign in to comment.