From edb8ad9cfa2c977042e16f35803ba3561cd86fa5 Mon Sep 17 00:00:00 2001
From: Thomas Guillory <thomas.guillory@dashlane.com>
Date: Wed, 9 Mar 2016 19:01:18 +0100
Subject: [PATCH] [TextField] Add floatingLabelFixed property

Currently there is no way to force the floating label to float.
---
 .../pages/components/TextField/ExampleSimple.jsx      |  5 +++++
 src/TextField/TextField.jsx                           | 11 +++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/src/app/components/pages/components/TextField/ExampleSimple.jsx b/docs/src/app/components/pages/components/TextField/ExampleSimple.jsx
index e7fdad43767b51..60f7e06d077618 100644
--- a/docs/src/app/components/pages/components/TextField/ExampleSimple.jsx
+++ b/docs/src/app/components/pages/components/TextField/ExampleSimple.jsx
@@ -18,6 +18,11 @@ const TextFieldExampleSimple = () => (
       hintText="Hint Text"
       floatingLabelText="Floating Label Text"
     /><br />
+    <TextField
+      hintText="Hint Text"
+      floatingLabelText="Fixed Floating Label Text"
+      floatingLabelFixed={true}
+    /><br />
     <TextField
       hintText="Password Field"
       floatingLabelText="Password"
diff --git a/src/TextField/TextField.jsx b/src/TextField/TextField.jsx
index 70d293db205d03..5f31da69c2791a 100644
--- a/src/TextField/TextField.jsx
+++ b/src/TextField/TextField.jsx
@@ -142,6 +142,11 @@ const TextField = React.createClass({
      */
     errorText: React.PropTypes.node,
 
+    /**
+     * If true, the floating label will float even when there is no value.
+     */
+    floatingLabelFixed: React.PropTypes.bool,
+
     /**
      * The style object to use to override floating label styles.
      */
@@ -404,6 +409,7 @@ const TextField = React.createClass({
       disabled,
       errorStyle,
       errorText,
+      floatingLabelFixed,
       floatingLabelText,
       fullWidth,
       hintText,
@@ -443,7 +449,7 @@ const TextField = React.createClass({
         muiTheme={this.state.muiTheme}
         style={Object.assign(styles.floatingLabel, this.props.floatingLabelStyle)}
         htmlFor={inputId}
-        shrink={this.state.hasValue || this.state.isFocused}
+        shrink={this.state.hasValue || this.state.isFocused || floatingLabelFixed}
         disabled={disabled}
       >
         {floatingLabelText}
@@ -501,7 +507,8 @@ const TextField = React.createClass({
         {hintText ?
           <TextFieldHint
             muiTheme={this.state.muiTheme}
-            show={!(this.state.hasValue || (floatingLabelText && !this.state.isFocused))}
+            show={!(this.state.hasValue || (floatingLabelText && !this.state.isFocused)) ||
+                  (!this.state.hasValue && floatingLabelText && floatingLabelFixed && !this.state.isFocused)}
             style={hintStyle}
             text={hintText}
           /> :