gantt-lib 0.52.0 → 0.53.1

package/dist/index.mjs

@@ -721,6 +721,22 @@ function validateDependencies(tasks) {
       }
     }
   }
+  for (const task of tasks) {
+    if (!task.dependencies) continue;
+    for (const dep of task.dependencies) {
+      if (!taskIds.has(dep.taskId)) {
+        continue;
+      }
+      if (areTasksHierarchicallyRelated(task.id, dep.taskId, tasks)) {
+        errors.push({
+          type: "constraint",
+          taskId: task.id,
+          message: `Dependencies between parent and child tasks are not allowed: ${dep.taskId} -> ${task.id}`,
+          relatedTaskIds: [dep.taskId, task.id]
+        });
+      }
+    }
+  }
   const cycleResult = detectCycles(tasks);
   if (cycleResult.hasCycle && cycleResult.cyclePath) {
     errors.push({
@@ -979,6 +995,28 @@ function findParentId(taskId, tasks) {
   const task = tasks.find((t) => t.id === taskId);
   return task?.parentId;
 }
+function isAncestorTask(ancestorId, taskId, tasks) {
+  const taskById = new Map(tasks.map((task) => [task.id, task]));
+  const visited = /* @__PURE__ */ new Set();
+  let current = taskById.get(taskId);
+  while (current?.parentId) {
+    if (current.parentId === ancestorId) {
+      return true;
+    }
+    if (visited.has(current.parentId)) {
+      return false;
+    }
+    visited.add(current.parentId);
+    current = taskById.get(current.parentId);
+  }
+  return false;
+}
+function areTasksHierarchicallyRelated(taskId1, taskId2, tasks) {
+  if (taskId1 === taskId2) {
+    return true;
+  }
+  return isAncestorTask(taskId1, taskId2, tasks) || isAncestorTask(taskId2, taskId1, tasks);
+}
 function getAllDescendants(parentId, tasks) {
   const descendants = [];
   const visited = /* @__PURE__ */ new Set();
@@ -3257,6 +3295,20 @@ var DatePicker = ({
     },
     [selectedDate, updateFromDate, businessDays, isWeekend3]
   );
+  const handleTriggerKeyDown = useCallback3((e) => {
+    if (disabled) return;
+    if (e.key === "ArrowUp") {
+      e.preventDefault();
+      e.stopPropagation();
+      handleDayShift(1);
+      return;
+    }
+    if (e.key === "ArrowDown") {
+      e.preventDefault();
+      e.stopPropagation();
+      handleDayShift(-1);
+    }
+  }, [disabled, handleDayShift]);
   const handleKeyDown = useCallback3((e) => {
     if (!dateInputRef.current) return;
     const { value: inputVal } = dateInputRef.current;
@@ -3364,6 +3416,7 @@ var DatePicker = ({
         type: "button",
         className: `gantt-datepicker-trigger${className ? ` ${className}` : ""}`,
         disabled,
+        onKeyDown: handleTriggerKeyDown,
         onClick: (e) => {
           e.stopPropagation();
         },
@@ -5834,7 +5887,7 @@ var TaskList = ({
   const [selectingPredecessorFor, setSelectingPredecessorFor] = useState6(null);
   const [dependencyPickMode, setDependencyPickMode] = useState6("successor");
   const [typeMenuOpen, setTypeMenuOpen] = useState6(false);
-  const [cycleError, setCycleError] = useState6(false);
+  const [dependencyError, setDependencyError] = useState6(null);
   const overlayRef = useRef6(null);
   const [selectedChip, setSelectedChip] = useState6(null);
   const handleChipSelect = useCallback5((chip) => {
@@ -5869,6 +5922,12 @@ var TaskList = ({
   }, [selectingPredecessorFor, selectedChip, selectedTaskId, onTaskSelect, onSelectedChipChange]);
   const handleAddDependency = useCallback5((successorTaskId, predecessorTaskId, linkType) => {
     if (successorTaskId === predecessorTaskId) return;
+    if (areTasksHierarchicallyRelated(successorTaskId, predecessorTaskId, tasks)) {
+      setDependencyError("\u0421\u0432\u044F\u0437\u0438 \u043C\u0435\u0436\u0434\u0443 \u0440\u043E\u0434\u0438\u0442\u0435\u043B\u0435\u043C \u0438 \u043F\u043E\u0442\u043E\u043C\u043A\u043E\u043C \u0437\u0430\u043F\u0440\u0435\u0449\u0435\u043D\u044B");
+      setTimeout(() => setDependencyError(null), 3e3);
+      setSelectingPredecessorFor(null);
+      return;
+    }
     const successor = tasks.find((t) => t.id === successorTaskId);
     if (!successor) return;
     const alreadyExists = (successor.dependencies ?? []).some(
@@ -5884,8 +5943,11 @@ var TaskList = ({
     );
     const validation = validateDependencies(hypothetical);
     if (!validation.isValid) {
-      setCycleError(true);
-      setTimeout(() => setCycleError(false), 3e3);
+      const hasHierarchyConstraint = validation.errors.some((error) => error.type === "constraint");
+      setDependencyError(
+        hasHierarchyConstraint ? "\u0421\u0432\u044F\u0437\u0438 \u043C\u0435\u0436\u0434\u0443 \u0440\u043E\u0434\u0438\u0442\u0435\u043B\u0435\u043C \u0438 \u043F\u043E\u0442\u043E\u043C\u043A\u043E\u043C \u0437\u0430\u043F\u0440\u0435\u0449\u0435\u043D\u044B" : "\u0426\u0438\u043A\u043B \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0435\u0439!"
+      );
+      setTimeout(() => setDependencyError(null), 3e3);
       return;
     }
     const updatedTask = hypothetical.find((t) => t.id === successorTaskId);
@@ -6209,7 +6271,7 @@ var TaskList = ({
                       lt
                     )) }) })
                   ] }),
-                  cycleError && /* @__PURE__ */ jsx14("div", { className: "gantt-tl-dep-error", children: "\u0426\u0438\u043A\u043B \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0435\u0439!" })
+                  dependencyError && /* @__PURE__ */ jsx14("div", { className: "gantt-tl-dep-error", children: dependencyError })
                 ]
               },
               col.id
@@ -6556,20 +6618,8 @@ function GanttChartInner(props, ref) {
       }
       return;
     }
-    const isParent = isTaskParent(updatedTask.id, tasks);
-    if (isParent) {
-      const { startDate: parentStart, endDate: parentEnd } = computeParentDates(updatedTask.id, tasks);
-      const parentWithRecalcDates = {
-        ...updatedTask,
-        startDate: parentStart.toISOString().split("T")[0],
-        endDate: parentEnd.toISOString().split("T")[0]
-      };
-      const cascadedTasks = disableConstraints ? [parentWithRecalcDates] : universalCascade(parentWithRecalcDates, parentStart, parentEnd, tasks, businessDays, isCustomWeekend);
-      onTasksChange?.(cascadedTasks);
-    } else {
-      const cascadedTasks = disableConstraints ? [updatedTask] : universalCascade(updatedTask, newStart, newEnd, tasks, businessDays, isCustomWeekend);
-      onTasksChange?.(cascadedTasks);
-    }
+    const cascadedTasks = disableConstraints ? [updatedTask] : universalCascade(updatedTask, newStart, newEnd, tasks, businessDays, isCustomWeekend);
+    onTasksChange?.(cascadedTasks);
   }, [tasks, onTasksChange, disableConstraints, editingTaskId, businessDays, isCustomWeekend]);
   const handleDelete = useCallback6((taskId) => {
     const toDelete = /* @__PURE__ */ new Set([taskId]);
@@ -7010,6 +7060,7 @@ export {
   addBusinessDays,
   alignToWorkingDay,
   and,
+  areTasksHierarchicallyRelated,
   buildAdjacencyList,
   buildTaskRangeFromEnd,
   buildTaskRangeFromStart,
@@ -7056,6 +7107,7 @@ export {
   getWeekSpans,
   getYearSpans,
   inDateRange,
+  isAncestorTask,
   isTaskExpired,
   isTaskParent,
   isToday,