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

oliviertassinari · oliviertassinari · commit 26fef66b5886 · 2015-10-27T10:56:44.000+01:00
[TextField] Fix children style
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 ? (

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,8 @@ const TextField = React.createClass({`
`332`	`332`	`inputProps.onChange = this._handleInputChange;`
`333`	`333`	`}`
`334`	`334`	`if (this.props.children) {`
`335`		`- inputElement = React.cloneElement(this.props.children, {...inputProps, ...this.props.children.props});`
	`335`	`+ let childInputStyle = this.mergeStyles(inputStyle, this.props.children.style);`
	`336`	`+ inputElement = React.cloneElement(this.props.children, {...inputProps, ...this.props.children.props, style:childInputStyle});`
`336`	`337`	`}`
`337`	`338`	`else {`
`338`	`339`	`inputElement = multiLine ? (`