Fixed TimePicker value and Min Max Date rules

mantinedev · Feb 26, 2024 · 1060800 · 1060800
1 parent 2c97436
commit 1060800
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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 (
     <div style={{ padding: 40, maxWidth: 400 }}>
+      <div style={{ marginBottom: 20 }}>
+        <div>Min date: {minDate.toLocaleString()}</div>
+        <div>Max date: {maxDate.toLocaleString()}</div>
+      </div>
       <DateTimePicker
         placeholder="Date time picker"
         withSeconds

diff --git a/packages/@mantine/dates/src/components/TimeInput/TimeInput.tsx b/packages/@mantine/dates/src/components/TimeInput/TimeInput.tsx
@@ -59,7 +59,7 @@ export const TimeInput = factory<TimeInputFactory>((_props, ref) => {
   });
 
   const onTimeChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    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<TimeInputFactory>((_props, ref) => {
       styles={resolvedStyles}
       unstyled={unstyled}
       ref={ref}
+      value={value}
       {...others}
       step={withSeconds ? 1 : 60}
       onChange={onTimeChange}