From 1060800117f89e9c0d2b4bc85f38f927a7db48e5 Mon Sep 17 00:00:00 2001 From: snturk Date: Mon, 26 Feb 2024 18:16:17 +0300 Subject: [PATCH] Fixed TimePicker value and Min Max Date rules --- .../src/components/DateTimePicker/DateTimePicker.story.tsx | 7 ++++++- .../@mantine/dates/src/components/TimeInput/TimeInput.tsx | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/@mantine/dates/src/components/DateTimePicker/DateTimePicker.story.tsx b/packages/@mantine/dates/src/components/DateTimePicker/DateTimePicker.story.tsx index aef8fbce5f..799b8601fd 100644 --- a/packages/@mantine/dates/src/components/DateTimePicker/DateTimePicker.story.tsx +++ b/packages/@mantine/dates/src/components/DateTimePicker/DateTimePicker.story.tsx @@ -40,15 +40,20 @@ export function WithSeconds() { ); } -export function MinDate() { +export function MinMaxDate() { const minDate = new Date(); minDate.setHours(0, 30, 0, 0); const maxDate = new Date(); maxDate.setDate(maxDate.getDate() + 5); maxDate.setHours(22, 30, 0, 0); + return (
+
+
Min date: {minDate.toLocaleString()}
+
Max date: {maxDate.toLocaleString()}
+
((_props, ref) => { }); const onTimeChange = (event: React.ChangeEvent) => { - if (minTime !== undefined && maxTime !== undefined) { + if (minTime !== undefined || maxTime !== undefined) { const val = event.currentTarget.value; if (val) { @@ -108,6 +108,7 @@ export const TimeInput = factory((_props, ref) => { styles={resolvedStyles} unstyled={unstyled} ref={ref} + value={value} {...others} step={withSeconds ? 1 : 60} onChange={onTimeChange}