From 066c0cf5ba76eb14245b85f4d0b93a4f789be21d Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Fri, 17 Dec 2021 20:39:02 -0800
Subject: [PATCH] Fix calendar bug, closes #892

---
 components/common/Calendar.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/components/common/Calendar.js b/components/common/Calendar.js
index 7aea34c3..288cb184 100644
--- a/components/common/Calendar.js
+++ b/components/common/Calendar.js
@@ -106,12 +106,19 @@ export default function Calendar({ date, minDate, maxDate, onChange }) {
 }
 
 const DaySelector = ({ date, minDate, maxDate, locale, onSelect }) => {
-  const startWeek = startOfWeek(date, { locale: getDateLocale(locale) });
-  const startMonth = startOfMonth(date, { locale: getDateLocale(locale) });
-  const startDay = subDays(startMonth, startMonth.getDay());
+  const dateLocale = getDateLocale(locale);
+  const weekStartsOn = dateLocale?.options?.weekStartsOn || 0;
+  const startWeek = startOfWeek(date, {
+    locale: dateLocale,
+    weekStartsOn,
+  });
+  const startMonth = startOfMonth(date);
+  const startDay = subDays(startMonth, startMonth.getDay() - weekStartsOn);
   const month = date.getMonth();
   const year = date.getFullYear();
 
+  console.log({ dateLocale, startDay, startWeek, startMonth, month, year });
+
   const daysOfWeek = [];
   for (let i = 0; i < 7; i++) {
     daysOfWeek.push(addDays(startWeek, i));