gantt-lib 0.3.2 → 0.3.3

package/dist/index.js

@@ -1188,8 +1188,8 @@ var TaskRow = import_react3.default.memo(
       }
       const msPerDay = 1e3 * 60 * 60 * 24;
       const duration = taskEnd.getTime() - taskStart.getTime() + msPerDay;
-      const elapsedCutoff = taskEnd.getTime() < today.getTime() ? taskEnd.getTime() : today.getTime();
-      const elapsed = elapsedCutoff - taskStart.getTime();
+      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]);
@@ -2655,18 +2655,26 @@ 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) {
-      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];
     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;
+    }
+    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 allCascaded) {
+    for (const t of tasksToProcess) {
       const taskStart = new Date(t.startDate);
       const taskEnd = new Date(t.endDate);
       const actualProgress = t.progress ?? 0;
@@ -2675,19 +2683,23 @@ var GanttChart = (0, import_react12.forwardRef)(({
         continue;
       }
       const duration = taskEnd.getTime() - taskStart.getTime() + msPerDay;
-      const elapsedCutoff = taskEnd.getTime() < today.getTime() ? taskEnd.getTime() : today.getTime();
-      const elapsed = elapsedCutoff - taskStart.getTime();
+      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"}`);
     }
-    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) {
+      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);