Skip to content

Commit c5effa8

Browse files
Merge pull request #22 from AleVul/master
Remove IconButton if clearIcon is null
2 parents a6068cd + fb59b98 commit c5effa8

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

src/DateTimePicker.jsx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export default class DateTimePicker extends Component {
105105
}
106106

107107
// eslint-disable-next-line
108-
getInitialTime = () => this.props.value
108+
getInitialTime = () => this.props.value
109109
? moment(this.props.value)
110110
: null
111111

@@ -226,13 +226,16 @@ export default class DateTimePicker extends Component {
226226
{...other}
227227
/>
228228

229-
<IconButton
230-
onClick={this.clearState}
231-
style={{ ...styles.clearIcon, ...clearIconStyle }}
232-
disabled={disabled}
233-
>
234-
{ clearIcon }
235-
</IconButton>
229+
{
230+
clearIcon
231+
? <IconButton
232+
onClick={this.clearState}
233+
style={{ ...styles.clearIcon, ...clearIconStyle }}
234+
disabled={disabled}>
235+
{ clearIcon }
236+
</IconButton>
237+
: null
238+
}
236239

237240
<DatePicker
238241
ref={(node) => { this.datePicker = node; }}

0 commit comments

Comments
 (0)