gantt-lib 0.84.0 → 0.85.1

package/dist/index.mjs

@@ -448,17 +448,27 @@ function normalizePredecessorDates(predecessor, parseDateFn) {
 function getDependencyLag(dep) {
   return Number.isFinite(dep.lag) ? dep.lag : 0;
 }
+function normalizeTaskDependencyLags(task) {
+  if (!task.dependencies?.length) {
+    return task;
+  }
+  let changed = false;
+  const dependencies = task.dependencies.map((dep) => {
+    const lag = getDependencyLag(dep);
+    const normalizedLag = dep.type === "FS" ? Math.max(0, lag) : lag;
+    if (normalizedLag === dep.lag) {
+      return dep;
+    }
+    changed = true;
+    return { ...dep, lag: normalizedLag };
+  });
+  return changed ? { ...task, dependencies } : task;
+}
 function normalizeDependencyLag(linkType, lag, predecessorStart, predecessorEnd, businessDays = false, weekendPredicate) {
   if (linkType !== "FS") {
     return lag;
   }
-  const predecessorDuration = getTaskDuration(
-    predecessorStart,
-    predecessorEnd,
-    businessDays,
-    weekendPredicate
-  );
-  return Math.max(-predecessorDuration, lag);
+  return Math.max(0, lag);
 }
 function computeLagFromDates(linkType, predStart, predEnd, succStart, succEnd, businessDays = false, weekendPredicate) {
   const pS = Date.UTC(predStart.getUTCFullYear(), predStart.getUTCMonth(), predStart.getUTCDate());
@@ -717,17 +727,11 @@ function clampTaskRangeForIncomingFS(task, proposedStart, proposedEnd, allTasks,
       continue;
     }
     const { predStart: predecessorStart, predEnd: predecessorEnd } = normalizePredecessorDates(predecessor, parseDateOnly);
-    const predecessorDuration = getTaskDuration(
-      predecessorStart,
-      predecessorEnd,
-      businessDays,
-      weekendPredicate
-    );
     const candidateMinStart = calculateSuccessorDate(
       predecessorStart,
       predecessorEnd,
       "FS",
-      -predecessorDuration,
+      0,
       businessDays,
       weekendPredicate
     );
@@ -838,11 +842,11 @@ function cascadeByLinks(movedTaskId, newStart, newEnd, allTasks, skipChildCascad
         const newChildEnd = new Date(origEnd.getTime() + parentEndDelta);
         visited.add(child.id);
         updatedDates.set(child.id, { start: newChildStart, end: newChildEnd });
-        result.push({
+        result.push(normalizeTaskDependencyLags({
           ...child,
           startDate: newChildStart.toISOString().split("T")[0],
           endDate: newChildEnd.toISOString().split("T")[0]
-        });
+        }));
         queue.push(child.id);
       }
     }
@@ -878,11 +882,11 @@ function cascadeByLinks(movedTaskId, newStart, newEnd, allTasks, skipChildCascad
         }
         visited.add(task.id);
         updatedDates.set(task.id, { start: newSuccStart, end: newSuccEnd });
-        result.push({
+        result.push(normalizeTaskDependencyLags({
           ...task,
           startDate: newSuccStart.toISOString().split("T")[0],
           endDate: newSuccEnd.toISOString().split("T")[0]
-        });
+        }));
         queue.push(task.id);
         break;
       }
@@ -937,11 +941,11 @@ function universalCascade(movedTask, newStart, newEnd, allTasks, businessDays =
   const updatedDates = /* @__PURE__ */ new Map();
   updatedDates.set(movedTask.id, { start: newStart, end: newEnd });
   const resultMap = /* @__PURE__ */ new Map();
-  resultMap.set(movedTask.id, {
+  resultMap.set(movedTask.id, normalizeTaskDependencyLags({
     ...movedTask,
     startDate: newStart.toISOString().split("T")[0],
     endDate: newEnd.toISOString().split("T")[0]
-  });
+  }));
   const queue = [[movedTask.id, "direct"]];
   const childShifted = /* @__PURE__ */ new Set();
   let iterations = 0;
@@ -987,11 +991,11 @@ function universalCascade(movedTask, newStart, newEnd, allTasks, businessDays =
         updatedDates.set(child.id, { start: childNewStart, end: childNewEnd });
         childShifted.add(child.id);
         queue.push([child.id, "child-delta"]);
-        resultMap.set(child.id, {
+        resultMap.set(child.id, normalizeTaskDependencyLags({
           ...child,
           startDate: childNewStart.toISOString().split("T")[0],
           endDate: childNewEnd.toISOString().split("T")[0]
-        });
+        }));
       }
     }
     const parentId = currentOriginal.parentId;
