Skip to content

Commit 819f476

Browse files
committed
Fix fullwidth indent issue
1 parent 6f83cf6 commit 819f476

File tree

2 files changed

+27
-16
lines changed

2 files changed

+27
-16
lines changed

demo/src/Demo.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,17 @@ export default class Demo extends React.Component {
1919
render() {
2020
return (
2121
<div>
22-
<div className="datepicker">
23-
<DateTimePicker
24-
ref="picker"
25-
DatePicker={DatePickerDialog}
26-
TimePicker={TimePickerDialog}
27-
floatingLabelText="Get my date"
28-
format={this.state.format}
29-
timePickerDelay={this.state.delay}
30-
defaultTime={this.state.defaultTime}
31-
onChange={selectedDate => this.setState({ selectedDate })}
32-
/>
33-
</div>
22+
<DateTimePicker
23+
ref="picker"
24+
className="datepicker"
25+
DatePicker={DatePickerDialog}
26+
TimePicker={TimePickerDialog}
27+
floatingLabelText="Get my date"
28+
format={this.state.format}
29+
timePickerDelay={this.state.delay}
30+
defaultTime={this.state.defaultTime}
31+
onChange={selectedDate => this.setState({ selectedDate })}
32+
/>
3433

3534
<div className="options">
3635
<Card className="option">

src/DateTimePicker.jsx

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ import moment from 'moment';
55
import ClearIcon from 'material-ui/svg-icons/content/clear';
66
import { TextField, IconButton } from 'material-ui';
77

8+
const styles = {
9+
container: {
10+
display: 'flex',
11+
alignItems: 'flex-end',
12+
},
13+
};
14+
815
export default class DateTimePicker extends Component {
916
static propTypes = {
1017
// IMPORTANT
@@ -176,7 +183,7 @@ export default class DateTimePicker extends Component {
176183
firstDayOfWeek, textFieldClassName, autoOkDatePicker,
177184
datePickerMode, disableYearSelection, shouldDisableDate,
178185
hideCalendarDate, openToYearSelection, timePickerBodyStyle,
179-
okLabel, autoOkTimePicker, timePickerDialogStyle,
186+
okLabel, autoOkTimePicker, timePickerDialogStyle, clearIconStyle, style,
180187
minutesStep, timePickerDelay, defaultTime,
181188
showCurrentDateByDefault, returnMomentDate,
182189
DatePicker, TimePicker,
@@ -190,16 +197,21 @@ export default class DateTimePicker extends Component {
190197
} = this.props;
191198

192199
return (
193-
<span className={this.props.className}>
200+
<div style={styles.container} className={this.props.className}>
194201
<TextField
195202
onFocus={this.handleFocus}
196203
className={textFieldClassName}
197204
onClick={this.openDatePicker}
198205
value={this.getDisplayTime()}
206+
style={{ ...styles.textField, ...style }}
199207
{...other}
200208
/>
201209

202-
<IconButton onClick={this.clearState}>
210+
<IconButton
211+
onClick={this.clearState}
212+
style={{ ...styles.clearIcon, ...clearIconStyle }}
213+
214+
>
203215
{ clearIcon }
204216
</IconButton>
205217

@@ -233,7 +245,7 @@ export default class DateTimePicker extends Component {
233245
style={timePickerDialogStyle}
234246
minutesStep={minutesStep}
235247
/>
236-
</span>
248+
</div>
237249
);
238250
}
239251
}

0 commit comments

Comments
 (0)