Merge pull request mui#1830 from mbrookes/patch-4

[TimePicker] Document floatingLabelText and hintText
louy · Oct 19, 2015 · 1166f42 · 1166f42
2 parents f6fe02a + acd21b0
commit 1166f42
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/docs/src/app/components/pages/components/time-picker.jsx b/docs/src/app/components/pages/components/time-picker.jsx
@@ -19,12 +19,24 @@ let TimePickerPage = React.createClass({
             header: 'optional',
             desc: 'This is the initial time value of the component.'
           },
+          {
+            name: 'floatingLabelText',
+            type: 'string',
+            header: 'optional',
+            desc: 'The text string to use for the floating label element.'
+          },
           {
             name: 'format',
             type: 'one of: ampm, 24hr',
             header: 'default: ampm',
             desc: 'Tells the component to display the picker in ampm (12hr) format or 24hr format.'
           },
+          {
+            name: 'hintText',
+            type: 'string',
+            header: 'optional',
+            desc: 'The hint text string to display. Note, floatingLabelText will overide this.'
+          },
           {
             name: 'pedantic',
             type: 'boolean',