@@ -1009,11 +1013,11 @@ function universalCascade(movedTask, newStart, newEnd, allTasks, businessDays =
         if (!prev || prev.start.getTime() !== minStart.getTime() || prev.end.getTime() !== maxEnd.getTime()) {
           updatedDates.set(parentId, { start: minStart, end: maxEnd });
           queue.push([parentId, "parent-recalc"]);
-          resultMap.set(parentId, {
+          resultMap.set(parentId, normalizeTaskDependencyLags({
             ...parent,
             startDate: minStart.toISOString().split("T")[0],
             endDate: maxEnd.toISOString().split("T")[0]
-          });
+          }));
         }
       }
     }
@@ -1063,11 +1067,11 @@ function universalCascade(movedTask, newStart, newEnd, allTasks, businessDays =
       }
       updatedDates.set(task.id, { start: succNewStart, end: succNewEnd });
       queue.push([task.id, "dependency"]);
-      resultMap.set(task.id, {
+      resultMap.set(task.id, normalizeTaskDependencyLags({
         ...task,
         startDate: succNewStart.toISOString().split("T")[0],
         endDate: succNewEnd.toISOString().split("T")[0]
-      });
+      }));
     }
   }
   return Array.from(resultMap.values());
@@ -7794,6 +7798,13 @@ var ResourceTypeIcon = ({ type }) => {
     /* @__PURE__ */ jsx15("path", { d: "M12 16h.01" })
   ] });
 };
+function isInactiveResourceStatus(status) {
+  return status?.trim().toLocaleLowerCase() === "inactive";
+}
+var ResourceStatusLockIcon = () => /* @__PURE__ */ jsxs12("svg", { className: "gantt-resourceTimeline-resourceStatusIcon", width: "12", height: "12", viewBox: "0 0 24 24", "aria-hidden": "true", children: [
+  /* @__PURE__ */ jsx15("rect", { x: "5", y: "11", width: "14", height: "10", rx: "2" }),
+  /* @__PURE__ */ jsx15("path", { d: "M8 11V8a4 4 0 1 1 8 0v3" })
+] });
 var ResourceHeader = ({
   resource,
   resourceId,
@@ -7823,6 +7834,7 @@ var ResourceHeader = ({
   const type = resource.type ?? "\u0414\u0440\u0443\u0433\u043E\u0435";
   const scope = resource.scope ?? "Project";
   const scopeLabel = RESOURCE_SCOPE_LABELS[scope] ?? scope;
+  const isInactive = isInactiveResourceStatus(resource.status);
   const applyResourcePatch = useCallback7((patch) => {
     onResourceChange?.({ ...resource, ...patch });
   }, [onResourceChange, resource]);
@@ -7883,7 +7895,7 @@ var ResourceHeader = ({
   return /* @__PURE__ */ jsxs12(
     "div",
     {
-      className: `gantt-resourceTimeline-resourceHeader${menuOpen ? " gantt-resourceTimeline-resourceHeaderMenuOpen" : ""}`,
+      className: `gantt-resourceTimeline-resourceHeader${menuOpen ? " gantt-resourceTimeline-resourceHeaderMenuOpen" : ""}${isInactive ? " gantt-resourceTimeline-resourceHeaderInactive" : ""}`,
       "data-resource-row-id": resourceId,
       style: {
         height: `${height}px`,
@@ -7950,7 +7962,18 @@ var ResourceHeader = ({
                 onResourceNameClick?.(resourceId);
               },
               onDoubleClick: handleNameDoubleClick,
-              children: resource.name
+              children: /* @__PURE__ */ jsxs12("span", { className: "gantt-resourceTimeline-resourceNameContent", children: [
+                isInactive && /* @__PURE__ */ jsx15(
+                  "span",
+                  {
+                    className: "gantt-resourceTimeline-resourceStatusMarker",
+                    "aria-label": `\u0420\u0435\u0441\u0443\u0440\u0441 ${resource.name} \u043D\u0435\u0430\u043A\u0442\u0438\u0432\u0435\u043D`,
+                    title: "\u041D\u0435\u0430\u043A\u0442\u0438\u0432\u0435\u043D",
+                    children: /* @__PURE__ */ jsx15(ResourceStatusLockIcon, {})
+                  }
+                ),
+                /* @__PURE__ */ jsx15("span", { className: "gantt-resourceTimeline-resourceNameText", children: resource.name })
+              ] })
             }
           )
         ] }),
@@ -10015,6 +10038,7 @@ export {
   normalizeHierarchyTasks,
   normalizePredecessorDates,
   normalizeTaskDates,
+  normalizeTaskDependencyLags,
   normalizeUTCDate,
   not,
   or,