[@mantine/dates] DateTimePicker: Fix timezone conversion being applie…

…d twice (#7400)
mantinedev · Jan 26, 2025 · f7347e9 · f7347e9
1 parent c2920f1
commit f7347e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/@mantine/dates/src/components/DateTimePicker/DateTimePicker.test.tsx b/packages/@mantine/dates/src/components/DateTimePicker/DateTimePicker.test.tsx
@@ -192,15 +192,15 @@ describe('@mantine/dates/DateTimePicker', () => {
         />
       </DatesProvider>
     );
-    expectValue(container, '01/02/2022 09:00 +00:00');
+    expectValue(container, '01/02/2022 04:00 +00:00');
 
     await clickInput(container);
     await userEvent.click(container.querySelectorAll('table button')[6]);
-    expectValue(container, '06/02/2022 09:00 +00:00');
+    expectValue(container, '06/02/2022 04:00 +00:00');
 
     await userEvent.clear(getTimeInput());
     await userEvent.type(getTimeInput(), '14:45');
-    expectValue(container, '06/02/2022 19:45 +00:00');
+    expectValue(container, '06/02/2022 14:45 +00:00');
   });
 
   it('supports controlled state', async () => {
@@ -229,11 +229,11 @@ describe('@mantine/dates/DateTimePicker', () => {
         />
       </DatesProvider>
     );
-    expectValue(container, '01/02/2022 09:00 +00:00');
+    expectValue(container, '01/02/2022 04:00 +00:00');
 
     await clickInput(container);
     await userEvent.click(container.querySelectorAll('table button')[6]);
-    expectValue(container, '01/02/2022 09:00 +00:00');
+    expectValue(container, '01/02/2022 04:00 +00:00');
     expect(spy).toHaveBeenLastCalledWith(new Date(2022, 1, 5, 23));
   });
 

diff --git a/packages/@mantine/dates/src/components/DateTimePicker/DateTimePicker.tsx b/packages/@mantine/dates/src/components/DateTimePicker/DateTimePicker.tsx
@@ -154,7 +154,7 @@ export const DateTimePicker = factory<DateTimePickerFactory>((_props, ref) => {
 
   const [dropdownOpened, dropdownHandlers] = useDisclosure(false);
   const formattedValue = _value
-    ? dayjs(_value).locale(ctx.getLocale(locale)).tz(ctx.getTimezone()).format(_valueFormat)
+    ? dayjs(_value).locale(ctx.getLocale(locale)).tz(ctx.getTimezone(), true).format(_valueFormat)
     : '';
 
   const handleTimeChange = (event: React.ChangeEvent<HTMLInputElement>) => {