react-weekly-planning 1.0.36 → 1.0.38

package/README.md

@@ -239,6 +239,20 @@ Props for the Calendar component.
 
 ## Additional Functions
 
+### `getCalendarDate`
+
+- **Description**: Returns the current date according to the selected timezone or the local time.
+- **Parameters**:
+  - `timeZone` (TimeZone, optional): The timezone to use for the date calculation.
+- **Returns**: A `Date` object representing the current time in the specified timezone (or local time if omitted).
+
+  **Example**:
+  ```javascript
+  import { getCalendarDate } from "react-weekly-planning";
+  const now = getCalendarDate("Europe/Paris");
+  console.log(now); // Logs the current date in Paris
+  ```
+
 ### `updateCalendarDateWithOffset`
 
 - **Description**: Updates the calendar date based on the week offset.

package/dist/lib/utils.js

@@ -30,7 +30,7 @@ export const endDateMilliseconds = endDate.getTime();
 export function getDayHourly(weekOffset, timeZone) {
     const dailyHours = [];
     let dayOffset = weekOffset;
-    const resolvedCurrentDate = timeZone ? getDateObjectInTimeZone(timeZone) : new Date();
+    const resolvedCurrentDate = getCalendarDate(timeZone);
     const currentDayOfWeek = resolvedCurrentDate.getDay();
     const resolvedStartDate = new Date(resolvedCurrentDate);
     resolvedStartDate.setDate(resolvedStartDate.getDate() - currentDayOfWeek);
@@ -116,18 +116,13 @@ export function getWeekDays(jump, timeZone) {
         "Nov",
         "Dec",
     ];
-    const currentDate = timeZone ? getDateObjectInTimeZone(timeZone) : new Date();
+    const currentDate = getCalendarDate(timeZone);
     const currentDayOfWeek = currentDate.getDay();
     let weekDays = [];
     for (let i = 0; i < 7; i++) {
-        const day = timeZone ? getDateObjectInTimeZone(timeZone) : new Date();
+        const day = getCalendarDate(timeZone);
         const diff = i - currentDayOfWeek;
-        if (currentDayOfWeek === 0) {
-            day.setDate(currentDate.getDate() + diff + jump - 7);
-        }
-        else {
-            day.setDate(currentDate.getDate() + diff + jump);
-        }
+        day.setDate(currentDate.getDate() + diff + jump);
         const formattedDay = `${days[day.getDay()]}. ${day.getDate()}, ${month[day.getMonth()]} ${day.getFullYear()}`;
         weekDays.push({
             day: days[day.getDay()],
@@ -171,11 +166,19 @@ function updateSelectedDateForEcartSemaine(dateSelectionnee) {
  * @returns The week difference in days.
  */
 export function calculerEcartSemaine(dateSelectionnee, timeZone) {
-    const dateActuelle = timeZone ? getDateObjectInTimeZone(timeZone) : new Date();
-    const recupDate = new Date(dateSelectionnee);
-    recupDate.setUTCDate(recupDate.getUTCDate() + 4 - (recupDate.getUTCDay() || 7));
-    dateActuelle.setUTCDate(dateActuelle.getUTCDate() + 4 - (dateActuelle.getUTCDay() || 7));
-    return Math.ceil((recupDate.getTime() - dateActuelle.getTime()) / 86400000);
+    const dateActuelle = getCalendarDate(timeZone);
+    // 1. Retrieve only the year, month, and day, and force it to midnight UTC.
+    // This eliminates any risk related to time zones and daylight saving time.
+    const utcSelected = Date.UTC(dateSelectionnee.getFullYear(), dateSelectionnee.getMonth(), dateSelectionnee.getDate());
+    const utcActuelle = Date.UTC(dateActuelle.getFullYear(), dateActuelle.getMonth(), dateActuelle.getDate());
+    const MS_PAR_JOUR = 86400000;
+    // 2. Resize each date to the Sunday of its corresponding week.
+    // getDay() returns a number from 0 (Sunday) to 6 (Saturday).
+    // By subtracting (day * ms_per_day), we arrive at Sunday at midnight.
+    const dimancheSelected = utcSelected - (dateSelectionnee.getDay() * MS_PAR_JOUR);
+    const dimancheActuelle = utcActuelle - (dateActuelle.getDay() * MS_PAR_JOUR);
+    const ecartJours = Math.round((dimancheSelected - dimancheActuelle) / MS_PAR_JOUR);
+    return ecartJours; // Retournera 0, 7, -7, 14, -14...
 }
 /**
  * Calculate the number of weeks since an arbitrary origin date (January 1, 2022).
@@ -216,10 +219,12 @@ export function compareWeekOffset(calendarDate, weekOffset, taskDate, timeZone)
     // if (taskDate.getDay() === 0 && calculerEcartSemaine(taskDate) === -7) {
     //   return true;
     // }
+    const currentDate = getCalendarDate(timeZone);
+    const currentWeekOffset = calculerEcartSemaine(currentDate, timeZone);
     const localTaskDate = getArbitraryDateInTimeZone(taskDate, timeZone);
     // if (calendarDate)
     //     return (calculerEcartSemaine(calendarDate) === calculerEcartSemaine(taskDate));
-    const ecartTask = calculerEcartSemaine(taskDate, timeZone) + (localTaskDate.getDay() === 0 ? 7 : 0);
+    const ecartTask = calculerEcartSemaine(taskDate, timeZone);
     return weekOffset === ecartTask;
 }
 export const sumHoursByGroups = (groupId, tasks, weekOffset, calendarDate, timeZone) => {
@@ -353,6 +358,14 @@ export function getDateObjectInTimeZone(timeZone) {
         return new Date();
     }
 }
+/**
+ * Returns the current date according to the selected timezone or the local time.
+ * @param timeZone - The optional timezone.
+ * @returns The current date.
+ */
+export function getCalendarDate(timeZone) {
+    return timeZone ? getDateObjectInTimeZone(timeZone) : new Date();
+}
 export function getArbitraryDateInTimeZone(date, timeZone) {
     if (!timeZone)
         return date;
@@ -437,7 +450,7 @@ export function getHoursByGroup(tasks, groupId, weekOffset, timeZone) {
     return sum;
 }
 export function getTaskProgression(task, timeZone) {
-    const now = timeZone ? getDateObjectInTimeZone(timeZone) : new Date();
+    const now = getCalendarDate(timeZone);
     if (task.taskStart >= now.getTime())
         return 0;
     if (now.getTime() >= task.taskEnd)

package/dist/types/lib/utils.d.ts

@@ -55,6 +55,12 @@ export declare const deleteTasksSaved: () => void;
 export declare function getWeeksInMonth(year: number, month: number): number;
 export declare function getMonthNumber(monthName: string): number;
 export declare function getDateObjectInTimeZone(timeZone: string): Date;
+/**
+ * Returns the current date according to the selected timezone or the local time.
+ * @param timeZone - The optional timezone.
+ * @returns The current date.
+ */
+export declare function getCalendarDate(timeZone?: TimeZone): Date;
 export declare function getArbitraryDateInTimeZone(date: Date, timeZone?: string): Date;
 export declare function recurringTasks(allTasks: TasksType, task: TaskFeildsType, recurrenceType: "daily" | "weekly" | "monthly", occurrences: number, timeZone?: TimeZone): TaskFeildsType[];
 export declare function getHoursByday(tasks: TaskFeildsType[], dayIndex: 0 | 1 | 2 | 3 | 4 | 5 | 6, weekOffset?: number, timeZone?: TimeZone): number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-weekly-planning",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "main": "dist/index.js",
   "types": "dist/types/index.d.ts",
   "exports": {