Merge remote-tracking branch 'origin/master'

Author: onesine

src/helpers/index.ts

@@ -138,6 +138,16 @@ export function getLastElementsInArray(array: number[] = [], size = 0) {
     return result.reverse();
 }
 
+export function generateWeekdayStringsArray() {
+    const weekdays = [];
+    let day = dayjs().startOf("week");
+    for (let i = 0; i < 7; i++) {
+        weekdays.push(formatDate(day, "ddd"));
+        day = day.add(1, "day");
+    }
+    return weekdays;
+}
+
 export function getNumberOfDay(dayString: string, startWeekOn?: string | null | undefined): number {
     let number = 0;
 
@@ -171,13 +181,11 @@ export function getNumberOfDay(dayString: string, startWeekOn?: string | null |
         }
     }
 
-    ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"].forEach(
-        (item, index) => {
-            if (item.includes(dayString)) {
-                number = (index + startDateModifier) % 7;
-            }
+    generateWeekdayStringsArray().forEach((item, index) => {
+        if (item.includes(dayString)) {
+            number = (index + startDateModifier) % 7;
         }
-    );
+    });
 
     return number;
 }