gantt-lib 0.6.0 → 0.6.2

package/dist/index.d.mts

@@ -924,4 +924,17 @@ declare const calculateOrthogonalPath: (from: {
     y: number;
 }) => string;
 
-export { Button, type ButtonProps, Calendar, type CalendarProps, DatePicker, type DatePickerProps, DragGuideLines, GanttChart, type GanttChartHandle, type GanttChartProps, type GanttDateRange, GridBackground, type GridConfig, type GridLine, Input, type InputProps, type MonthSpan, Popover, PopoverContent, type PopoverContentProps, type PopoverProps, PopoverTrigger, type Task, type TaskBarGeometry, type TaskDependency, TaskList, type TaskListProps, TaskRow, TimeScaleHeader, TodayIndicator, type WeekendBlock, buildAdjacencyList, calculateBezierPath, calculateDependencyPath, calculateGridLines, calculateGridWidth, calculateOrthogonalPath, calculateSuccessorDate, calculateTaskBar, calculateWeekendBlocks, cascadeByLinks, computeLagFromDates, computeParentDates, computeParentProgress, detectCycles, detectEdgeZone, findParentId, formatDateLabel, getAllDependencyEdges, getChildren, getCursorForPosition, getDayOffset, getMonthDays, getMonthSpans, getMultiMonthDays, getSuccessorChain, getTransitiveCascadeChain, isTaskParent, isToday, isWeekend, parseUTCDate, pixelsToDate, recalculateIncomingLags, removeDependenciesBetweenTasks, useTaskDrag, validateDependencies };
+/**
+ * Build a stable depth-first task order from parentId links.
+ * Sibling order follows the order in the input array.
+ * Tasks with missing parents are treated as root tasks.
+ */
+declare function flattenHierarchy<T extends Task$1>(tasks: T[]): T[];
+/**
+ * Normalize hierarchy-aware display fields.
+ * Parent task dates and progress are always recomputed from children,
+ * taking precedence over any hardcoded parent values from the input.
+ */
+declare function normalizeHierarchyTasks<T extends Task$1>(tasks: T[]): T[];
+
+export { Button, type ButtonProps, Calendar, type CalendarProps, DatePicker, type DatePickerProps, DragGuideLines, GanttChart, type GanttChartHandle, type GanttChartProps, type GanttDateRange, GridBackground, type GridConfig, type GridLine, Input, type InputProps, type MonthSpan, Popover, PopoverContent, type PopoverContentProps, type PopoverProps, PopoverTrigger, type Task, type TaskBarGeometry, type TaskDependency, TaskList, type TaskListProps, TaskRow, TimeScaleHeader, TodayIndicator, type WeekendBlock, buildAdjacencyList, calculateBezierPath, calculateDependencyPath, calculateGridLines, calculateGridWidth, calculateOrthogonalPath, calculateSuccessorDate, calculateTaskBar, calculateWeekendBlocks, cascadeByLinks, computeLagFromDates, computeParentDates, computeParentProgress, detectCycles, detectEdgeZone, findParentId, flattenHierarchy, formatDateLabel, getAllDependencyEdges, getChildren, getCursorForPosition, getDayOffset, getMonthDays, getMonthSpans, getMultiMonthDays, getSuccessorChain, getTransitiveCascadeChain, isTaskParent, isToday, isWeekend, normalizeHierarchyTasks, parseUTCDate, pixelsToDate, recalculateIncomingLags, removeDependenciesBetweenTasks, useTaskDrag, validateDependencies };

package/dist/index.d.ts

@@ -924,4 +924,17 @@ declare const calculateOrthogonalPath: (from: {
     y: number;
 }) => string;
 
