gantt-lib 0.3.1 → 0.3.3

package/dist/index.js

@@ -1180,7 +1180,6 @@ var TaskRow = import_react3.default.memo(
       if (!highlightExpiredTasks) return false;
       const now = /* @__PURE__ */ new Date();
       const today = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
-      const tomorrow = new Date(Date.UTC(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate() + 1));
       const taskStart = parseUTCDate(task.startDate);
       const taskEnd = parseUTCDate(task.endDate);
       const actualProgress = task.progress ?? 0;
@@ -1188,12 +1187,11 @@ var TaskRow = import_react3.default.memo(
         return false;
       }
       const msPerDay = 1e3 * 60 * 60 * 24;
-      const taskDuration = taskEnd.getTime() - taskStart.getTime() + msPerDay;
-      const isTaskEndingTodayOrTomorrow = today.getUTCFullYear() === taskEnd.getUTCFullYear() && today.getUTCMonth() === taskEnd.getUTCMonth() && today.getUTCDate() === taskEnd.getUTCDate() || tomorrow.getUTCFullYear() === taskEnd.getUTCFullYear() && tomorrow.getUTCMonth() === taskEnd.getUTCMonth() && tomorrow.getUTCDate() === taskEnd.getUTCDate();
-      const elapsedCutoff = isTaskEndingTodayOrTomorrow ? new Date(today.getTime() - msPerDay) : today;
-      const daysFromStart = elapsedCutoff.getTime() - taskStart.getTime();
-      const todayPosition = Math.min(100, Math.max(0, daysFromStart / taskDuration * 100));
-      return actualProgress < todayPosition;
+      const duration = taskEnd.getTime() - taskStart.getTime() + msPerDay;
+      const elapsedFromToday = today.getTime() - taskStart.getTime();
+      const elapsed = Math.min(Math.max(0, elapsedFromToday), duration);
+      const expected = elapsed / duration * 100;
+      return actualProgress < expected;
     }, [task.startDate, task.endDate, task.progress, highlightExpiredTasks]);
     const { left, width } = (0, import_react3.useMemo)(
       () => calculateTaskBar(taskStartDate, taskEndDate, monthStart, dayWidth),
@@ -2657,18 +2655,51 @@ var GanttChart = (0, import_react12.forwardRef)(({
     const newStart = new Date(updatedTask.startDate);
     const newEnd = new Date(updatedTask.endDate);
     const datesChanged = origStart.getTime() !== newStart.getTime() || origEnd.getTime() !== newEnd.getTime();
-    if (!datesChanged || disableConstraints) {
+    const now = /* @__PURE__ */ new Date();
+    const today = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
+    const msPerDay = 1e3 * 60 * 60 * 24;
+    let tasksToProcess;
+    let cascadedTasksForCallback = [];
+    if (!datesChanged) {
       onChange?.((currentTasks) => currentTasks.map((t) => t.id === updatedTask.id ? updatedTask : t));
       return;
     }
-    const cascadedTask = updatedTask;
-    const cascadedChain = cascadeByLinks(updatedTask.id, newStart, newEnd, tasks);
-    const allCascaded = [cascadedTask, ...cascadedChain];
-    onChange?.((currentTasks) => {
-      const m = new Map(allCascaded.map((t) => [t.id, t]));
-      return currentTasks.map((t) => m.get(t.id) ?? t);
-    });
-    onCascade?.(allCascaded);
+    if (disableConstraints) {
+      tasksToProcess = [updatedTask];
+      cascadedTasksForCallback = [updatedTask];
+    } else {
+      const cascadedTask = updatedTask;
+      const cascadedChain = cascadeByLinks(updatedTask.id, newStart, newEnd, tasks);
+      tasksToProcess = [cascadedTask, ...cascadedChain];
+      cascadedTasksForCallback = tasksToProcess;
+    }
+    console.log("[GanttChart handleTaskChange] IsExpired calculation:");
+    for (const t of tasksToProcess) {
+      const taskStart = new Date(t.startDate);
+      const taskEnd = new Date(t.endDate);
+      const actualProgress = t.progress ?? 0;
+      if (actualProgress >= 100) {
+        console.log(`  [${t.id}] START=${t.startDate} END=${t.endDate} TODAY=${today.toISOString().split("T")[0]} PROGRESS=${actualProgress}% EXPECTED=N/A (completed) EXPIRED=NO`);
+        continue;
+      }
+      const duration = taskEnd.getTime() - taskStart.getTime() + msPerDay;
+      const elapsedFromToday = today.getTime() - taskStart.getTime();
+      const elapsed = Math.min(Math.max(0, elapsedFromToday), duration);
+      const expectedProgress = Math.min(100, Math.max(0, elapsed / duration * 100));
+      const isExpired = actualProgress < expectedProgress;
+      const durationDays = Math.round(duration / msPerDay);
+      const elapsedDays = Math.round(elapsed / msPerDay);
+      console.log(`  [${t.id}] START=${t.startDate} END=${t.endDate} TODAY=${today.toISOString().split("T")[0]} PROGRESS=${actualProgress}% DURATION=${durationDays}d ELAPSED=${elapsedDays}d EXPECTED=${expectedProgress.toFixed(1)}% EXPIRED=${isExpired ? "YES" : "NO"}`);
+    }
+    if (disableConstraints) {
+      onChange?.((currentTasks) => currentTasks.map((t) => t.id === updatedTask.id ? updatedTask : t));
+    } else {
+      onChange?.((currentTasks) => {
+        const m = new Map(cascadedTasksForCallback.map((t) => [t.id, t]));
+        return currentTasks.map((t) => m.get(t.id) ?? t);
+      });
+      onCascade?.(cascadedTasksForCallback);
+    }
   }, [tasks, onChange, disableConstraints, onCascade]);
   const dependencyOverrides = (0, import_react12.useMemo)(() => {
     const map = new Map(cascadeOverrides);