From d311e64e623d0201fe0603b139ac5d98731f09fc Mon Sep 17 00:00:00 2001
From: Chris McVittie <chris.mcvittie@blue-zinc.com>
Date: Fri, 16 Oct 2015 10:25:20 +0100
Subject: [PATCH] text field style fix

---
 src/text-field.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/text-field.jsx b/src/text-field.jsx
index 6f8f2ea1742adf..42decccd8c9fd5 100644
--- 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 ? (