mirror of
https://github.com/ant-design/ant-design.git
synced 2024-11-29 05:29:37 +08:00
Fix clear icon in RangePicker, close #2252
This commit is contained in:
parent
4b4a55b003
commit
842b55128f
@ -3,6 +3,7 @@ import GregorianCalendar from 'gregorian-calendar';
|
||||
import RangeCalendar from 'rc-calendar/lib/RangeCalendar';
|
||||
import RcDatePicker from 'rc-calendar/lib/Picker';
|
||||
import classNames from 'classnames';
|
||||
import Icon from '../icon';
|
||||
|
||||
export default class RangePicker extends React.Component {
|
||||
static defaultProps = {
|
||||
@ -33,6 +34,13 @@ export default class RangePicker extends React.Component {
|
||||
}
|
||||
}
|
||||
|
||||
clearSelection = (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
this.setState({ value: [] });
|
||||
this.handleChange([]);
|
||||
}
|
||||
|
||||
handleChange = (value) => {
|
||||
const props = this.props;
|
||||
if (!('value' in props)) {
|
||||
@ -100,6 +108,13 @@ export default class RangePicker extends React.Component {
|
||||
/>
|
||||
);
|
||||
|
||||
const clearIcon = (!props.disabled && state.value && (state.value[0] || state.value[1]))
|
||||
? <Icon
|
||||
type="cross-circle"
|
||||
className="ant-calendar-picker-clear"
|
||||
onClick={this.clearSelection}
|
||||
/> : null;
|
||||
|
||||
return (<span className={props.pickerClass} style={style}>
|
||||
<RcDatePicker
|
||||
formatter={props.getFormatter()}
|
||||
@ -136,6 +151,7 @@ export default class RangePicker extends React.Component {
|
||||
placeholder={endPlaceholder}
|
||||
className="ant-calendar-range-picker-input"
|
||||
/>
|
||||
{clearIcon}
|
||||
<span className="ant-calendar-picker-icon" />
|
||||
</span>
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user