Merge pull request mui#1896 from chrismcv/text-field-fix

[TextField] Fix children style
tyfoo · Oct 27, 2015 · 26fef66 · 26fef66
2 parents efbbb15 + d311e64
commit 26fef66
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/text-field.jsx b/src/text-field.jsx
@@ -332,7 +332,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 ? (