gantt-lib 0.70.0 → 0.71.1

package/dist/index.js

@@ -4667,7 +4667,8 @@ var TaskListRow = import_react10.default.memo(
     canDemoteTask = true,
     isLastChild = true,
     nestingDepth = 0,
-    ancestorContinues = [],
+    hasVisibleChildren = false,
+    ancestorLineModes = [],
     customDays,
     isWeekend: isWeekend3,
     businessDays,
@@ -4724,6 +4725,9 @@ var TaskListRow = import_react10.default.memo(
       [businessDays, weekendPredicate]
     );
     const isCollapsed = collapsedParentIds.has(task.id);
+    const getHierarchyLineColor = (0, import_react10.useCallback)((columnDepth) => {
+      return columnDepth % 2 === 0 ? "#93c5fd" : "var(--gantt-hierarchy-line-color)";
+    }, []);
     const isPicking = selectingPredecessorFor != null;
     const isSourceRow = isPicking && selectingPredecessorFor === task.id;
     const [dependencySearchQuery, setDependencySearchQuery] = (0, import_react10.useState)("");
@@ -5472,23 +5476,41 @@ var TaskListRow = import_react10.default.memo(
     const nameCell = /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: "gantt-tl-cell gantt-tl-cell-name", children: [
       isChild && !editingName && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(import_jsx_runtime12.Fragment, { children: [
         !isFilterHideMode && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(import_jsx_runtime12.Fragment, { children: [
-          ancestorContinues.map(
-            (continues, idx) => continues ? /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
-              "span",
-              {
-                style: {
-                  position: "absolute",
-                  left: `${idx * 20 + 9}px`,
-                  top: 0,
-                  height: `${rowHeight}px`,
-                  width: "1.5px",
-                  background: "var(--gantt-hierarchy-line-color)",
-                  borderRadius: "1px",
-                  pointerEvents: "none"
+          ancestorLineModes.map(
+            (mode, idx) => mode ? /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(import_react10.default.Fragment, { children: [
+              /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+                "span",
+                {
+                  "data-testid": `gantt-tl-ancestor-connector-${idx}`,
+                  style: {
+                    position: "absolute",
+                    left: `${idx * 20 + 9}px`,
+                    top: 0,
+                    height: mode === "half" ? `${rowHeight / 2}px` : `${rowHeight}px`,
+                    width: "1.5px",
+                    background: getHierarchyLineColor(idx),
+                    borderRadius: "1px",
+                    pointerEvents: "none"
+                  }
                 }
-              },
-              idx
-            ) : null
+              ),
+              mode === "half" && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+                "span",
+                {
+                  "data-testid": `gantt-tl-ancestor-connector-cap-${idx}`,
+                  style: {
+                    position: "absolute",
+                    left: `${idx * 20 + 9}px`,
+                    top: `${rowHeight / 2 - 0.75}px`,
+                    width: "5px",
+                    height: "1.5px",
+                    background: getHierarchyLineColor(idx),
+                    borderRadius: "1px",
+                    pointerEvents: "none"
+                  }
+                }
+              )
+            ] }, idx) : null
           ),
           nestingDepth > 0 && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
             "span",
@@ -5498,9 +5520,9 @@ var TaskListRow = import_react10.default.memo(
                 position: "absolute",
                 left: `${(nestingDepth - 1) * 20 + 9}px`,
                 top: 0,
-                height: isLastChild ? `${rowHeight / 2}px` : `${rowHeight}px`,
+                height: isLastChild && !hasVisibleChildren ? `${rowHeight / 2}px` : `${rowHeight}px`,
                 width: "1.5px",
-                background: "var(--gantt-hierarchy-line-color)",
+                background: getHierarchyLineColor(nestingDepth - 1),
                 borderRadius: "1px",
                 pointerEvents: "none"
               }
@@ -5515,7 +5537,7 @@ var TaskListRow = import_react10.default.memo(
                 top: `${rowHeight / 2 - 0.75}px`,
                 width: "8px",
                 height: "1.5px",
-                background: "var(--gantt-hierarchy-line-color)",
+                background: getHierarchyLineColor(nestingDepth - 1),
                 borderRadius: "1px",
                 pointerEvents: "none"
               }
@@ -5531,7 +5553,7 @@ var TaskListRow = import_react10.default.memo(
                 width: "4px",
                 height: "4px",
                 borderRadius: "50%",
-                background: "var(--gantt-hierarchy-line-color)",
+                background: getHierarchyLineColor(nestingDepth - 1),
                 pointerEvents: "none"
               }
             }
@@ -5547,7 +5569,7 @@ var TaskListRow = import_react10.default.memo(
                 top: `${rowHeight / 2 + 7}px`,
                 height: `${rowHeight / 2 - 7}px`,
                 width: "1.5px",
-                background: "var(--gantt-hierarchy-line-color)",
+                background: getHierarchyLineColor(nestingDepth),
                 borderRadius: "1px",
                 pointerEvents: "none"
               }
@@ -5577,7 +5599,7 @@ var TaskListRow = import_react10.default.memo(
               top: `${rowHeight / 2 + 7}px`,
               height: `${rowHeight / 2 - 7}px`,
               width: "1.5px",
-              background: "var(--gantt-hierarchy-line-color)",
+              background: getHierarchyLineColor(nestingDepth),
               borderRadius: "1px",
               pointerEvents: "none"
             }
@@ -5916,7 +5938,7 @@ var TaskListRow = import_react10.default.memo(
             "span",
             {
               style: editingDuration ? { visibility: "hidden", pointerEvents: "none" } : void 0,
-              children: isMilestone ? "0" : `${getDuration(normalizedTask.startDate, normalizedTask.endDate)}\u0434`
+              children: isMilestone ? "\u25C6" : `${getDuration(normalizedTask.startDate, normalizedTask.endDate)}\u0434`
             }
           )
         ]
@@ -6564,20 +6586,41 @@ var TaskList = ({
     }
     return last;
   }, [visibleTasks]);
-  const ancestorContinuesMap = (0, import_react12.useMemo)(() => {
+  const visibleParentIds = (0, import_react12.useMemo)(() => {
+    const parentIds = /* @__PURE__ */ new Set();
+    for (const task of visibleTasks) {
+      if (task.parentId) parentIds.add(task.parentId);
+    }
+    return parentIds;
+  }, [visibleTasks]);
+  const ancestorLineModesMap = (0, import_react12.useMemo)(() => {
     const taskById = new Map(tasks.map((t) => [t.id, t]));
+    const isDescendantOf = (taskId, ancestorId) => {
+      let current = taskById.get(taskId);
+      while (current?.parentId && taskById.has(current.parentId)) {
+        if (current.parentId === ancestorId) return true;
+        current = taskById.get(current.parentId);
+      }
+      return false;
+    };
     const map = /* @__PURE__ */ new Map();
-    for (const task of visibleTasks) {
-      const continues = [];
+    for (let index = 0; index < visibleTasks.length; index++) {
+      const task = visibleTasks[index];
+      const ancestorIds = [];
       let current = taskById.get(task.id);
       while (current?.parentId && taskById.has(current.parentId)) {
-        continues.unshift(!lastChildIds.has(current.id));
+        ancestorIds.unshift(current.parentId);
         current = taskById.get(current.parentId);
       }
-      map.set(task.id, continues.slice(0, -1));
+      const ancestorsAboveParent = ancestorIds.slice(0, -1);
+      const modes = ancestorsAboveParent.map((ancestorId) => {
+        const hasLaterVisibleDescendant = visibleTasks.slice(index + 1).some((laterTask) => isDescendantOf(laterTask.id, ancestorId));
+        return hasLaterVisibleDescendant ? "full" : "half";
+      });
+      map.set(task.id, modes);
     }
     return map;
-  }, [tasks, visibleTasks, lastChildIds]);
+  }, [tasks, visibleTasks]);
   const handleRowClick = (0, import_react12.useCallback)((taskId) => {
     onTaskSelect?.(taskId);
   }, [onTaskSelect]);
@@ -7122,7 +7165,8 @@ var TaskList = ({
                 canDemoteTask,
                 isLastChild: lastChildIds.has(task.id),
                 nestingDepth: nestingDepthMap.get(task.id) ?? 0,
-                ancestorContinues: ancestorContinuesMap.get(task.id) ?? [],
+                hasVisibleChildren: visibleParentIds.has(task.id),
+                ancestorLineModes: ancestorLineModesMap.get(task.id) ?? [],
                 customDays,
                 isWeekend: isWeekend3,
                 businessDays,