@@ -5,6 +5,13 @@ import moment from 'moment';
5
5
import ClearIcon from 'material-ui/svg-icons/content/clear' ;
6
6
import { TextField , IconButton } from 'material-ui' ;
7
7
8
+ const styles = {
9
+ container : {
10
+ display : 'flex' ,
11
+ alignItems : 'flex-end' ,
12
+ } ,
13
+ } ;
14
+
8
15
export default class DateTimePicker extends Component {
9
16
static propTypes = {
10
17
// IMPORTANT
@@ -176,7 +183,7 @@ export default class DateTimePicker extends Component {
176
183
firstDayOfWeek, textFieldClassName, autoOkDatePicker,
177
184
datePickerMode, disableYearSelection, shouldDisableDate,
178
185
hideCalendarDate, openToYearSelection, timePickerBodyStyle,
179
- okLabel, autoOkTimePicker, timePickerDialogStyle,
186
+ okLabel, autoOkTimePicker, timePickerDialogStyle, clearIconStyle , style ,
180
187
minutesStep, timePickerDelay, defaultTime,
181
188
showCurrentDateByDefault, returnMomentDate,
182
189
DatePicker, TimePicker,
@@ -190,16 +197,21 @@ export default class DateTimePicker extends Component {
190
197
} = this . props ;
191
198
192
199
return (
193
- < span className = { this . props . className } >
200
+ < div style = { styles . container } className = { this . props . className } >
194
201
< TextField
195
202
onFocus = { this . handleFocus }
196
203
className = { textFieldClassName }
197
204
onClick = { this . openDatePicker }
198
205
value = { this . getDisplayTime ( ) }
206
+ style = { { ...styles . textField , ...style } }
199
207
{ ...other }
200
208
/>
201
209
202
- < IconButton onClick = { this . clearState } >
210
+ < IconButton
211
+ onClick = { this . clearState }
212
+ style = { { ...styles . clearIcon , ...clearIconStyle } }
213
+
214
+ >
203
215
{ clearIcon }
204
216
</ IconButton >
205
217
@@ -233,7 +245,7 @@ export default class DateTimePicker extends Component {
233
245
style = { timePickerDialogStyle }
234
246
minutesStep = { minutesStep }
235
247
/>
236
- </ span >
248
+ </ div >
237
249
) ;
238
250
}
239
251
}
0 commit comments