gantt-lib 0.62.0 → 0.64.0

package/dist/index.js

@@ -4641,12 +4641,11 @@ var TaskListRow = import_react10.default.memo(
     }, [editingTaskId, task.id, disableTaskNameEditing]);
     const handleNameClick = (0, import_react10.useCallback)(
       (e) => {
-        if (disableTaskNameEditing) return;
         e.stopPropagation();
         onRowClick?.(task.id);
         onScrollToTask?.(task.id);
       },
-      [task.id, disableTaskNameEditing, onRowClick, onScrollToTask]
+      [task.id, onRowClick, onScrollToTask]
     );
     const handleNameDoubleClick = (0, import_react10.useCallback)(
       (e) => {
@@ -5433,7 +5432,8 @@ var TaskListRow = import_react10.default.memo(
                 id: crypto.randomUUID(),
                 name: "\u041D\u043E\u0432\u0430\u044F \u0437\u0430\u0434\u0430\u0447\u0430",
                 startDate: todayISO,
-                endDate: endISO
+                endDate: endISO,
+                parentId: task.parentId
               };
               onInsertAfter(task.id, newTask);
             },
@@ -6001,10 +6001,17 @@ TaskListRow.displayName = "TaskListRow";
 // src/components/TaskList/NewTaskRow.tsx
 var import_react11 = require("react");
 var import_jsx_runtime13 = require("react/jsx-runtime");
-var NewTaskRow = ({ rowHeight, onConfirm, onCancel }) => {
+var NewTaskRow = ({
+  rowHeight,
+  onConfirm,
+  onCancel,
+  nestingDepth = 0
+}) => {
   const [nameValue, setNameValue] = (0, import_react11.useState)("");
   const inputRef = (0, import_react11.useRef)(null);
   const confirmedRef = (0, import_react11.useRef)(false);
+  const inputInnerPadding = 4;
+  const levelOffset = nestingDepth > 0 ? nestingDepth * 20 + 8 : 0;
   (0, import_react11.useEffect)(() => {
     if (inputRef.current) {
       inputRef.current.focus();
@@ -6043,7 +6050,12 @@ var NewTaskRow = ({ rowHeight, onConfirm, onCancel }) => {
         onKeyDown: handleKeyDown,
         onBlur: handleBlur,
         placeholder: "\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435",
-        className: "gantt-tl-name-input"
+        className: "gantt-tl-name-input",
+        style: {
+          left: `${Math.max(0, levelOffset - inputInnerPadding)}px`,
+          width: levelOffset > 0 ? `calc(100% - ${Math.max(0, levelOffset - inputInnerPadding)}px)` : "100%",
+          paddingLeft: `${inputInnerPadding}px`
+        }
       }
     ) }),
     /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: "gantt-tl-cell" }),
@@ -6467,6 +6479,7 @@ var TaskList = ({
     onTasksChange?.([{ ...task, dependencies: updatedDeps }]);
   }, [tasks, onTasksChange]);
   const [isCreating, setIsCreating] = (0, import_react12.useState)(false);
+  const [pendingInsert, setPendingInsert] = (0, import_react12.useState)(null);
   const [draggingIndex, setDraggingIndex] = (0, import_react12.useState)(null);
   const [dragOverIndex, setDragOverIndex] = (0, import_react12.useState)(null);
   const dragOriginIndexRef = (0, import_react12.useRef)(null);
@@ -6625,6 +6638,81 @@ var TaskList = ({
     setIsCreating(false);
   }, [onAdd]);
   const handleCancelNewTask = (0, import_react12.useCallback)(() => setIsCreating(false), []);
+  const findInsertAfterTaskId = (0, import_react12.useCallback)((anchorTaskId) => {
+    const anchorIndex = orderedTasks.findIndex((task) => task.id === anchorTaskId);
+    if (anchorIndex === -1) {
+      return anchorTaskId;
+    }
+    const taskById = new Map(orderedTasks.map((task) => [task.id, task]));
+    let insertAfterTaskId = anchorTaskId;
+    for (let index = anchorIndex + 1; index < orderedTasks.length; index += 1) {
+      let currentParentId = orderedTasks[index]?.parentId;
+      let isDescendant = false;
+      while (currentParentId) {
+        if (currentParentId === anchorTaskId) {
+          isDescendant = true;
+          break;
+        }
+        currentParentId = taskById.get(currentParentId)?.parentId;
+      }
+      if (!isDescendant) {
+        break;
+      }
+      insertAfterTaskId = orderedTasks[index].id;
+    }
+    return insertAfterTaskId;
+  }, [orderedTasks]);
+  const pendingInsertDisplayTaskId = (0, import_react12.useMemo)(() => {
+    if (!pendingInsert) {
+      return null;
+    }
+    const taskById = new Map(visibleTasks.map((task) => [task.id, task]));
+    if (!taskById.has(pendingInsert.anchorTaskId)) {
+      return null;
+    }
+    let displayTaskId = pendingInsert.anchorTaskId;
+    for (const task of visibleTasks) {
+      let currentParentId = task.parentId;
+      while (currentParentId) {
+        if (currentParentId === pendingInsert.anchorTaskId) {
+          displayTaskId = task.id;
+          break;
+        }
+        currentParentId = taskById.get(currentParentId)?.parentId;
+      }
+    }
+    return displayTaskId;
+  }, [pendingInsert, visibleTasks]);
+  const handleStartInsertAfter = (0, import_react12.useCallback)((taskId, newTask) => {
+    const anchorTask = orderedTasks.find((task) => task.id === taskId);
+    if (!anchorTask) {
+      return;
+    }
+    setIsCreating(false);
+    setPendingInsert({
+      anchorTaskId: taskId,
+      insertAfterTaskId: findInsertAfterTaskId(taskId),
+      parentId: anchorTask.parentId,
+      startDate: newTask.startDate,
+      endDate: newTask.endDate,
+      nestingDepth: nestingDepthMap.get(taskId) ?? 0
+    });
+  }, [findInsertAfterTaskId, nestingDepthMap, orderedTasks]);
+  const handleConfirmInsertedTask = (0, import_react12.useCallback)((name) => {
+    if (!pendingInsert) {
+      return;
+    }
+    const newTask = {
+      id: crypto.randomUUID(),
+      name,
+      startDate: pendingInsert.startDate,
+      endDate: pendingInsert.endDate,
+      parentId: pendingInsert.parentId
+    };
+    onInsertAfter?.(pendingInsert.insertAfterTaskId, newTask);
+    setPendingInsert(null);
+  }, [onInsertAfter, pendingInsert]);
+  const handleCancelInsertedTask = (0, import_react12.useCallback)(() => setPendingInsert(null), []);
   function getTaskDepth(task, tasks2) {
     if (!task) return 0;
     let depth = 0;
@@ -6764,73 +6852,87 @@ var TaskList = ({
         /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: "gantt-tl-body", style: { height: `${totalHeight}px` }, children: visibleTasks.map((task, index) => {
           const previousVisibleTask = index > 0 ? visibleTasks[index - 1] : void 0;
           const canDemoteTask = index === 0 || !task.parentId || previousVisibleTask?.id !== task.parentId;
-          return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
-            TaskListRow,
-            {
-              task,
-              rowIndex: index,
-              taskNumber: originalTaskNumberMap[task.id] || "",
-              taskNumberMap: originalTaskNumberMap,
-              rowHeight,
-              onTasksChange,
-              selectedTaskId,
-              onRowClick: handleRowClick,
-              disableTaskNameEditing,
-              disableDependencyEditing,
-              allTasks: tasks,
-              activeLinkType,
-              onSetActiveLinkType: setActiveLinkType,
-              selectingPredecessorFor,
-              dependencyPickMode,
-              onSetDependencyPickMode: setDependencyPickMode,
-              onSetSelectingPredecessorFor: setSelectingPredecessorFor,
-              onAddDependency: handleAddDependency,
-              onRemoveDependency: handleRemoveDependency,
-              selectedChip,
-              onChipSelect: handleChipSelect,
-              onScrollToTask,
-              onDelete,
-              onAdd,
-              onInsertAfter,
-              editingTaskId: propEditingTaskId,
-              isDragging: draggingIndex === index,
-              isDragOver: dragOverIndex === index,
-              onDragStart: handleDragStart,
-              onDragOver: handleDragOver,
-              onDrop: handleDrop,
-              onDragEnd: handleDragEnd,
-              collapsedParentIds,
-              onToggleCollapse: handleToggleCollapse,
-              onPromoteTask,
-              onDemoteTask: onDemoteTask ? handleDemoteWrapper : void 0,
-              onDuplicateTask: onReorder ? handleDuplicateTask : void 0,
-              canDemoteTask,
-              isLastChild: lastChildIds.has(task.id),
-              nestingDepth: nestingDepthMap.get(task.id) ?? 0,
-              ancestorContinues: ancestorContinuesMap.get(task.id) ?? [],
-              customDays,
-              isWeekend: isWeekend3,
-              businessDays,
-              isFilterMatch: filterMode === "highlight" ? highlightedTaskIds.has(task.id) : false,
-              isFilterHideMode: filterMode === "hide" && isFilterActive,
-              resolvedColumns
-            },
-            task.id
-          );
+          return /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_react12.default.Fragment, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+              TaskListRow,
+              {
+                task,
+                rowIndex: index,
+                taskNumber: originalTaskNumberMap[task.id] || "",
+                taskNumberMap: originalTaskNumberMap,
+                rowHeight,
+                onTasksChange,
+                selectedTaskId,
+                onRowClick: handleRowClick,
+                disableTaskNameEditing,
+                disableDependencyEditing,
+                allTasks: tasks,
+                activeLinkType,
+                onSetActiveLinkType: setActiveLinkType,
+                selectingPredecessorFor,
+                dependencyPickMode,
+                onSetDependencyPickMode: setDependencyPickMode,
+                onSetSelectingPredecessorFor: setSelectingPredecessorFor,
+                onAddDependency: handleAddDependency,
+                onRemoveDependency: handleRemoveDependency,
+                selectedChip,
+                onChipSelect: handleChipSelect,
+                onScrollToTask,
+                onDelete,
+                onAdd,
+                onInsertAfter: handleStartInsertAfter,
+                editingTaskId: propEditingTaskId,
+                isDragging: draggingIndex === index,
+                isDragOver: dragOverIndex === index,
+                onDragStart: handleDragStart,
+                onDragOver: handleDragOver,
+                onDrop: handleDrop,
+                onDragEnd: handleDragEnd,
+                collapsedParentIds,
+                onToggleCollapse: handleToggleCollapse,
+                onPromoteTask,
+                onDemoteTask: onDemoteTask ? handleDemoteWrapper : void 0,
+                onDuplicateTask: onReorder ? handleDuplicateTask : void 0,
+                canDemoteTask,
+                isLastChild: lastChildIds.has(task.id),
+                nestingDepth: nestingDepthMap.get(task.id) ?? 0,
+                ancestorContinues: ancestorContinuesMap.get(task.id) ?? [],
+                customDays,
+                isWeekend: isWeekend3,
+                businessDays,
+                isFilterMatch: filterMode === "highlight" ? highlightedTaskIds.has(task.id) : false,
+                isFilterHideMode: filterMode === "hide" && isFilterActive,
+                resolvedColumns
+              }
+            ),
+            pendingInsertDisplayTaskId === task.id && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+              NewTaskRow,
+              {
+                rowHeight,
+                onConfirm: handleConfirmInsertedTask,
+                onCancel: handleCancelInsertedTask,
+                nestingDepth: pendingInsert?.nestingDepth ?? 0
+              }
+            )
+          ] }, task.id);
         }) }),
