text field style fix

chrismcv · chrismcv · commit d311e64e623d · 2015-10-16T10:25:20.000+01:00
diff --git a/src/text-field.jsx b/src/text-field.jsx
@@ -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 ? (

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