|
1 | 1 | import classNames from 'classnames'; |
2 | 2 | import useMergedState from 'rc-util/lib/hooks/useMergedState'; |
| 3 | +import pickAttrs from 'rc-util/lib/pickAttrs'; |
3 | 4 | import raf from 'rc-util/lib/raf'; |
4 | 5 | import warning from 'rc-util/lib/warning'; |
5 | | -import pickAttrs from 'rc-util/lib/pickAttrs'; |
6 | 6 | import * as React from 'react'; |
7 | 7 | import { useEffect, useRef, useState } from 'react'; |
8 | 8 | import type { PickerPanelProps } from '.'; |
@@ -43,12 +43,12 @@ import { |
43 | 43 | isSameWeek, |
44 | 44 | parseValue, |
45 | 45 | } from './utils/dateUtil'; |
| 46 | +import { getClearIcon } from './utils/getClearIcon'; |
46 | 47 | import getExtraFooter from './utils/getExtraFooter'; |
47 | 48 | import getRanges from './utils/getRanges'; |
48 | 49 | import { getValue, toArray, updateValues } from './utils/miscUtil'; |
49 | 50 | import { elementsContains, getDefaultFormat, getInputSize } from './utils/uiUtil'; |
50 | 51 | import { legacyPropsWarning } from './utils/warnUtil'; |
51 | | -import { getClearIcon } from './utils/getClearIcon'; |
52 | 52 |
|
53 | 53 | function reorderValues<DateType>( |
54 | 54 | values: RangeValue<DateType>, |
@@ -407,7 +407,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) { |
407 | 407 | function triggerChange( |
408 | 408 | newValue: RangeValue<DateType>, |
409 | 409 | sourceIndex: 0 | 1, |
410 | | - triggerCalendarChangeOnly?: boolean, |
| 410 | + triggerCalendarChangeOnly?: boolean, |
411 | 411 | ) { |
412 | 412 | let values = newValue; |
413 | 413 | let startValue = getValue(values, 0); |
@@ -576,7 +576,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) { |
576 | 576 | if (delayOpen) { |
577 | 577 | if (needConfirmButton) { |
578 | 578 | // when in dateTime mode, switching between two date input fields will trigger onCalendarChange. |
579 | | - // when onBlur is triggered, the input field has already switched, |
| 579 | + // when onBlur is triggered, the input field has already switched, |
580 | 580 | // so it's necessary to obtain the value of the previous input field here. |
581 | 581 | const needTriggerIndex = mergedActivePickerIndex ? 0 : 1; |
582 | 582 | const selectedIndexValue = getValue(selectedValue, needTriggerIndex); |
@@ -712,18 +712,18 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) { |
712 | 712 | const startStr = |
713 | 713 | mergedValue && mergedValue[0] |
714 | 714 | ? formatValue(mergedValue[0], { |
715 | | - locale, |
716 | | - format: 'YYYYMMDDHHmmss', |
717 | | - generateConfig, |
718 | | - }) |
| 715 | + locale, |
| 716 | + format: 'YYYYMMDDHHmmss', |
| 717 | + generateConfig, |
| 718 | + }) |
719 | 719 | : ''; |
720 | 720 | const endStr = |
721 | 721 | mergedValue && mergedValue[1] |
722 | 722 | ? formatValue(mergedValue[1], { |
723 | | - locale, |
724 | | - format: 'YYYYMMDDHHmmss', |
725 | | - generateConfig, |
726 | | - }) |
| 723 | + locale, |
| 724 | + format: 'YYYYMMDDHHmmss', |
| 725 | + generateConfig, |
| 726 | + }) |
727 | 727 | : ''; |
728 | 728 |
|
729 | 729 | useEffect(() => { |
@@ -775,10 +775,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) { |
775 | 775 | } |
776 | 776 | warning(!dateRender, `'dateRender' is deprecated. Please use 'cellRender' instead.`); |
777 | 777 | warning(!monthCellRender, `'monthCellRender' is deprecated. Please use 'cellRender' instead.`); |
778 | | - warning( |
779 | | - !clearIcon, |
780 | | - '`clearIcon` will be removed in future. Please use `allowClear` instead.', |
781 | | - ); |
| 778 | + warning(!clearIcon, '`clearIcon` will be removed in future. Please use `allowClear` instead.'); |
782 | 779 | } |
783 | 780 |
|
784 | 781 | // ============================ Private ============================ |
@@ -886,7 +883,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) { |
886 | 883 | defaultValue={ |
887 | 884 | mergedActivePickerIndex === 0 ? getValue(selectedValue, 1) : getValue(selectedValue, 0) |
888 | 885 | } |
889 | | - // defaultPickerValue={undefined} |
| 886 | + // defaultPickerValue={undefined} |
890 | 887 | /> |
891 | 888 | </RangeContext.Provider> |
892 | 889 | ); |
@@ -1065,11 +1062,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) { |
1065 | 1062 | ); |
1066 | 1063 | } |
1067 | 1064 |
|
1068 | | - const mergedClearIcon: React.ReactNode = getClearIcon( |
1069 | | - prefixCls, |
1070 | | - allowClear, |
1071 | | - clearIcon, |
1072 | | - ); |
| 1065 | + const mergedClearIcon: React.ReactNode = getClearIcon(prefixCls, allowClear, clearIcon); |
1073 | 1066 |
|
1074 | 1067 | const clearNode: React.ReactNode = ( |
1075 | 1068 | <span |
@@ -1099,10 +1092,10 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) { |
1099 | 1092 | </span> |
1100 | 1093 | ); |
1101 | 1094 |
|
1102 | | - const mergedAllowClear = allowClear && ( |
1103 | | - (getValue(mergedValue as RangeValue<DateType>, 0) && !mergedDisabled[0]) || |
1104 | | - (getValue(mergedValue as RangeValue<DateType>, 1) && !mergedDisabled[1]) |
1105 | | - ); |
| 1095 | + const mergedAllowClear = |
| 1096 | + allowClear && |
| 1097 | + ((getValue(mergedValue as RangeValue<DateType>, 0) && !mergedDisabled[0]) || |
| 1098 | + (getValue(mergedValue as RangeValue<DateType>, 1) && !mergedDisabled[1])); |
1106 | 1099 |
|
1107 | 1100 | const inputSharedProps = { |
1108 | 1101 | size: getInputSize(picker, formatList[0], generateConfig), |
|
0 commit comments