gantt-lib 0.20.0 → 0.22.0

package/dist/index.mjs

@@ -487,7 +487,7 @@ function getSuccessorChain(draggedTaskId, allTasks, linkTypes = ["FS"]) {
   }
   return chain;
 }
-function cascadeByLinks(movedTaskId, newStart, newEnd, allTasks) {
+function cascadeByLinks(movedTaskId, newStart, newEnd, allTasks, skipChildCascade = false) {
   const taskById = new Map(allTasks.map((t) => [t.id, t]));
   const updatedDates = /* @__PURE__ */ new Map();
   updatedDates.set(movedTaskId, { start: newStart, end: newEnd });
@@ -497,27 +497,29 @@ function cascadeByLinks(movedTaskId, newStart, newEnd, allTasks) {
   while (queue.length > 0) {
     const currentId = queue.shift();
     const { start: predStart, end: predEnd } = updatedDates.get(currentId);
-    const children = getChildren(currentId, allTasks);
-    for (const child of children) {
-      if (visited.has(child.id) || child.locked) continue;
-      const origStart = new Date(child.startDate);
-      const origEnd = new Date(child.endDate);
-      const durationMs = origEnd.getTime() - origStart.getTime();
-      const parentOrig = taskById.get(currentId);
-      const parentOrigStart = new Date(parentOrig.startDate);
-      const parentOrigEnd = new Date(parentOrig.endDate);
-      const parentStartDelta = predStart.getTime() - parentOrigStart.getTime();
-      const parentEndDelta = predEnd.getTime() - parentOrigEnd.getTime();
-      const newChildStart = new Date(origStart.getTime() + parentStartDelta);
-      const newChildEnd = new Date(origEnd.getTime() + parentEndDelta);
-      visited.add(child.id);
-      updatedDates.set(child.id, { start: newChildStart, end: newChildEnd });
-      result.push({
-        ...child,
-        startDate: newChildStart.toISOString().split("T")[0],
-        endDate: newChildEnd.toISOString().split("T")[0]
-      });
-      queue.push(child.id);
+    if (!skipChildCascade) {
+      const children = getChildren(currentId, allTasks);
+      for (const child of children) {
+        if (visited.has(child.id) || child.locked) continue;
+        const origStart = new Date(child.startDate);
+        const origEnd = new Date(child.endDate);
+        const durationMs = origEnd.getTime() - origStart.getTime();
+        const parentOrig = taskById.get(currentId);
+        const parentOrigStart = new Date(parentOrig.startDate);
+        const parentOrigEnd = new Date(parentOrig.endDate);
+        const parentStartDelta = predStart.getTime() - parentOrigStart.getTime();
+        const parentEndDelta = predEnd.getTime() - parentOrigEnd.getTime();
+        const newChildStart = new Date(origStart.getTime() + parentStartDelta);
+        const newChildEnd = new Date(origEnd.getTime() + parentEndDelta);
+        visited.add(child.id);
+        updatedDates.set(child.id, { start: newChildStart, end: newChildEnd });
+        result.push({
+          ...child,
+          startDate: newChildStart.toISOString().split("T")[0],
+          endDate: newChildEnd.toISOString().split("T")[0]
+        });
+        queue.push(child.id);
+      }
     }
     for (const task of allTasks) {
       if (visited.has(task.id) || !task.dependencies || task.locked) continue;
@@ -1248,6 +1250,27 @@ var calculateOrthogonalPath = (from, to) => {
   return `M ${fx} ${fy} H ${tx} V ${ty}`;
 };
 
+// src/utils/expired.ts
+init_dateUtils();
+var isTaskExpired = (task, referenceDate = /* @__PURE__ */ new Date()) => {
+  if (!task) return false;
+  const actualProgress = task.progress ?? 0;
+  if (actualProgress >= 100) return false;
+  const today = new Date(Date.UTC(
+    referenceDate.getFullYear(),
+    referenceDate.getMonth(),
+    referenceDate.getDate()
+  ));
+  const taskStart = parseUTCDate(task.startDate);
+  const taskEnd = parseUTCDate(task.endDate);
+  const msPerDay = 1e3 * 60 * 60 * 24;
+  const duration = taskEnd.getTime() - taskStart.getTime() + msPerDay;
+  const elapsedFromToday = today.getTime() - taskStart.getTime();
+  const elapsed = Math.min(Math.max(0, elapsedFromToday), duration);
+  const expectedProgress = elapsed / duration * 100;
+  return actualProgress < expectedProgress;
+};
+
 // src/hooks/useTaskDrag.ts
 import { useEffect, useRef, useState, useCallback } from "react";
 var globalActiveDrag = null;
@@ -1670,10 +1693,10 @@ var useTaskDrag = (options) => {
 // src/components/TaskRow/TaskRow.tsx
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 var arePropsEqual = (prevProps, nextProps) => {
-  return prevProps.task.id === nextProps.task.id && prevProps.task.name === nextProps.task.name && prevProps.task.startDate === nextProps.task.startDate && prevProps.task.endDate === nextProps.task.endDate && prevProps.task.color === nextProps.task.color && prevProps.task.progress === nextProps.task.progress && prevProps.task.accepted === nextProps.task.accepted && prevProps.monthStart.getTime() === nextProps.monthStart.getTime() && prevProps.dayWidth === nextProps.dayWidth && prevProps.rowHeight === nextProps.rowHeight && prevProps.overridePosition?.left === nextProps.overridePosition?.left && prevProps.overridePosition?.width === nextProps.overridePosition?.width && prevProps.allTasks === nextProps.allTasks && prevProps.disableConstraints === nextProps.disableConstraints && prevProps.task.locked === nextProps.task.locked && prevProps.task.divider === nextProps.task.divider && prevProps.highlightExpiredTasks === nextProps.highlightExpiredTasks;
+  return prevProps.task.id === nextProps.task.id && prevProps.task.name === nextProps.task.name && prevProps.task.startDate === nextProps.task.startDate && prevProps.task.endDate === nextProps.task.endDate && prevProps.task.color === nextProps.task.color && prevProps.task.progress === nextProps.task.progress && prevProps.task.accepted === nextProps.task.accepted && prevProps.monthStart.getTime() === nextProps.monthStart.getTime() && prevProps.dayWidth === nextProps.dayWidth && prevProps.rowHeight === nextProps.rowHeight && prevProps.overridePosition?.left === nextProps.overridePosition?.left && prevProps.overridePosition?.width === nextProps.overridePosition?.width && prevProps.allTasks === nextProps.allTasks && prevProps.disableConstraints === nextProps.disableConstraints && prevProps.task.locked === nextProps.task.locked && prevProps.task.divider === nextProps.task.divider && prevProps.highlightExpiredTasks === nextProps.highlightExpiredTasks && prevProps.isFilterMatch === nextProps.isFilterMatch;
 };
 var TaskRow = React2.memo(
-  ({ task, monthStart, dayWidth, rowHeight, onTasksChange, onDragStateChange, rowIndex, allTasks, enableAutoSchedule, disableConstraints, overridePosition, onCascadeProgress, onCascade, divider, highlightExpiredTasks }) => {
+  ({ task, monthStart, dayWidth, rowHeight, onTasksChange, onDragStateChange, rowIndex, allTasks, enableAutoSchedule, disableConstraints, overridePosition, onCascadeProgress, onCascade, divider, highlightExpiredTasks, isFilterMatch = false }) => {
     const { divider: taskDivider } = task;
     const taskStartDate = useMemo2(() => parseUTCDate(task.startDate), [task.startDate]);
     const taskEndDate = useMemo2(() => parseUTCDate(task.endDate), [task.endDate]);
@@ -1685,20 +1708,7 @@ var TaskRow = React2.memo(
     }, [allTasks, task.id]);
     const isExpired = useMemo2(() => {
       if (!highlightExpiredTasks) return false;
-      const now = /* @__PURE__ */ new Date();
-      const today = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate()));
-      const taskStart = parseUTCDate(task.startDate);
-      const taskEnd = parseUTCDate(task.endDate);
-      const actualProgress = task.progress ?? 0;
-      if (actualProgress >= 100) {
-        return false;
-      }
-      const msPerDay = 1e3 * 60 * 60 * 24;
-      const duration = taskEnd.getTime() - taskStart.getTime() + msPerDay;
-      const elapsedFromToday = today.getTime() - taskStart.getTime();
-      const elapsed = Math.min(Math.max(0, elapsedFromToday), duration);
-      const expected = elapsed / duration * 100;
-      return actualProgress < expected;
+      return isTaskExpired(task);
     }, [task.startDate, task.endDate, task.progress, highlightExpiredTasks]);
     const { left, width } = useMemo2(
       () => calculateTaskBar(taskStartDate, taskEndDate, monthStart, dayWidth),
@@ -1783,12 +1793,15 @@ var TaskRow = React2.memo(
       if (lastDigit >= 2 && lastDigit <= 4) return `${count} \u0437\u0430\u0434\u0430\u0447\u0438`;
       return `${count} \u0437\u0430\u0434\u0430\u0447`;
     };
-    const estimatedTextWidth = durationDays >= 10 ? 76 : 62;
+    const estimatedTextWidth = isParent ? 120 : durationDays >= 10 ? 76 : 62;
     const showProgressInside = progressWidth > 0 && displayWidth > estimatedTextWidth;
+    const MIN_DURATION_WIDTH = isParent ? 80 : 50;
+    const showDurationInside = durationDays >= 2 && displayWidth > MIN_DURATION_WIDTH;
     return /* @__PURE__ */ jsxs2(
       "div",
       {
-        className: "gantt-tr-row",
+        "data-filter-match": isFilterMatch ? "true" : "false",
+        className: `gantt-tr-row ${isFilterMatch ? "gantt-tr-row-filter-match" : ""}`,
         style: { height: `${rowHeight}px` },
         children: [
           taskDivider === "top" && /* @__PURE__ */ jsx2("div", { className: "gantt-tr-divider gantt-tr-divider-top" }),
@@ -1822,7 +1835,7 @@ var TaskRow = React2.memo(
                     }
                   ),
                   !isParent && /* @__PURE__ */ jsx2("div", { className: "gantt-tr-resizeHandle gantt-tr-resizeHandleLeft" }),
-                  /* @__PURE__ */ jsx2("span", { className: "gantt-tr-taskDuration", children: isParent ? getChildCountLabel(childCount) : `${durationDays} \u0434` }),
+                  showDurationInside && /* @__PURE__ */ jsx2("span", { className: "gantt-tr-taskDuration", children: isParent ? getChildCountLabel(childCount) : `${durationDays} \u0434` }),
                   progressWidth > 0 && showProgressInside && /* @__PURE__ */ jsxs2("span", { className: "gantt-tr-progressText", children: [
                     progressWidth,
                     "%"
@@ -1871,9 +1884,10 @@ var TaskRow = React2.memo(
               {
                 className: "gantt-tr-rightLabels",
                 style: {
-                  left: `${displayLeft + displayWidth}px`
+                  left: `${displayLeft + Math.max(displayWidth, 20) - Math.min(6, Math.max(displayWidth, 20) / 2) + 8}px`
                 },
                 children: [
+                  !showDurationInside && /* @__PURE__ */ jsx2("span", { className: "gantt-tr-externalDuration", children: isParent ? getChildCountLabel(childCount) : `${durationDays} \u0434` }),
                   progressWidth > 0 && !showProgressInside && /* @__PURE__ */ jsxs2("span", { className: "gantt-tr-externalProgress", children: [
                     progressWidth,
                     "%"
@@ -3295,7 +3309,8 @@ var TaskListRow = React9.memo(
     nestingDepth = 0,
     ancestorContinues = [],
     customDays,
-    isWeekend: isWeekend3
+    isWeekend: isWeekend3,
+    isFilterMatch = false
   }) => {
     const [editingName, setEditingName] = useState4(false);
     const [nameValue, setNameValue] = useState4("");
@@ -3694,8 +3709,10 @@ var TaskListRow = React9.memo(
     return /* @__PURE__ */ jsxs9(
       "div",
       {
+        "data-filter-match": isFilterMatch ? "true" : "false",
         className: [
           "gantt-tl-row",
+          isFilterMatch ? "gantt-tl-row-filter-match" : "",
           isSelected ? "gantt-tl-row-selected" : "",
           isPicking && !isSourceRow ? "gantt-tl-row-picking" : "",
           isSourceRow ? "gantt-tl-row-picking-self" : "",
@@ -4033,11 +4050,14 @@ var TaskListRow = React9.memo(
                     ]
                   }
                 ),
-                /* @__PURE__ */ jsx12(
+                /* @__PURE__ */ jsxs9(
                   "span",
                   {
                     style: editingDuration ? { visibility: "hidden", pointerEvents: "none" } : void 0,
-                    children: getInclusiveDurationDays(task.startDate, task.endDate)
+                    children: [
+                      getInclusiveDurationDays(task.startDate, task.endDate),
+                      "\u0434"
+                    ]
                   }
                 )
               ]
@@ -4134,7 +4154,7 @@ var TaskListRow = React9.memo(
                       padding: "2px 4px",
                       color: "#ffffff"
                     } : void 0,
-                    children: task.progress ? Math.round(task.progress) === 100 ? "100" : `${Math.round(task.progress)}%` : "0%"
+                    children: task.progress ? Math.round(task.progress) === 100 ? "100" : `${Math.round(task.progress)}%` : "-"
                   }
                 )
               ]
@@ -4373,7 +4393,8 @@ var TaskList = ({
   onPromoteTask,
   onDemoteTask,
   customDays,
-  isWeekend: isWeekend3
+  isWeekend: isWeekend3,
+  highlightedTaskIds = /* @__PURE__ */ new Set()
 }) => {
   const [internalCollapsedParentIds, setInternalCollapsedParentIds] = useState6(/* @__PURE__ */ new Set());
   const collapsedParentIds = externalCollapsedParentIds ?? internalCollapsedParentIds;
@@ -4841,7 +4862,8 @@ var TaskList = ({
             nestingDepth: nestingDepthMap.get(task.id) ?? 0,
             ancestorContinues: ancestorContinuesMap.get(task.id) ?? [],
             customDays,
-            isWeekend: isWeekend3
+            isWeekend: isWeekend3,
+            isFilterMatch: highlightedTaskIds.has(task.id)
           },
           task.id
         )) }),
@@ -4911,7 +4933,8 @@ var GanttChart = forwardRef(({
   enableAddTask = true,
   viewMode = "day",
   customDays,
-  isWeekend: isWeekend3
+  isWeekend: isWeekend3,
+  taskFilter
 }, ref) => {
   const scrollContainerRef = useRef7(null);
   const [selectedTaskId, setSelectedTaskId] = useState7(null);
@@ -4931,7 +4954,7 @@ var GanttChart = forwardRef(({
     () => Math.round(dateRange.length * dayWidth),
     [dateRange.length, dayWidth]
   );
-  const filteredTasks = useMemo9(() => {
+  const visibleTasks = useMemo9(() => {
     const parentMap = new Map(normalizedTasks.map((t) => [t.id, t.parentId]));
     function isAnyAncestorCollapsed(parentId) {
       let current = parentId;
@@ -4943,9 +4966,13 @@ var GanttChart = forwardRef(({
     }
     return normalizedTasks.filter((task) => !isAnyAncestorCollapsed(task.parentId));
   }, [normalizedTasks, collapsedParentIds]);
+  const matchedTaskIds = useMemo9(() => {
+    if (!taskFilter) return /* @__PURE__ */ new Set();
+    return new Set(visibleTasks.filter(taskFilter).map((task) => task.id));
+  }, [visibleTasks, taskFilter]);
   const totalGridHeight = useMemo9(
-    () => filteredTasks.length * rowHeight,
-    [filteredTasks.length, rowHeight]
+    () => visibleTasks.length * rowHeight,
+    [visibleTasks.length, rowHeight]
   );
   const monthStart = useMemo9(() => {
     if (dateRange.length === 0) {
@@ -5061,8 +5088,20 @@ var GanttChart = forwardRef(({
       }
       return;
     }
-    const cascadedTasks = disableConstraints ? [updatedTask] : [updatedTask, ...cascadeByLinks(updatedTask.id, newStart, newEnd, tasks)];
-    onTasksChange?.(cascadedTasks);
+    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] : [parentWithRecalcDates, ...cascadeByLinks(updatedTask.id, parentStart, parentEnd, tasks, true)];
+      onTasksChange?.(cascadedTasks);
+    } else {
+      const cascadedTasks = disableConstraints ? [updatedTask] : [updatedTask, ...cascadeByLinks(updatedTask.id, newStart, newEnd, tasks)];
+      onTasksChange?.(cascadedTasks);
+    }
   }, [tasks, onTasksChange, disableConstraints, editingTaskId]);
   const handleDelete = useCallback6((taskId) => {
     const toDelete = /* @__PURE__ */ new Set([taskId]);
@@ -5316,6 +5355,7 @@ var GanttChart = forwardRef(({
             onToggleCollapse: handleToggleCollapse,
             onPromoteTask: onPromoteTask ?? handlePromoteTask,
             onDemoteTask: onDemoteTask ?? handleDemoteTask,
+            highlightedTaskIds: matchedTaskIds,
             customDays,
             isWeekend: isWeekend3
           }
@@ -5354,7 +5394,7 @@ var GanttChart = forwardRef(({
                 /* @__PURE__ */ jsx15(
                   DependencyLines_default,
                   {
-                    tasks: filteredTasks,
+                    tasks: visibleTasks,
                     allTasks: normalizedTasks,
                     collapsedParentIds,
                     monthStart,
@@ -5375,7 +5415,7 @@ var GanttChart = forwardRef(({
                     totalHeight: totalGridHeight
                   }
                 ),
-                filteredTasks.map((task, index) => /* @__PURE__ */ jsx15(
+                visibleTasks.map((task, index) => /* @__PURE__ */ jsx15(
                   TaskRow_default,
                   {
                     task,
@@ -5399,7 +5439,8 @@ var GanttChart = forwardRef(({
                     overridePosition: cascadeOverrides.get(task.id),
                     onCascadeProgress: handleCascadeProgress,
                     onCascade: handleCascade,
-                    highlightExpiredTasks
+                    highlightExpiredTasks,
+                    isFilterMatch: matchedTaskIds.has(task.id)
                   },
                   task.id
                 ))
@@ -5431,6 +5472,32 @@ Button.displayName = "Button";
 
 // src/utils/index.ts
 init_dateUtils();
+
+// src/filters/index.ts
+init_dateUtils();
+var and = (...predicates) => (task) => predicates.every((p) => p(task));
+var or = (...predicates) => (task) => predicates.some((p) => p(task));
+var not = (predicate) => (task) => !predicate(task);
+var withoutDeps = () => (task) => !!task && (!task.dependencies || task.dependencies.length === 0);
+var expired = (referenceDate = /* @__PURE__ */ new Date()) => (task) => isTaskExpired(task, referenceDate);
+var inDateRange = (rangeStart, rangeEnd) => (task) => {
+  if (!task) return false;
+  const taskStart = parseUTCDate(task.startDate);
+  const taskEnd = parseUTCDate(task.endDate);
+  return taskStart.getTime() <= rangeEnd.getTime() && taskEnd.getTime() >= rangeStart.getTime();
+};
+var progressInRange = (min, max) => (task) => {
+  if (!task) return false;
+  const progress = task.progress ?? 0;
+  return progress >= min && progress <= max;
+};
+var nameContains = (substring, caseSensitive = false) => (task) => {
+  if (!task) return false;
+  const name = task.name;
+  const search = caseSensitive ? substring : substring.toLowerCase();
+  const target = caseSensitive ? name : name.toLowerCase();
+  return target.includes(search);
+};
 export {
   Button,
   Calendar,
@@ -5446,6 +5513,7 @@ export {
   TaskRow_default as TaskRow,
   TimeScaleHeader_default as TimeScaleHeader,
   TodayIndicator_default as TodayIndicator,
+  and,
   buildAdjacencyList,
   calculateBezierPath,
   calculateDependencyPath,
@@ -5465,6 +5533,7 @@ export {
   createDateKey,
   detectCycles,
   detectEdgeZone,
+  expired,
   findParentId,
   flattenHierarchy,
   formatDateLabel,
@@ -5482,17 +5551,24 @@ export {
   getWeekBlocks,
   getWeekSpans,
   getYearSpans,
+  inDateRange,
+  isTaskExpired,
   isTaskParent,
   isToday,
   isWeekend,
+  nameContains,
   normalizeHierarchyTasks,
   normalizeTaskDates,
+  not,
+  or,
   parseUTCDate,
   pixelsToDate,
+  progressInRange,
   recalculateIncomingLags,
   removeDependenciesBetweenTasks,
   universalCascade,
   useTaskDrag,
-  validateDependencies
+  validateDependencies,
+  withoutDeps
 };
 //# sourceMappingURL=index.mjs.map