-        isCreating && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+        isCreating && !pendingInsert && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
           NewTaskRow,
           {
             rowHeight,
             onConfirm: handleConfirmNewTask,
-            onCancel: handleCancelNewTask
+            onCancel: handleCancelNewTask,
+            nestingDepth: 0
           }
         ),
-        enableAddTask && onAdd && !isCreating && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+        enableAddTask && onAdd && !isCreating && !pendingInsert && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
           "button",
           {
             className: `gantt-tl-add-btn${dragOverIndex === visibleTasks.length ? " gantt-tl-add-btn-drag-over" : ""}`,
-            onClick: () => setIsCreating(true),
+            onClick: () => {
+              setPendingInsert(null);
+              setIsCreating(true);
+            },
             onDragEnter: (e) => {
               e.preventDefault();
               setDragOverIndex(visibleTasks.length);
@@ -6972,7 +7074,7 @@ function GanttChartInner(props, ref) {
     if (todayIndex === -1) return;
     const todayOffset = todayIndex * dayWidth;
     const containerWidth = container.clientWidth;
-    const scrollLeft = Math.round(todayOffset - containerWidth / 2 + dayWidth / 2);
+    const scrollLeft = Math.round(todayOffset + dayWidth / 2 - containerWidth * 0.3);
     container.scrollLeft = Math.max(0, scrollLeft);
   }, []);
   (0, import_react13.useEffect)(() => {
@@ -6996,7 +7098,7 @@ function GanttChartInner(props, ref) {
     if (todayIndex === -1) return;
     const todayOffset = todayIndex * dayWidth;
     const containerWidth = container.clientWidth;
-    const scrollLeft = Math.round(todayOffset - containerWidth / 2 + dayWidth / 2);
+    const scrollLeft = Math.round(todayOffset + dayWidth / 2 - containerWidth * 0.3);
     container.scrollTo({ left: Math.max(0, scrollLeft), behavior: "smooth" });
   }, [dateRange, dayWidth]);
   const scrollToTask = (0, import_react13.useCallback)((taskId) => {
@@ -7107,7 +7209,6 @@ function GanttChartInner(props, ref) {
     toDelete.forEach((id) => onDelete?.(id));
   }, [tasks, onTasksChange, onDelete]);
   const handleInsertAfter = (0, import_react13.useCallback)((taskId, newTask) => {
-    setEditingTaskId(newTask.id);
     onInsertAfter?.(taskId, newTask);
   }, [onInsertAfter]);
   const handleReorder = (0, import_react13.useCallback)((reorderedTasks, movedTaskId, inferredParentId) => {