diff --git a/components/date_picker/index.jsx b/components/date_picker/index.jsx
index 1490edee..82a6b07a 100644
--- a/components/date_picker/index.jsx
+++ b/components/date_picker/index.jsx
@@ -7,17 +7,13 @@ import time from '../utils/time';
class DatePicker extends React.Component {
static propTypes = {
+ label: React.PropTypes.string,
maxDate: React.PropTypes.object,
minDate: React.PropTypes.object,
onChange: React.PropTypes.func,
- placeholder: React.PropTypes.string,
value: React.PropTypes.object
};
- static defaultProps = {
- placeholder: 'Choose a date'
- };
-
state = {
active: false
};
@@ -45,7 +41,7 @@ class DatePicker extends React.Component {
-
-
+
+
);
}
@@ -37,6 +37,7 @@ class DatePickerTest extends React.Component {
| Name | Type | Default | Description|
|:-----|:-----|:-----|:-----|
+| `label` | `String` | | The text string to use for the floating label element in the input component.|
| `maxDate` | `Date` | | Date object with the maximum selectable date. |
| `minDate` | `Date` | | Date object with the minimum selectable date. |
| `onChange` | `Function` | | Callback called when the picker value is changed.|
diff --git a/components/time_picker/index.jsx b/components/time_picker/index.jsx
index 6efd6e58..f92e3dc5 100644
--- a/components/time_picker/index.jsx
+++ b/components/time_picker/index.jsx
@@ -9,6 +9,7 @@ class TimePicker extends React.Component {
static propTypes = {
className: React.PropTypes.string,
format: React.PropTypes.oneOf(['24hr', 'ampm']),
+ label: React.PropTypes.string,
onChange: React.PropTypes.func,
value: React.PropTypes.object
};
@@ -43,8 +44,8 @@ class TimePicker extends React.Component {
(
-
+
);
```
@@ -21,5 +21,6 @@ const TimePickerTest = () => (
|:-----|:-----|:-----|:-----|
| `className` | `String` | `''` | Sets a class to give customized styles.|
| `format` | `String` | `24hr` | Format to display the clock. It can be `24hr` or `ampm`.|
+| `label` | `String` | | The text string to use for the floating label element in the input component.|
| `onChange` | `Function` | | Callback called when the picker value is changed.|
| `value` | `Date` | | Datetime object with currrently selected time |
diff --git a/docs/app/components/layout/main/modules/examples/datepicker_example_1.txt b/docs/app/components/layout/main/modules/examples/datepicker_example_1.txt
index 77abdfb7..e44e507c 100644
--- a/docs/app/components/layout/main/modules/examples/datepicker_example_1.txt
+++ b/docs/app/components/layout/main/modules/examples/datepicker_example_1.txt
@@ -18,12 +18,17 @@ class DatePickerTest extends React.Component {
render () {
return (
);
diff --git a/docs/app/components/layout/main/modules/examples/timepicker_example_1.txt b/docs/app/components/layout/main/modules/examples/timepicker_example_1.txt
index 599fd668..b29784a4 100644
--- a/docs/app/components/layout/main/modules/examples/timepicker_example_1.txt
+++ b/docs/app/components/layout/main/modules/examples/timepicker_example_1.txt
@@ -3,7 +3,7 @@ selectedTime.setHours(17);
selectedTime.setMinutes(28);
const TimePickerTest = () => (
-
+
);
return
diff --git a/spec/components/pickers.jsx b/spec/components/pickers.jsx
index b1ec213d..02c5dd0c 100644
--- a/spec/components/pickers.jsx
+++ b/spec/components/pickers.jsx
@@ -27,16 +27,32 @@ class PickersTest extends React.Component {
Pickers
Date pickers and time pickers with Material flavour.
-
-
-
+
+
+
+
+
);
}