-export { Button, type ButtonProps, Calendar, type CalendarProps, DatePicker, type DatePickerProps, DragGuideLines, GanttChart, type GanttChartHandle, type GanttChartProps, type GanttDateRange, GridBackground, type GridConfig, type GridLine, Input, type InputProps, type MonthSpan, Popover, PopoverContent, type PopoverContentProps, type PopoverProps, PopoverTrigger, type Task, type TaskBarGeometry, type TaskDependency, TaskList, type TaskListProps, TaskRow, TimeScaleHeader, TodayIndicator, type WeekendBlock, buildAdjacencyList, calculateBezierPath, calculateDependencyPath, calculateGridLines, calculateGridWidth, calculateOrthogonalPath, calculateSuccessorDate, calculateTaskBar, calculateWeekendBlocks, cascadeByLinks, computeLagFromDates, computeParentDates, computeParentProgress, detectCycles, detectEdgeZone, findParentId, formatDateLabel, getAllDependencyEdges, getChildren, getCursorForPosition, getDayOffset, getMonthDays, getMonthSpans, getMultiMonthDays, getSuccessorChain, getTransitiveCascadeChain, isTaskParent, isToday, isWeekend, parseUTCDate, pixelsToDate, recalculateIncomingLags, removeDependenciesBetweenTasks, useTaskDrag, validateDependencies };
+/**
+ * Build a stable depth-first task order from parentId links.
+ * Sibling order follows the order in the input array.
+ * Tasks with missing parents are treated as root tasks.
+ */
+declare function flattenHierarchy<T extends Task$1>(tasks: T[]): T[];
+/**
+ * Normalize hierarchy-aware display fields.
+ * Parent task dates and progress are always recomputed from children,
+ * taking precedence over any hardcoded parent values from the input.
+ */
+declare function normalizeHierarchyTasks<T extends Task$1>(tasks: T[]): T[];
+
+export { Button, type ButtonProps, Calendar, type CalendarProps, DatePicker, type DatePickerProps, DragGuideLines, GanttChart, type GanttChartHandle, type GanttChartProps, type GanttDateRange, GridBackground, type GridConfig, type GridLine, Input, type InputProps, type MonthSpan, Popover, PopoverContent, type PopoverContentProps, type PopoverProps, PopoverTrigger, type Task, type TaskBarGeometry, type TaskDependency, TaskList, type TaskListProps, TaskRow, TimeScaleHeader, TodayIndicator, type WeekendBlock, buildAdjacencyList, calculateBezierPath, calculateDependencyPath, calculateGridLines, calculateGridWidth, calculateOrthogonalPath, calculateSuccessorDate, calculateTaskBar, calculateWeekendBlocks, cascadeByLinks, computeLagFromDates, computeParentDates, computeParentProgress, detectCycles, detectEdgeZone, findParentId, flattenHierarchy, formatDateLabel, getAllDependencyEdges, getChildren, getCursorForPosition, getDayOffset, getMonthDays, getMonthSpans, getMultiMonthDays, getSuccessorChain, getTransitiveCascadeChain, isTaskParent, isToday, isWeekend, normalizeHierarchyTasks, parseUTCDate, pixelsToDate, recalculateIncomingLags, removeDependenciesBetweenTasks, useTaskDrag, validateDependencies };

package/dist/index.js

