Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/PickerInput/RangePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -369,14 +369,16 @@ function RangePicker<DateType extends object = any>(
? (date: DateType) => {
const range = getActiveRange(activeIndex);
const fromDate = getFromDate(calendarValue, triggeredFields, activeIndex);
return disabledTime(date, range, {
const targetDate = picker === 'time' ? generateConfig.getNow() : date;

return disabledTime(targetDate, range, {
from: fromDate,
});
}
: undefined;

return { ...showTime, disabledTime: proxyDisabledTime };
}, [showTime, activeIndex, calendarValue, triggeredFields]);
}, [showTime, activeIndex, calendarValue, triggeredFields, picker, generateConfig]);

// ========================= Mode =========================
const [modes, setModes] = useControlledState<[PanelMode, PanelMode]>([picker, picker], mode);
Expand Down
17 changes: 16 additions & 1 deletion src/PickerInput/SinglePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,21 @@ function Picker<DateType extends object = any>(
[mergedOpen],
);

// ======================= ShowTime =======================
/** Used for Popup panel */
const mergedShowTime = React.useMemo<SharedTimeProps<DateType>>(() => {
if (!showTime) {
return null;
}

const { disabledTime } = showTime;
const proxyDisabledTime = disabledTime
? (date: DateType) => disabledTime(picker === 'time' ? generateConfig.getNow() : date)
: undefined;

return { ...showTime, disabledTime: proxyDisabledTime };
}, [showTime, picker, generateConfig]);

// ======================= Validate =======================
const [submitInvalidates, onSelectorInvalid] = useFieldsInvalidate(
calendarValue,
Expand Down Expand Up @@ -561,7 +576,7 @@ function Picker<DateType extends object = any>(
// MISC
{...panelProps}
showNow={mergedShowNow}
showTime={showTime}
showTime={mergedShowTime}
// Disabled
disabledDate={disabledDate}
// Focus
Expand Down
3 changes: 2 additions & 1 deletion src/PickerInput/hooks/useInvalidate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ export default function useInvalidate<DateType extends object = any>(

if ((picker === 'date' || picker === 'time') && showTime) {
const range = info && info.activeIndex === 1 ? 'end' : 'start';
const targetDate = picker === 'time' ? generateConfig.getNow() : date;
const { disabledHours, disabledMinutes, disabledSeconds, disabledMilliseconds } =
showTime.disabledTime?.(date, range, { from: outsideInfo.from }) || {};
showTime.disabledTime?.(targetDate, range, { from: outsideInfo.from }) || {};

const {
disabledHours: legacyDisabledHours,
Expand Down
66 changes: 66 additions & 0 deletions tests/disabledTime.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ import {

const fakeTime = getDay('1990-09-03 00:00:00').valueOf();

function getHourTexts() {
return Array.from(
document.querySelector('.rc-picker-time-panel-column').querySelectorAll('li'),
(cell) => cell.textContent,
);
}

describe('Picker.DisabledTime', () => {
beforeEach(() => {
resetWarned();
Expand Down Expand Up @@ -44,6 +51,39 @@ describe('Picker.DisabledTime', () => {
).toHaveLength(59);
});

it('uses current time for disabledTime on TimePicker', () => {
jest.setSystemTime(getDay('1990-09-03 12:00:00').valueOf());
const disabledTime = jest.fn((now: Dayjs) => ({
disabledHours: () => [now.hour()],
}));

render(<DayPicker open picker="time" hideDisabledOptions disabledTime={disabledTime} />);

expect(getHourTexts()).not.toContain('12');
expect(getHourTexts()).toContain('14');

const callCountBeforeSelect = disabledTime.mock.calls.length;
selectCell('14');

expect(disabledTime.mock.calls.length).toBeGreaterThan(callCountBeforeSelect);
disabledTime.mock.calls.forEach(([now]) => {
expect(now.hour()).toBe(12);
});
expect(getHourTexts()).not.toContain('12');
expect(getHourTexts()).toContain('14');
});

it('uses selected date for disabledTime on DatePicker with showTime', () => {
const disabledTime = jest.fn((date: Dayjs) => ({
disabledHours: () => [date.hour() + 1],
}));
const selectedDate = getDay('1989-11-28 14:00:00');

render(<DayPicker open showTime defaultValue={selectedDate} disabledTime={disabledTime} />);

expect(disabledTime.mock.calls.some(([date]) => date.isSame(selectedDate, 'day'))).toBeTruthy();
});

it('disabledTime on TimeRangePicker', () => {
const { container } = render(
<DayRangePicker
Expand Down Expand Up @@ -71,6 +111,32 @@ describe('Picker.DisabledTime', () => {
).toHaveLength(2);
});

it('uses current time for disabledTime on TimeRangePicker', () => {
jest.setSystemTime(getDay('1990-09-03 12:00:00').valueOf());
const disabledTime = jest.fn((now: Dayjs) => ({
disabledHours: () => [now.hour()],
}));

const { container } = render(
<DayRangePicker picker="time" hideDisabledOptions disabledTime={disabledTime} />,
);

openPicker(container);

expect(getHourTexts()).not.toContain('12');
expect(getHourTexts()).toContain('14');

const callCountBeforeSelect = disabledTime.mock.calls.length;
selectCell('14');

expect(disabledTime.mock.calls.length).toBeGreaterThan(callCountBeforeSelect);
disabledTime.mock.calls.forEach(([now]) => {
expect(now.hour()).toBe(12);
});
expect(getHourTexts()).not.toContain('12');
expect(getHourTexts()).toContain('14');
});

it('disabledTime', async () => {
/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
const disabledTime = jest.fn((_: Dayjs | null, __: 'start' | 'end') => {
Expand Down