Skip to content

Commit 32722e3

Browse files
authored
Revert "fix(date-range-quick-picker): support the time disabled of props (min…" (#2075)
This reverts commit ce2a2e1.
1 parent 8e25ae6 commit 32722e3

File tree

4 files changed

+3
-120
lines changed

4 files changed

+3
-120
lines changed

packages/zent/__tests__/date-range-quick-picker.spec.jsx

+2-19
Original file line numberDiff line numberDiff line change
@@ -36,47 +36,30 @@ describe('DateRangeQuickPicker', () => {
3636
value={[1524106071377, 1524107071377]}
3737
onChange={onChange}
3838
valueType="number"
39-
format="YYYY-MM-DD HH:mm:ss"
40-
min="2020-04-19 10:05:12"
41-
max="2025-01-01 12:05:12"
4239
/>
4340
);
4441

4542
wrapper.instance().handleChosenDays(1);
4643
expect(onChange.mock.calls.length).toBe(1);
47-
wrapper.find('.zent-datepicker-trigger').at(1).simulate('click');
4844
});
4945

5046
it('suppports default preset', () => {
5147
const onChange = jest.fn();
52-
const wrapper = mount(
48+
mount(
5349
<DateRangeQuickPicker
5450
value={[1524106071377, 1524107071377]}
5551
onChange={onChange}
5652
defaultSelectedPresetIndex={0}
57-
disabledDate={{
58-
min: '2018-04-19 10:05:12',
59-
max: '2018-04-19 15:05:12',
60-
}}
6153
/>
6254
);
6355
expect(onChange.mock.calls.length).toBe(0);
64-
wrapper.find('.zent-datepicker-trigger').at(0).simulate('click');
6556

66-
const wrapper2 = mount(
57+
mount(
6758
<DateRangeQuickPicker
6859
onChange={onChange}
6960
defaultSelectedPresetIndex={0}
70-
disabledTime={() => {
71-
return {
72-
disabledHours: () => [],
73-
disabledMinutes: () => [],
74-
disabledSeconds: () => [],
75-
};
76-
}}
7761
/>
7862
);
7963
expect(onChange.mock.calls.length).toBe(1);
80-
wrapper2.find('.zent-datepicker-trigger').at(1).simulate('click');
8164
});
8265
});

packages/zent/src/date-picker/components/RangePickerBase.tsx

+1-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import useRangeMergedProps from '../hooks/useRangeMergedProps';
66
import useRangeDisabledDate from '../hooks/useRangeDisabledDate';
77
import { useShowTimeRangeOption } from '../hooks/useShowTimeOption';
88
import useNormalizeDisabledDate from '../hooks/useNormalizeDisabledDate';
9-
import useNormalizeDisabledTime from '../hooks/useNormalizeDisabledTime';
109
import { useEventCallbackRef } from '../../utils/hooks/useEventCallbackRef';
1110

1211
import {
@@ -47,7 +46,7 @@ const RangePicker: React.FC<IRangePickerProps> = ({
4746
onChange,
4847
onClose,
4948
onOpen,
50-
disabledTime: disabledTimeProps,
49+
disabledTime,
5150
generateDate,
5251
PickerComponent,
5352
showTime,
@@ -105,12 +104,6 @@ const RangePicker: React.FC<IRangePickerProps> = ({
105104
[start, end, showTime, onChangeRef, getCallbackRangeValue, setSelected]
106105
);
107106

108-
const disabledTime = useNormalizeDisabledTime(
109-
format,
110-
disabledDateProps,
111-
disabledTimeProps
112-
);
113-
114107
const { disabledStartTimes, disabledEndTimes } = useRangeDisabledTime({
115108
selected,
116109
disabledTime,

packages/zent/src/date-picker/hooks/useNormalizeDisabledTime.ts

-16
This file was deleted.

packages/zent/src/date-picker/utils/unifiedDisabledTimeFromProps.ts

-77
This file was deleted.

0 commit comments

Comments
 (0)