Merge pull request #41 from Shinsina/correct-dates-attempt-2

See if timezone offset is available to set dayZero value
Shinsina · Apr 11, 2024 · 91df32e · 91df32e
2 parents bbee93f + 39d6c5d
commit 91df32e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/lib/utils/determine-start-of-week-for-date-string.ts b/src/lib/utils/determine-start-of-week-for-date-string.ts
@@ -5,13 +5,15 @@ export default ({
   object: Record<string, Array<string>>;
   dateString: string;
 }) => {
-  const d = new Date(`${String(dateString)} 19:00:00 GMT-05:00`);
+  const d = new Date(String(dateString));
   const day = d.getDay();
   const utcDateString = d.toUTCString();
-  if (day === 1 && !object[utcDateString]) {
+  const minutesAwayFromUTC = d.getTimezoneOffset();
+  const dayZero = minutesAwayFromUTC ? 1 : 0;
+  if (day === dayZero && !object[utcDateString]) {
     object[utcDateString] = [utcDateString];
-  } else if (day !== 1) {
-    const distanceFromOne = day - 1;
+  } else if (day !== dayZero) {
+    const distanceFromOne = day - dayZero;
     const dayOneOfWeek = new Date(
       Number(d) - distanceFromOne * 86400000
     ).toUTCString();