Merge pull request #130 from DmitriySevkovych/fix/dates-shift-utc

Fix: correct Calendar date display

apps/frontend/src/components/Calendar.tsx

@@ -1,8 +1,4 @@
-import {
-    formatDate,
-    formatDateToWords,
-    handleUnwantedTimezoneShift,
-} from 'domain-model'
+import { dateFromString, formatDate, formatDateToWords } from 'domain-model'
 import { CalendarIcon } from 'lucide-react'
 import React, { useState } from 'react'
 import { ControllerRenderProps, UseFormReturn } from 'react-hook-form'
@@ -34,7 +30,7 @@ export function Calendar<T>(props: CalendarProps<T>) {
         field: ControllerRenderProps<any, string>,
         selectedDate: Date
     ) => {
-        field.onChange(handleUnwantedTimezoneShift(selectedDate))
+        field.onChange(dateFromString(selectedDate.toISOString()))
         setIsOpen(false)
     }
 
@@ -95,7 +91,11 @@ export const CalendarStandalone: React.FC<CalendarStandaloneProps> = ({
     const [isOpen, setIsOpen] = useState<boolean>(false)
 
     const handleSelect = (selectedDate: Date | undefined) => {
-        setValue(handleUnwantedTimezoneShift(selectedDate as Date))
+        setValue(
+            dateFromString(
+                selectedDate?.toISOString() || new Date().toISOString()
+            )
+        )
         setIsOpen(false)
     }
 

packages/domain-model/src/models/dates.model.ts

@@ -92,11 +92,6 @@ export const dateFromString = (dateString: string): Date => {
     return date.toJSDate()
 }
 
-export const handleUnwantedTimezoneShift = (date: Date): Date => {
-    const userTimezoneOffset = date.getTimezoneOffset() * 60000
-    return new Date(date.getTime() + userTimezoneOffset)
-}
-
 export const getNumberOfDaysInMonth = (year: number, month: number): number => {
     return new Date(year, month + 1, 0).getDate()
 }