gantt-lib 0.145.1 → 0.146.0

package/dist/index.js

@@ -2233,8 +2233,8 @@ function recalculateProjectSchedule(snapshot, options) {
     }
   }
   const queue = snapshot.filter((task) => (indegree.get(task.id) ?? 0) === 0).map((task) => task.id);
-  while (queue.length > 0) {
-    const currentId = queue.shift();
+  for (let queueIndex = 0; queueIndex < queue.length; queueIndex++) {
+    const currentId = queue[queueIndex];
     for (const successorId of successorIdsByTask.get(currentId) ?? []) {
       const nextIndegree = (indegree.get(successorId) ?? 0) - 1;
       indegree.set(successorId, nextIndegree);
@@ -2285,7 +2285,13 @@ function recalculateProjectSchedule(snapshot, options) {
       queue.push(successorId);
     }
   }
-  const parentsByDepth = snapshot.filter((task) => isTaskParent(task.id, snapshot)).map((task) => {
+  const childrenByParent = /* @__PURE__ */ new Map();
+  for (const task of snapshot) if (task.parentId) {
+    const children = childrenByParent.get(task.parentId) ?? [];
+    children.push(task.id);
+    childrenByParent.set(task.parentId, children);
+  }
+  const parentsByDepth = snapshot.filter((task) => childrenByParent.has(task.id)).map((task) => {
     let depth = 0;
     let current = task.parentId ? workingMap.get(task.parentId) : void 0;
     while (current) {
@@ -2294,17 +2300,21 @@ function recalculateProjectSchedule(snapshot, options) {
     }
     return { taskId: task.id, depth };
   }).sort((left, right) => right.depth - left.depth);
-  const workingTasks = () => Array.from(workingMap.values());
   for (const { taskId } of parentsByDepth) {
     const parent = workingMap.get(taskId);
     if (!parent || parent.locked) {
       continue;
     }
-    const { startDate, endDate } = computeParentDates(taskId, workingTasks());
+    let startTime = Infinity, endTime = -Infinity;
+    for (const childId of childrenByParent.get(taskId)) {
+      const child = workingMap.get(childId);
+      startTime = Math.min(startTime, new Date(child.startDate).getTime());
+      endTime = Math.max(endTime, new Date(child.endDate).getTime());
+    }
     workingMap.set(taskId, {
       ...parent,
-      startDate: toIsoDate(startDate),
-      endDate: toIsoDate(endDate)
+      startDate: toIsoDate(new Date(startTime)),
+      endDate: toIsoDate(new Date(endTime))
     });
   }
   return createChangedResult(snapshot, Array.from(workingMap.values()));
@@ -7706,6 +7716,7 @@ var DepChip = ({
   weekendPredicate
 }) => {
   const [popoverOpen, setPopoverOpen] = (0, import_react12.useState)(false);
+  const [typeMenuOpen, setTypeMenuOpen] = (0, import_react12.useState)(false);
   const lagAbs = Math.abs(lag ?? 0);
   const [inputAbs, setInputAbs] = (0, import_react12.useState)(lagAbs === 0 ? "" : String(lagAbs));
   (0, import_react12.useEffect)(() => {
@@ -7827,6 +7838,69 @@ var DepChip = ({
   const Icon = LINK_TYPE_ICONS[dep.type];
   const depName = predecessorName ?? dep.taskId;
   const effectiveLag = lag ?? 0;
+  const handleTypeChange = (0, import_react12.useCallback)(
+    (newType) => {
+      if (newType === dep.type) return;
+      if (!onTasksChange || !allTasks) return;
+      if ((task.dependencies ?? []).some((d) => d.taskId === dep.taskId && d.type === newType)) return;
+      const taskById = new Map(allTasks.map((t) => [t.id, t]));
+      const predecessor = taskById.get(dep.taskId);
+      if (!predecessor) return;
+      const predStart = parseUTCDate(predecessor.startDate);
+      const predEnd = predecessor.type === "milestone" ? predStart : parseUTCDate(predecessor.endDate);
+      const origStart = parseUTCDate(task.startDate);
+      const origEnd = parseUTCDate(task.endDate);
+      const durationMs = origEnd.getTime() - origStart.getTime();
+      const normalizedLag = normalizeDependencyLag(
+        newType,
+        effectiveLag,
+        predStart,
+        predEnd,
+        businessDays,
+        weekendPredicate,
+        task.type
+      );
+      const constraintDate = calculateSuccessorDate(
+        predStart,
+        predEnd,
+        newType,
+        normalizedLag,
+        businessDays,
+        weekendPredicate,
+        task.type
+      );
+      let newStart, newEnd;
+      if (newType === "FS" || newType === "SS") {
+        newStart = constraintDate;
+        if (businessDays) {
+          const businessDuration = getBusinessDaysCount(origStart, origEnd, weekendPredicate);
+          newEnd = addBusinessDays(constraintDate, businessDuration, weekendPredicate);
+        } else {
+          newEnd = new Date(constraintDate.getTime() + durationMs);
+        }
+      } else {
+        newEnd = constraintDate;
+        if (businessDays) {
+          const businessDuration = getBusinessDaysCount(origStart, origEnd, weekendPredicate);
+          newStart = subtractBusinessDays(constraintDate, businessDuration, weekendPredicate);
+        } else {
+          newStart = new Date(constraintDate.getTime() - durationMs);
+        }
+      }
+      onTasksChange([
+        {
+          ...task,
+          startDate: newStart.toISOString().split("T")[0],
+          endDate: newEnd.toISOString().split("T")[0],
+          dependencies: (task.dependencies ?? []).map(
+            (existingDep) => existingDep.taskId === dep.taskId && existingDep.type === dep.type ? { ...existingDep, type: newType, lag: normalizedLag } : existingDep
+          )
+        }
+      ]);
+      onChipSelect?.({ successorId: taskId, predecessorId: dep.taskId, linkType: newType });
+    },
+    [dep.type, dep.taskId, task, allTasks, onTasksChange, businessDays, weekendPredicate, effectiveLag, onChipSelect, taskId]
+  );
   const actionVerb = dep.type === "FS" || dep.type === "SS" ? "\u043D\u0430\u0447\u0430\u0442\u044C" : "\u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044C";
   const zeroPlaceholder = dep.type === "SF" ? "\u0447\u0451\u0442\u043A\u043E" : dep.type === "FF" ? "\u0432\u043C\u0435\u0441\u0442\u0435" : dep.type === "SS" ? "\u0432\u043C\u0435\u0441\u0442\u0435" : "\u0441\u0440\u0430\u0437\u0443";
   let afterWhat;
@@ -7958,27 +8032,71 @@ var DepChip = ({
           !disableDependencyEditing && /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_jsx_runtime15.Fragment, { children: [
             /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("hr", { className: "gantt-tl-dep-edit-divider" }),
             /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("div", { className: "gantt-tl-dep-edit-actions", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
-                "button",
-                {
-                  type: "button",
-                  className: "gantt-tl-dep-edit-close",
-                  onClick: () => {
-                    setPopoverOpen(false);
-                    onChipSelectClear();
-                  },
-                  children: "\u0417\u0430\u043A\u0440\u044B\u0442\u044C"
-                }
-              ),
-              /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
-                "button",
-                {
-                  type: "button",
-                  className: "gantt-tl-dep-edit-delete",
-                  onClick: handleTrashClick,
-                  children: "\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u0432\u044F\u0437\u044C"
-                }
-              )
+              /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(Popover, { open: typeMenuOpen, onOpenChange: setTypeMenuOpen, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(PopoverTrigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
+                  "button",
+                  {
+                    type: "button",
+                    className: "gantt-tl-dep-edit-type-trigger",
+                    onClick: (e) => e.stopPropagation(),
+                    "aria-label": "\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0442\u0438\u043F \u0441\u0432\u044F\u0437\u0438",
+                    title: "\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0442\u0438\u043F \u0441\u0432\u044F\u0437\u0438",
+                    children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Icon, {}),
+                      /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { children: LINK_TYPE_LABELS_RU2[dep.type] }),
+                      /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "gantt-tl-dep-edit-type-caret", "aria-hidden": "true", children: "\u25BE" })
+                    ]
+                  }
+                ) }),
+                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(PopoverContent, { portal: true, align: "start", children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: "gantt-tl-dep-type-menu", children: LINK_TYPE_ORDER.map((linkType) => {
+                  const TypeIcon = LINK_TYPE_ICONS[linkType];
+                  const isCurrent = linkType === dep.type;
+                  const isDuplicate = !isCurrent && (task.dependencies ?? []).some(
+                    (d) => d.taskId === dep.taskId && d.type === linkType
+                  );
+                  return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
+                    "button",
+                    {
+                      type: "button",
+                      className: `gantt-tl-dep-type-option${isCurrent ? " active" : ""}${isDuplicate ? " gantt-tl-dep-type-option-duplicate" : ""}`,
+                      disabled: isDuplicate,
+                      onClick: () => {
+                        handleTypeChange(linkType);
+                        setTypeMenuOpen(false);
+                      },
+                      title: isDuplicate ? "\u0421\u0432\u044F\u0437\u044C \u0442\u0430\u043A\u043E\u0433\u043E \u0442\u0438\u043F\u0430 \u0443\u0436\u0435 \u0435\u0441\u0442\u044C" : `\u0422\u0438\u043F \u0441\u0432\u044F\u0437\u0438 ${LINK_TYPE_LABELS_RU2[linkType]}`,
+                      children: [
+                        /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(TypeIcon, {}),
+                        /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { children: LINK_TYPE_LABELS_RU2[linkType] })
+                      ]
+                    },
+                    linkType
+                  );
+                }) }) })
+              ] }),
+              /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("div", { className: "gantt-tl-dep-edit-actions-right", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+                  "button",
+                  {
+                    type: "button",
+                    className: "gantt-tl-dep-edit-close",
+                    onClick: () => {
+                      setPopoverOpen(false);
+                      onChipSelectClear();
+                    },
+                    children: "\u0417\u0430\u043A\u0440\u044B\u0442\u044C"
+                  }
+                ),
+                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+                  "button",
+                  {
+                    type: "button",
+                    className: "gantt-tl-dep-edit-delete",
+                    onClick: handleTrashClick,
+                    children: "\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u0432\u044F\u0437\u044C"
+                  }
+                )
+              ] })
             ] })
           ] })
         ] })
@@ -9484,7 +9602,7 @@ var TaskListRow = import_react12.default.memo(
                 {
                   className: "gantt-tl-dep-overflow-list",
                   onClick: (e) => e.stopPropagation(),
-                  children: chips.map(({ dep, lag, predecessorName }) => /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+                  children: chips.map(({ dep, lag, predecessorName }, chipIndex) => /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
                     DepChip,
                     {
                       lag,
@@ -9506,7 +9624,7 @@ var TaskListRow = import_react12.default.memo(
                       businessDays,
                       weekendPredicate
                     },
-                    `${dep.taskId}-${dep.type}`
+                    `${dep.taskId}-${chipIndex}`
                   ))
                 }
               ) })
@@ -9534,7 +9652,8 @@ var TaskListRow = import_react12.default.memo(
                 onTasksChange,
                 businessDays,
                 weekendPredicate
-              }
+              },
+              chips[0].dep.taskId
             )
           ) : null,
           !printDependencyLabels && !disableDependencyEditing && !isPicking && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(