Skip to content

[@mantine/dates] TimePicker min max fix #7904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2025
Merged

[@mantine/dates] TimePicker min max fix #7904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd50e1
[@mantine/dates] TimePicker min max fix
Han5991 May 27, 2025
d2e8026
[chore] Cleanup
Han5991 May 27, 2025
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
50 changes: 50 additions & 0 deletions packages/@mantine/dates/src/components/TimePicker/TimePicker.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,56 @@ describe('@mantine/dates/TimePicker', () => {
expect(spy).toHaveBeenCalledWith('18:30:00');
});

it('allows typing multiple valid values within min/max range without resetting to max', async () => {
const spy = jest.fn();
render(
<TimePicker
{...defaultProps}
withSeconds
format="24h"
min="08:00:00"
max="18:00:00"
onChange={spy}
/>
);

await userEvent.type(screen.getByLabelText('test-hours'), '10');
await userEvent.type(screen.getByLabelText('test-minutes'), '30');
await userEvent.type(screen.getByLabelText('test-seconds'), '00');
expect(spy).toHaveBeenCalledWith('10:30:00');
expect(screen.getByLabelText('test-hours')).toHaveValue('10');
expect(screen.getByLabelText('test-minutes')).toHaveValue('30');
expect(screen.getByLabelText('test-seconds')).toHaveValue('00');

await userEvent.clear(screen.getByLabelText('test-hours'));
await userEvent.clear(screen.getByLabelText('test-minutes'));
await userEvent.clear(screen.getByLabelText('test-seconds'));
spy.mockClear();

await userEvent.type(screen.getByLabelText('test-hours'), '12');
await userEvent.type(screen.getByLabelText('test-minutes'), '45');
await userEvent.type(screen.getByLabelText('test-seconds'), '30');

expect(spy).toHaveBeenCalledWith('12:45:30');
expect(screen.getByLabelText('test-hours')).toHaveValue('12');
expect(screen.getByLabelText('test-minutes')).toHaveValue('45');
expect(screen.getByLabelText('test-seconds')).toHaveValue('30');

await userEvent.clear(screen.getByLabelText('test-hours'));
await userEvent.clear(screen.getByLabelText('test-minutes'));
await userEvent.clear(screen.getByLabelText('test-seconds'));
spy.mockClear();

await userEvent.type(screen.getByLabelText('test-hours'), '15');
await userEvent.type(screen.getByLabelText('test-minutes'), '15');
await userEvent.type(screen.getByLabelText('test-seconds'), '15');

expect(spy).toHaveBeenCalledWith('15:15:15');
expect(screen.getByLabelText('test-hours')).toHaveValue('15');
expect(screen.getByLabelText('test-minutes')).toHaveValue('15');
expect(screen.getByLabelText('test-seconds')).toHaveValue('15');
});

it('handles default value correctly', async () => {
render(<TimePicker {...defaultProps} withSeconds defaultValue="12:34:55" />);
expect(screen.getByLabelText('test-hours')).toHaveValue('12');
Expand Down
27 changes: 14 additions & 13 deletions packages/@mantine/dates/src/components/TimePicker/use-time-picker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type {
TimePickerPasteSplit,
} from './TimePicker.types';
import { clampTime } from './utils/clamp-time/clamp-time';
import { convertTimeTo12HourFormat, getParsedTime } from './utils/get-parsed-time/get-parsed-time';
import { getParsedTime } from './utils/get-parsed-time/get-parsed-time';
import { getTimeString } from './utils/get-time-string/get-time-string';

interface UseTimePickerInput {
Expand Down Expand Up @@ -86,19 +86,20 @@ export function useTimePicker({

if (timeString.valid) {
acceptChange.current = false;
if (field === 'hours') {
setHours(val);
}
if (field === 'minutes') {
setMinutes(val);
}
if (field === 'seconds') {
setSeconds(val);
}
if (field === 'amPm') {
setAmPm(val);
}

const clamped = clampTime(timeString.value, min || '00:00:00', max || '23:59:59');
const converted =
format === '12h'
? convertTimeTo12HourFormat({
hours: clamped.hours,
minutes: clamped.minutes,
seconds: clamped.seconds,
amPmLabels,
})
: clamped;
setHours(converted.hours);
setMinutes(converted.minutes);
setSeconds(converted.seconds);
onChange?.(clamped.timeString);
} else {
acceptChange.current = false;
Expand Down
Loading