gantt-lib 0.124.2 → 0.126.0

package/dist/index.mjs

@@ -443,8 +443,7 @@ function subtractBusinessDays2(endDate, businessDays, weekendPredicate) {
 // src/core/scheduling/dependencies.ts
 function normalizePredecessorDates(predecessor, parseDateFn) {
   const predStart = parseDateFn(predecessor.startDate);
-  const isMilestone = predecessor.type === "milestone";
-  const predEnd = isMilestone ? new Date(predStart.getTime() - DAY_MS) : parseDateFn(predecessor.endDate);
+  const predEnd = predecessor.type === "milestone" ? predStart : parseDateFn(predecessor.endDate);
   return { predStart, predEnd };
 }
 function getDependencyLag(dep) {
@@ -453,7 +452,7 @@ function getDependencyLag(dep) {
 function normalizeTaskDependencyLags(task) {
   return task;
 }
-function normalizeDependencyLag(linkType, lag, predecessorStart, predecessorEnd, businessDays = false, weekendPredicate) {
+function normalizeDependencyLag(linkType, lag, predecessorStart, predecessorEnd, businessDays = false, weekendPredicate, successorType) {
   if (linkType !== "FS") {
     return lag;
   }
@@ -463,9 +462,10 @@ function normalizeDependencyLag(linkType, lag, predecessorStart, predecessorEnd,
     businessDays,
     weekendPredicate
   );
-  return Math.max(-predecessorDuration, lag);
+  const minimumLag = successorType === "milestone" ? -Math.max(0, predecessorDuration - 1) : -predecessorDuration;
+  return Math.max(minimumLag, lag);
 }
-function computeLagFromDates(linkType, predStart, predEnd, succStart, succEnd, businessDays = false, weekendPredicate) {
+function computeLagFromDates(linkType, predStart, predEnd, succStart, succEnd, businessDays = false, weekendPredicate, successorType) {
   const pS = Date.UTC(predStart.getUTCFullYear(), predStart.getUTCMonth(), predStart.getUTCDate());
   const pE = Date.UTC(predEnd.getUTCFullYear(), predEnd.getUTCMonth(), predEnd.getUTCDate());
   const sS = Date.UTC(succStart.getUTCFullYear(), succStart.getUTCMonth(), succStart.getUTCDate());
@@ -475,11 +475,12 @@ function computeLagFromDates(linkType, predStart, predEnd, succStart, succEnd, b
       case "FS":
         return normalizeDependencyLag(
           linkType,
-          Math.round((sS - pE) / DAY_MS) - 1,
+          Math.round((sS - pE) / DAY_MS) - (successorType === "milestone" ? 0 : 1),
           predStart,
           predEnd,
           businessDays,
-          weekendPredicate
+          weekendPredicate,
+          successorType
         );
       case "SS":
         return Math.round((sS - pS) / DAY_MS);
@@ -496,11 +497,12 @@ function computeLagFromDates(linkType, predStart, predEnd, succStart, succEnd, b
     case "FS":
       return normalizeDependencyLag(
         linkType,
-        businessOffset - 1,
+        businessOffset - (successorType === "milestone" ? 0 : 1),
         predStart,
         predEnd,
         businessDays,
-        weekendPredicate
+        weekendPredicate,
+        successorType
       );
     case "SS":
       return businessOffset;
@@ -510,19 +512,20 @@ function computeLagFromDates(linkType, predStart, predEnd, succStart, succEnd, b
       return businessOffset + 1;
   }
 }
-function calculateSuccessorDate(predecessorStart, predecessorEnd, linkType, lag = 0, businessDays = false, weekendPredicate) {
+function calculateSuccessorDate(predecessorStart, predecessorEnd, linkType, lag = 0, businessDays = false, weekendPredicate, successorType) {
   const normalizedLag = normalizeDependencyLag(
     linkType,
     lag,
     predecessorStart,
     predecessorEnd,
     businessDays,
-    weekendPredicate
+    weekendPredicate,
+    successorType
   );
   if (!businessDays || !weekendPredicate) {
     switch (linkType) {
       case "FS":
-        return new Date(predecessorEnd.getTime() + (normalizedLag + 1) * DAY_MS);
+        return new Date(predecessorEnd.getTime() + (normalizedLag + (successorType === "milestone" ? 0 : 1)) * DAY_MS);
       case "SS":
         return new Date(predecessorStart.getTime() + normalizedLag * DAY_MS);
       case "FF":
@@ -535,7 +538,7 @@ function calculateSuccessorDate(predecessorStart, predecessorEnd, linkType, lag
   let offset;
   switch (linkType) {
     case "FS":
-      offset = normalizedLag + 1;
+      offset = normalizedLag + (successorType === "milestone" ? 0 : 1);
       break;
     case "SS":
       offset = normalizedLag;
@@ -767,7 +770,8 @@ function clampTaskRangeForIncomingFS(task, proposedStart, proposedEnd, allTasks,
       "FS",
       -predecessorDuration,
       businessDays,
-      weekendPredicate
+      weekendPredicate,
+      task.type
     );
     if (!minAllowedStart || candidateMinStart.getTime() > minAllowedStart.getTime()) {
       minAllowedStart = candidateMinStart;
@@ -801,7 +805,8 @@ function recalculateIncomingLags(task, newStartDate, newEndDate, allTasks, busin
       newStartDate,
       newEndDate,
       businessDays,
-      weekendPredicate
+      weekendPredicate,
+      task.type
     );
     return { ...dep, lag: nextLag };
   });
@@ -916,7 +921,10 @@ function cascadeByLinks(movedTaskId, newStart, newEnd, allTasks, skipChildCascad
         normalizedPredStart,
         normalizedPredEnd,
         dep.type,
-        getDependencyLag(dep)
+        getDependencyLag(dep),
+        false,
+        void 0,
+        task.type
       );
       let newSuccStart;
       let newSuccEnd;
@@ -1078,7 +1086,8 @@ function universalCascade(movedTask, newStart, newEnd, allTasks, businessDays =
         dep.type,
         getDependencyLag(dep),
         businessDays,
-        weekendPredicate
+        weekendPredicate,
+        task.type
       );
       let succNewStart;
       let succNewEnd;
@@ -1378,7 +1387,8 @@ function recalculateTaskFromDependencies(taskId, snapshot, options) {
       dep.type,
       getDependencyLag(dep),
       businessDays,
-      weekendPredicate
+      weekendPredicate,
+      task.type
     );
     const duration = getTaskDuration(
       parseDateOnly(task.startDate),
@@ -1494,7 +1504,8 @@ function recalculateProjectSchedule(snapshot, options) {
           dep.type,
           getDependencyLag(dep),
           businessDays,
-          weekendPredicate
+          weekendPredicate,
+          currentTask.type
         );
         const candidateRange = dep.type === "FS" || dep.type === "SS" ? buildTaskRangeFromStart(constraintDate, duration, businessDays, weekendPredicate) : buildTaskRangeFromEnd(constraintDate, duration, businessDays, weekendPredicate);
         if (!constrainedRange || candidateRange.start.getTime() > constrainedRange.start.getTime() || candidateRange.start.getTime() === constrainedRange.start.getTime() && candidateRange.end.getTime() > constrainedRange.end.getTime()) {
@@ -3032,7 +3043,8 @@ var TaskRow = React2.memo(
       }
       return calculateTaskBar(baselineStartDate, baselineEndDate, monthStart, dayWidth);
     }, [baselineStartDate, baselineEndDate, milestone, monthStart, dayWidth]);
-    const barColor = isExpired ? "var(--gantt-expired-color)" : task.color || "var(--gantt-task-bar-default-color)";
+    const criticalBarColor = "var(--gantt-critical-path-color, #dc2626)";
+    const barColor = isExpired ? "var(--gantt-expired-color)" : isCritical ? criticalBarColor : task.color || "var(--gantt-task-bar-default-color)";
     const progressWidth = useMemo2(() => {
       if (task.progress === void 0 || task.progress <= 0) return 0;
       return Math.min(100, Math.max(0, Math.round(task.progress)));
@@ -3041,21 +3053,31 @@ var TaskRow = React2.memo(
       if (isExpired) {
         return "color-mix(in srgb, var(--gantt-expired-color) 40%, black)";
       }
+      if (isCritical) {
+        return `color-mix(in srgb, ${criticalBarColor} 40%, black)`;
+      }
       if (progressWidth === 100) {
         return task.accepted ? "var(--gantt-progress-accepted, #22c55e)" : "var(--gantt-progress-completed, #fbbf24)";
       }
       const baseColor = task.color || "var(--gantt-task-bar-default-color)";
       return `color-mix(in srgb, ${baseColor} 40%, black)`;
-    }, [isExpired, progressWidth, task.accepted, task.color]);
+    }, [isCritical, isExpired, progressWidth, task.accepted, task.color]);
     const externalTaskNameColor = useMemo2(() => {
       if (isExpired) {
         return "color-mix(in srgb, var(--gantt-expired-color) 40%, black)";
       }
       const baseColor = isParent ? task.color || defaultParentBarColor : task.color || "var(--gantt-task-bar-default-color)";
       return `color-mix(in srgb, ${baseColor} 40%, black)`;
-    }, [defaultParentBarColor, isExpired, isParent, task.color]);
+    }, [defaultParentBarColor, isCritical, isExpired, isParent, task.color]);
     const barStyle = useMemo2(() => {
       const parentBarColor = task.color || defaultParentBarColor;
+      if (isCritical && !isExpired) {
+        const c = criticalBarColor;
+        if (isParent) {
+          return { backgroundColor: c, "--gantt-parent-bar-color": c };
+        }
+        return { backgroundColor: c };
+      }
       if (isParent) {
         if (progressWidth >= 100) {
           const c = isExpired ? "color-mix(in srgb, var(--gantt-expired-color) 40%, black)" : `color-mix(in srgb, ${parentBarColor} 40%, black)`;
@@ -3067,7 +3089,7 @@ var TaskRow = React2.memo(
         return { backgroundColor: progressColor };
       }
       return { backgroundColor: barColor };
-    }, [defaultParentBarColor, isExpired, isParent, progressWidth, barColor, progressColor, task.color]);
+    }, [isCritical, defaultParentBarColor, isExpired, isParent, progressWidth, barColor, progressColor, task.color]);
     const handleDragEnd = (result) => {
       const updatedTask = {
         ...normalizedTask,
@@ -3646,6 +3668,7 @@ var DependencyLines = React6.memo(({
       for (const task of allTasks) {
         if (positions.has(task.id)) continue;
         if (collapsedParentIds.size > 0 && isTaskHidden(task.id, collapsedParentIds, taskMap)) continue;
+        if (rowIndexByTaskId && !rowIndexByTaskId.has(task.id)) continue;
         hidden.add(task.id);
         const override = dragOverrides?.get(task.id);
         const computed = resolveTaskHorizontalGeometry(task, monthStart, dayWidth, override);
@@ -5085,7 +5108,8 @@ var DepChip = ({
         predStart,
         predEnd,
         businessDays,
-        weekendPredicate
+        weekendPredicate,
+        task.type
       );
       const constraintDate = calculateSuccessorDate(
         predStart,
@@ -5093,7 +5117,8 @@ var DepChip = ({
         dep.type,
         normalizedLag,
         businessDays,
-        weekendPredicate
+        weekendPredicate,
+        task.type
       );
       let newStart, newEnd;
       if (dep.type === "FS" || dep.type === "SS") {
@@ -7921,14 +7946,15 @@ var TaskList = ({
     const predecessor = tasks.find((t) => t.id === predecessorTaskId);
     if (predecessor) {
       const predStart = new Date(predecessor.startDate);
-      const predEnd = new Date(predecessor.endDate);
+      const predEnd = predecessor.type === "milestone" ? predStart : new Date(predecessor.endDate);
       const constraintDate = calculateSuccessorDate(
         predStart,
         predEnd,
         linkType,
         0,
         businessDays ?? true,
-        weekendPredicate
+        weekendPredicate,
+        updatedTask.type
       );
       const origSuccessor = tasks.find((t) => t.id === successorTaskId);
       const duration = getTaskDuration(
@@ -12728,11 +12754,12 @@ function TaskGanttChartInner(props, ref) {
       }
       const constraintDate = calculateSuccessorDate(
         parseUTCDate(predecessor.startDate),
-        parseUTCDate(predecessor.endDate),
+        predecessor.type === "milestone" ? parseUTCDate(predecessor.startDate) : parseUTCDate(predecessor.endDate),
         nextDependency.type,
         0,
         businessDays,
-        isCustomWeekend
+        isCustomWeekend,
+        successor.type
       );
       const duration = getTaskDuration(
         updatedSuccessor.startDate,
@@ -12889,13 +12916,18 @@ function TaskGanttChartInner(props, ref) {
     if (filterMode === "hide") {
       return /* @__PURE__ */ new Set();
     }
-    if ((!highlightedTaskIds || highlightedTaskIds.size === 0) && matchedTaskIds.size === 0) {
+    const criticalHighlightMode = criticalPathMode === "highlight";
+    const hasExternalHighlights = !!highlightedTaskIds && highlightedTaskIds.size > 0;
+    if (!hasExternalHighlights && matchedTaskIds.size === 0 && !criticalHighlightMode) {
       return /* @__PURE__ */ new Set();
     }
     const mergedHighlightedTaskIds = new Set(highlightedTaskIds ?? []);
     matchedTaskIds.forEach((taskId) => mergedHighlightedTaskIds.add(taskId));
+    if (criticalHighlightMode) {
+      criticalTaskIds.forEach((taskId) => mergedHighlightedTaskIds.add(taskId));
+    }
     return mergedHighlightedTaskIds;
-  }, [filterMode, highlightedTaskIds, matchedTaskIds]);
+  }, [filterMode, highlightedTaskIds, matchedTaskIds, criticalPathMode, criticalTaskIds]);
   const totalGridHeight = useMemo13(
     () => visibleTasks.length * effectiveRowHeight,
     [effectiveRowHeight, visibleTasks.length]
@@ -13890,7 +13922,7 @@ function TaskGanttChartInner(props, ref) {
                                     onCascade: handleCascade,
                                     highlightExpiredTasks,
                                     showBaseline,
-                                    isFilterMatch: filterMode === "highlight" ? matchedTaskIds.has(task.id) : false,
+                                    isFilterMatch: (filterMode === "highlight" ? matchedTaskIds.has(task.id) : false) || (criticalPathMode === "highlight" ? criticalTaskIds.has(task.id) : false),
                                     isCritical: criticalTaskIds.has(task.id),
                                     businessDays,
                                     customDays,