@@ -61,6 +61,7 @@ __export(index_exports, {
   detectCycles: () => detectCycles,
   detectEdgeZone: () => detectEdgeZone,
   findParentId: () => findParentId,
+  flattenHierarchy: () => flattenHierarchy,
   formatDateLabel: () => formatDateLabel,
   getAllDependencyEdges: () => getAllDependencyEdges,
   getChildren: () => getChildren,
@@ -74,6 +75,7 @@ __export(index_exports, {
   isTaskParent: () => isTaskParent,
   isToday: () => isToday,
   isWeekend: () => isWeekend,
+  normalizeHierarchyTasks: () => normalizeHierarchyTasks,
   parseUTCDate: () => parseUTCDate,
   pixelsToDate: () => pixelsToDate,
   recalculateIncomingLags: () => recalculateIncomingLags,
@@ -575,6 +577,55 @@ function findParentId(taskId, tasks) {
   return task?.parentId;
 }
 
+// src/utils/hierarchyOrder.ts
+function flattenHierarchy(tasks) {
+  const byId = new Map(tasks.map((task) => [task.id, task]));
+  const byParent = /* @__PURE__ */ new Map();
+  for (const task of tasks) {
+    const normalizedParentId = task.parentId && byId.has(task.parentId) ? task.parentId : void 0;
+    const siblings = byParent.get(normalizedParentId) ?? [];
+    siblings.push(task);
+    byParent.set(normalizedParentId, siblings);
+  }
+  const result = [];
+  const visited = /* @__PURE__ */ new Set();
+  const walk = (parentId) => {
+    const children = byParent.get(parentId) ?? [];
+    for (const task of children) {
+      if (visited.has(task.id)) continue;
+      visited.add(task.id);
+      result.push(task);
+      walk(task.id);
+    }
+  };
+  walk(void 0);
+  for (const task of tasks) {
+    if (!visited.has(task.id)) {
+      result.push(task);
+    }
+  }
+  return result;
+}
+function normalizeHierarchyTasks(tasks) {
+  const orderedTasks = flattenHierarchy(tasks).map((task) => ({ ...task }));
+  for (const task of [...orderedTasks].reverse()) {
+    if (!isTaskParent(task.id, orderedTasks)) continue;
+    const { startDate, endDate } = computeParentDates(task.id, orderedTasks);
+    const progress = computeParentProgress(task.id, orderedTasks);
+    const normalizedStartDate = startDate.toISOString().split("T")[0];
+    const normalizedEndDate = endDate.toISOString().split("T")[0];
+    const parentIndex = orderedTasks.findIndex((candidate) => candidate.id === task.id);
+    if (parentIndex === -1) continue;
+    orderedTasks[parentIndex] = {
+      ...orderedTasks[parentIndex],
+      startDate: normalizedStartDate,
+      endDate: normalizedEndDate,
+      progress
+    };
+  }
+  return orderedTasks;
+}
+
 // src/components/TimeScaleHeader/TimeScaleHeader.tsx
 var import_react = require("react");
 var import_date_fns = require("date-fns");
@@ -3144,13 +3195,14 @@ var TaskList = ({
       return next;
     });
   }, []);
+  const orderedTasks = (0, import_react12.useMemo)(() => normalizeHierarchyTasks(tasks), [tasks]);
   const visibleTasks = (0, import_react12.useMemo)(() => {
-    return tasks.filter((task) => {
+    return orderedTasks.filter((task) => {
       if (!task.parentId) return true;
       const parentCollapsed = collapsedParentIds.has(task.parentId);
       return !parentCollapsed;
     });
-  }, [tasks, collapsedParentIds]);
+  }, [orderedTasks, collapsedParentIds]);
   const totalHeight = (0, import_react12.useMemo)(
     () => visibleTasks.length * rowHeight,
     [visibleTasks.length, rowHeight]
@@ -3272,9 +3324,9 @@ var TaskList = ({
       dragOriginIndexRef.current = null;
       return;
     }
-    const reordered = [...tasks];
+    const reordered = [...orderedTasks];
     const [moved] = reordered.splice(originIndex, 1);
-    const insertIndex = dropIndex === tasks.length ? tasks.length - 1 : originIndex < dropIndex ? dropIndex - 1 : dropIndex;
+    const insertIndex = dropIndex === visibleTasks.length ? visibleTasks.length - 1 : originIndex < dropIndex ? dropIndex - 1 : dropIndex;
     const isChild = !!moved.parentId;
     const isParent = tasks.some((t) => t.parentId === moved.id);
     const taskType = isParent ? "PARENT" : isChild ? "CHILD" : "ROOT";
@@ -3289,7 +3341,7 @@ var TaskList = ({
       insertIndex,
       direction: originIndex < dropIndex ? "DOWN" : "UP"
     });
-    console.log("[TASKS ARRAY LENGTH]", tasks.length);
+    console.log("[TASKS ARRAY LENGTH]", orderedTasks.length);
     let inferredParentId;
     if (moved.parentId) {
       const parentIndex = reordered.findIndex((t) => t.id === moved.parentId);
@@ -3374,7 +3426,7 @@ var TaskList = ({
     setDraggingIndex(null);
     setDragOverIndex(null);
     dragOriginIndexRef.current = null;
-  }, [tasks, onReorder, onTaskSelect]);
+  }, [orderedTasks, visibleTasks.length, onReorder, onTaskSelect]);
   const handleDragEnd = (0, import_react12.useCallback)(() => {
     setDraggingIndex(null);
     setDragOverIndex(null);
@@ -3497,16 +3549,16 @@ var TaskList = ({
         enableAddTask && onAdd && !isCreating && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
           "button",
           {
-            className: `gantt-tl-add-btn${dragOverIndex === tasks.length ? " gantt-tl-add-btn-drag-over" : ""}`,
+            className: `gantt-tl-add-btn${dragOverIndex === visibleTasks.length ? " gantt-tl-add-btn-drag-over" : ""}`,
             onClick: () => setIsCreating(true),
             onDragEnter: (e) => {
               e.preventDefault();
-              setDragOverIndex(tasks.length);
+              setDragOverIndex(visibleTasks.length);
             },
             onDragOver: (e) => {
               e.preventDefault();
               e.dataTransfer.dropEffect = "move";
-              setDragOverIndex(tasks.length);
+              setDragOverIndex(visibleTasks.length);
             },
             onDragLeave: (e) => {
               e.preventDefault();
@@ -3514,7 +3566,7 @@ var TaskList = ({
             },
             onDrop: (e) => {
               e.preventDefault();
-              handleDrop(tasks.length, e);
+              handleDrop(visibleTasks.length, e);
             },
             type: "button",
             children: "+ \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0437\u0430\u0434\u0430\u0447\u0443"
@@ -3554,7 +3606,8 @@ var GanttChart = (0, import_react13.forwardRef)(({
   const [selectedChip, setSelectedChip] = (0, import_react13.useState)(null);
   const [collapsedParentIds, setCollapsedParentIds] = (0, import_react13.useState)(/* @__PURE__ */ new Set());
   const [editingTaskId, setEditingTaskId] = (0, import_react13.useState)(null);
-  const dateRange = (0, import_react13.useMemo)(() => getMultiMonthDays(tasks), [tasks]);
+  const normalizedTasks = (0, import_react13.useMemo)(() => normalizeHierarchyTasks(tasks), [tasks]);
+  const dateRange = (0, import_react13.useMemo)(() => getMultiMonthDays(normalizedTasks), [normalizedTasks]);
   const [validationResult, setValidationResult] = (0, import_react13.useState)(null);
   const [cascadeOverrides, setCascadeOverrides] = (0, import_react13.useState)(/* @__PURE__ */ new Map());
   const gridWidth = (0, import_react13.useMemo)(
@@ -3562,12 +3615,12 @@ var GanttChart = (0, import_react13.forwardRef)(({
     [dateRange.length, dayWidth]
   );
   const filteredTasks = (0, import_react13.useMemo)(() => {
-    return tasks.filter((task) => {
+    return normalizedTasks.filter((task) => {
       if (!task.parentId) return true;
       const parentCollapsed = collapsedParentIds.has(task.parentId);
       return !parentCollapsed;
     });
-  }, [tasks, collapsedParentIds]);
+  }, [normalizedTasks, collapsedParentIds]);
   const totalGridHeight = (0, import_react13.useMemo)(
     () => filteredTasks.length * rowHeight,
     [filteredTasks.length, rowHeight]
@@ -3813,9 +3866,9 @@ var GanttChart = (0, import_react13.forwardRef)(({
         updatedCount: updated.length
       });
       console.log("=== GANTT CHART handleReorder END ===\n");
-      return updated;
+      return normalizeHierarchyTasks(updated);
     });
-    onReorder?.(reorderedTasks, movedTaskId, inferredParentId);
+    onReorder?.(normalizeHierarchyTasks(reorderedTasks), movedTaskId, inferredParentId);
   }, [onChange, onReorder]);
   const dependencyOverrides = (0, import_react13.useMemo)(() => {
     const map = new Map(cascadeOverrides);
@@ -3882,15 +3935,15 @@ var GanttChart = (0, import_react13.forwardRef)(({
       const parentId = taskToPromote.parentId;
       const siblings = currentTasks.filter((t) => t.parentId === parentId);
       if (siblings.length <= 1) {
-        return currentTasks.map(
+        return normalizeHierarchyTasks(currentTasks.map(
           (t) => t.id === taskId ? { ...t, parentId: void 0 } : t
-        );
+        ));
       }
       const lastSiblingIndex = currentTasks.map((t, i) => ({ task: t, index: i })).filter(({ task }) => task.parentId === parentId).sort((a, b) => b.index - a.index)[0];
       if (!lastSiblingIndex) {
-        return currentTasks.map(
+        return normalizeHierarchyTasks(currentTasks.map(
           (t) => t.id === taskId ? { ...t, parentId: void 0 } : t
-        );
+        ));
       }
       const withoutPromotedTask = currentTasks.filter((t) => t.id !== taskId);
       const insertIndex = lastSiblingIndex.index + 1;
@@ -3900,7 +3953,7 @@ var GanttChart = (0, import_react13.forwardRef)(({
         promotedTask,
         ...withoutPromotedTask.slice(insertIndex)
       ];
-      return newTasks;
+      return normalizeHierarchyTasks(newTasks);
     });
   }, [onChange]);
   const handleDemoteTask = (0, import_react13.useCallback)((taskId, newParentId) => {
@@ -3933,7 +3986,7 @@ var GanttChart = (0, import_react13.forwardRef)(({
       updatedTasks = updatedTasks.map(
         (t) => t.id === newParentId ? { ...t, startDate: parentDates.startDate.toISOString().split("T")[0], endDate: parentDates.endDate.toISOString().split("T")[0], progress: parentProgress } : t
       );
-      return updatedTasks;
+      return normalizeHierarchyTasks(updatedTasks);
     });
   }, [onChange]);
   const panStateRef = (0, import_react13.useRef)(null);
@@ -3991,7 +4044,7 @@ var GanttChart = (0, import_react13.forwardRef)(({
         /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
           TaskList,
           {
-            tasks,
+            tasks: normalizedTasks,
             rowHeight,
             headerHeight,
             taskListWidth,
@@ -4046,7 +4099,7 @@ var GanttChart = (0, import_react13.forwardRef)(({
                   DependencyLines_default,
                   {
                     tasks: filteredTasks,
-                    allTasks: tasks,
+                    allTasks: normalizedTasks,
                     collapsedParentIds,
                     monthStart,
                     dayWidth,
@@ -4084,7 +4137,7 @@ var GanttChart = (0, import_react13.forwardRef)(({
                       }
                     },
                     rowIndex: index,
-                    allTasks: tasks,
+                    allTasks: normalizedTasks,
                     enableAutoSchedule: enableAutoSchedule ?? false,
                     disableConstraints: disableConstraints ?? false,
                     overridePosition: cascadeOverrides.get(task.id),
@@ -4151,6 +4204,7 @@ Button.displayName = "Button";
   detectCycles,
   detectEdgeZone,
   findParentId,
+  flattenHierarchy,
   formatDateLabel,
   getAllDependencyEdges,
   getChildren,
@@ -4164,6 +4218,7 @@ Button.displayName = "Button";
   isTaskParent,
   isToday,
   isWeekend,
+  normalizeHierarchyTasks,
   parseUTCDate,
   pixelsToDate,
   recalculateIncomingLags,