gantt-lib 0.75.1 → 0.76.0

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import React$1, { ReactNode } from 'react';
-import { T as Task$1, R as ResourceTimelineItem, V as ValidationResult, a as ResourcePlannerChartProps, b as ResourceTimelineResource } from './index-B2Hmdkey.js';
-export { D as DAY_MS, c as DependencyError, G as GanttChartMode, d as GanttDateRange, e as GridConfig, f as GridLine, L as LinkType, M as MonthSpan, g as ResourceTimelineMove, h as TaskBarGeometry, W as WeekendBlock, i as alignToWorkingDay, j as areTasksHierarchicallyRelated, k as buildAdjacencyList, l as buildTaskRangeFromEnd, m as buildTaskRangeFromStart, n as calculateSuccessorDate, o as cascadeByLinks, p as clampTaskRangeForIncomingFS, q as computeLagFromDates, r as computeParentDates, s as computeParentProgress, t as detectCycles, u as findParentId, v as getAllDependencyEdges, w as getAllDescendants, x as getBusinessDayOffset, y as getChildren, z as getDependencyLag, A as getSuccessorChain, B as getTaskDuration, C as getTransitiveCascadeChain, E as isAncestorTask, F as isTaskParent, H as moveTaskRange, I as moveTaskWithCascade, J as normalizeDependencyLag, K as normalizePredecessorDates, N as normalizeUTCDate, O as parseDateOnly, P as recalculateIncomingLags, Q as recalculateProjectSchedule, S as recalculateTaskFromDependencies, U as reflowTasksOnModeSwitch, X as removeDependenciesBetweenTasks, Y as resizeTaskWithCascade, Z as shiftBusinessDayOffset, _ as universalCascade, $ as validateDependencies } from './index-B2Hmdkey.js';
+import { T as Task$1, R as ResourceTimelineItem, V as ValidationResult, a as ResourcePlannerChartProps, b as ResourceTimelineResource } from './index-Bl8l7O3Y.js';
+export { D as DAY_MS, c as DependencyError, G as GanttChartMode, d as GanttDateRange, e as GridConfig, f as GridLine, L as LinkType, M as MonthSpan, g as ResourceTimelineMove, h as TaskBarGeometry, W as WeekendBlock, i as alignToWorkingDay, j as areTasksHierarchicallyRelated, k as buildAdjacencyList, l as buildTaskRangeFromEnd, m as buildTaskRangeFromStart, n as calculateSuccessorDate, o as cascadeByLinks, p as clampTaskRangeForIncomingFS, q as computeLagFromDates, r as computeParentDates, s as computeParentProgress, t as detectCycles, u as findParentId, v as getAllDependencyEdges, w as getAllDescendants, x as getBusinessDayOffset, y as getChildren, z as getDependencyLag, A as getSuccessorChain, B as getTaskDuration, C as getTransitiveCascadeChain, E as isAncestorTask, F as isTaskParent, H as moveTaskRange, I as moveTaskWithCascade, J as normalizeDependencyLag, K as normalizePredecessorDates, N as normalizeUTCDate, O as parseDateOnly, P as recalculateIncomingLags, Q as recalculateProjectSchedule, S as recalculateTaskFromDependencies, U as reflowTasksOnModeSwitch, X as removeDependenciesBetweenTasks, Y as resizeTaskWithCascade, Z as shiftBusinessDayOffset, _ as universalCascade, $ as validateDependencies } from './index-Bl8l7O3Y.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as RadixPopover from '@radix-ui/react-popover';
 
@@ -540,7 +540,7 @@ declare const GanttChart: <TTask extends Task = Task, TItem extends ResourceTime
     ref?: React$1.Ref<GanttChartHandle>;
 }) => React$1.ReactElement;
 
-declare function ResourceTimelineChart<TItem extends ResourceTimelineItem = ResourceTimelineItem>({ resources, dayWidth, rowHeaderWidth, laneHeight, headerHeight, readonly, disableResourceReassignment, renderItem, getItemClassName, onResourceItemMove, }: ResourcePlannerChartProps<TItem>): react_jsx_runtime.JSX.Element;
+declare function ResourceTimelineChart<TItem extends ResourceTimelineItem = ResourceTimelineItem>({ resources, dayWidth, rowHeaderWidth, laneHeight, headerHeight, customDays, isWeekend, businessDays, readonly, disableResourceReassignment, renderItem, getItemClassName, onResourceItemMove, }: ResourcePlannerChartProps<TItem>): react_jsx_runtime.JSX.Element;
 
 interface TaskRowProps {
     /** Task data to render */
@@ -1189,14 +1189,21 @@ interface ResourceTimelineLayoutOptions {
     monthStart: Date;
     dayWidth: number;
     laneHeight: number;
+    rowGap?: number;
 }
 interface ResourceTimelineLayoutRow<TItem extends ResourceTimelineItem = ResourceTimelineItem> {
     resource: ResourceTimelineResource<TItem>;
     resourceId: string;
     laneCount: number;
+    conflictCount: number;
     resourceRowTop: number;
     resourceRowHeight: number;
 }
+interface ResourceTimelineConflictRange {
+    startDate: Date;
+    endDate: Date;
+    itemIds: string[];
+}
 interface ResourceTimelineLayoutItem<TItem extends ResourceTimelineItem = ResourceTimelineItem> {
     item: TItem;
     itemId: string;
@@ -1210,6 +1217,8 @@ interface ResourceTimelineLayoutItem<TItem extends ResourceTimelineItem = Resour
     height: number;
     startDate: Date;
     endDate: Date;
+    conflictRanges: ResourceTimelineConflictRange[];
+    conflictsWith: string[];
 }
 interface ResourceTimelineLayoutDiagnostic {
     itemId: string;
@@ -1240,4 +1249,4 @@ interface VisibleReorderPosition {
  */
 declare function getVisibleReorderPosition(orderedTasks: TaskLike[], visibleTasks: TaskLike[], movedTaskId: string, originVisibleIndex: number, dropVisibleIndex: number): VisibleReorderPosition | null;
 
-export { type BuiltInTaskListColumnId, Button, type ButtonProps, Calendar, type CalendarProps, type CustomDayConfig, type CustomDayPredicateConfig, DatePicker, type DatePickerProps, DragGuideLines, type ExportToPdfHeaderOptions, type ExportToPdfOptions, GanttChart, type GanttChartHandle, type GanttChartProps, type GanttModeProps, GridBackground, Input, type InputProps, type MonthBlock, Popover, PopoverContent, type PopoverContentProps, type PopoverProps, PopoverTrigger, ResourcePlannerChartProps, ResourceTimelineChart, ResourceTimelineItem, type ResourceTimelineLayoutDiagnostic, type ResourceTimelineLayoutItem, type ResourceTimelineLayoutOptions, type ResourceTimelineLayoutResult, type ResourceTimelineLayoutRow, ResourceTimelineResource, type Task, type TaskDependency, TaskList, type TaskListColumn, type TaskListColumnContext, type TaskListMenuCommand, type TaskListProps, type TaskPredicate, TaskRow, TimeScaleHeader, TodayIndicator, ValidationResult, type VisibleReorderPosition, type WeekBlock, type WeekSpan, type YearSpan, addBusinessDays, and, calculateBezierPath, calculateDependencyPath, calculateGridLines, calculateGridWidth, calculateMilestoneConnectionBounds, calculateMilestoneGeometry, calculateMonthGridLines, calculateOrthogonalPath, calculateTaskBar, calculateWeekGridLines, calculateWeekendBlocks, clampDateRangeForIncomingFS, createCustomDayPredicate, createDateKey, detectEdgeZone, expired, flattenHierarchy, formatDateLabel, formatDateRangeLabel, getBusinessDaysCount, getCursorForPosition, getDayOffset, getMonthBlocks, getMonthDays, getMonthSpans, getMultiMonthDays, getVisibleReorderPosition, getWeekBlocks, getWeekSpans, getYearSpans, inDateRange, isTaskExpired, isToday, isWeekend, layoutResourceTimelineItems, nameContains, normalizeHierarchyTasks, normalizeTaskDates, not, or, parseUTCDate, pixelsToDate, progressInRange, resolveDateRangeFromPixels, resolveTaskHorizontalGeometry, subtractBusinessDays, useTaskDrag, withoutDeps };
+export { type BuiltInTaskListColumnId, Button, type ButtonProps, Calendar, type CalendarProps, type CustomDayConfig, type CustomDayPredicateConfig, DatePicker, type DatePickerProps, DragGuideLines, type ExportToPdfHeaderOptions, type ExportToPdfOptions, GanttChart, type GanttChartHandle, type GanttChartProps, type GanttModeProps, GridBackground, Input, type InputProps, type MonthBlock, Popover, PopoverContent, type PopoverContentProps, type PopoverProps, PopoverTrigger, ResourcePlannerChartProps, ResourceTimelineChart, type ResourceTimelineConflictRange, ResourceTimelineItem, type ResourceTimelineLayoutDiagnostic, type ResourceTimelineLayoutItem, type ResourceTimelineLayoutOptions, type ResourceTimelineLayoutResult, type ResourceTimelineLayoutRow, ResourceTimelineResource, type Task, type TaskDependency, TaskList, type TaskListColumn, type TaskListColumnContext, type TaskListMenuCommand, type TaskListProps, type TaskPredicate, TaskRow, TimeScaleHeader, TodayIndicator, ValidationResult, type VisibleReorderPosition, type WeekBlock, type WeekSpan, type YearSpan, addBusinessDays, and, calculateBezierPath, calculateDependencyPath, calculateGridLines, calculateGridWidth, calculateMilestoneConnectionBounds, calculateMilestoneGeometry, calculateMonthGridLines, calculateOrthogonalPath, calculateTaskBar, calculateWeekGridLines, calculateWeekendBlocks, clampDateRangeForIncomingFS, createCustomDayPredicate, createDateKey, detectEdgeZone, expired, flattenHierarchy, formatDateLabel, formatDateRangeLabel, getBusinessDaysCount, getCursorForPosition, getDayOffset, getMonthBlocks, getMonthDays, getMonthSpans, getMultiMonthDays, getVisibleReorderPosition, getWeekBlocks, getWeekSpans, getYearSpans, inDateRange, isTaskExpired, isToday, isWeekend, layoutResourceTimelineItems, nameContains, normalizeHierarchyTasks, normalizeTaskDates, not, or, parseUTCDate, pixelsToDate, progressInRange, resolveDateRangeFromPixels, resolveTaskHorizontalGeometry, subtractBusinessDays, useTaskDrag, withoutDeps };

package/dist/index.js

@@ -7402,12 +7402,86 @@ var compareParsedItems = (a, b) => {
   }
   return a.item.id.localeCompare(b.item.id);
 };
+var getOverlapRange = (left, right) => {
+  const startDay = Math.max(getUTCDayNumber(left.startDate), getUTCDayNumber(right.startDate));
+  const endDay = Math.min(getUTCDayNumber(left.endDate), getUTCDayNumber(right.endDate));
+  if (startDay > endDay) {
+    return null;
+  }
+  return {
+    startDate: new Date(startDay * 864e5),
+    endDate: new Date(endDay * 864e5),
+    itemIds: [left.item.id, right.item.id]
+  };
+};
+var mergeConflictRanges = (ranges) => {
+  const sortedRanges = [...ranges].sort(
+    (left, right) => getUTCDayNumber(left.startDate) - getUTCDayNumber(right.startDate) || getUTCDayNumber(left.endDate) - getUTCDayNumber(right.endDate)
+  );
+  const merged = [];
+  for (const range of sortedRanges) {
+    const previous = merged[merged.length - 1];
+    const rangeStartDay = getUTCDayNumber(range.startDate);
+    const rangeEndDay = getUTCDayNumber(range.endDate);
+    if (!previous || rangeStartDay > getUTCDayNumber(previous.endDate) + 1) {
+      merged.push({
+        startDate: range.startDate,
+        endDate: range.endDate,
+        itemIds: [...range.itemIds]
+      });
+      continue;
+    }
+    if (rangeEndDay > getUTCDayNumber(previous.endDate)) {
+      previous.endDate = range.endDate;
+    }
+    previous.itemIds = Array.from(/* @__PURE__ */ new Set([...previous.itemIds, ...range.itemIds])).sort();
+  }
+  return merged;
+};
+var calculateConflictInfo = (parsedItems) => {
+  const conflictRangesByItemId = /* @__PURE__ */ new Map();
+  const conflictsWithByItemId = /* @__PURE__ */ new Map();
+  for (let i = 0; i < parsedItems.length; i++) {
+    for (let j = i + 1; j < parsedItems.length; j++) {
+      const left = parsedItems[i];
+      const right = parsedItems[j];
+      if (getUTCDayNumber(right.startDate) > getUTCDayNumber(left.endDate)) {
+        break;
+      }
+      const overlap = getOverlapRange(left, right);
+      if (!overlap) {
+        continue;
+      }
+      const leftRanges = conflictRangesByItemId.get(left.item.id) ?? [];
+      const rightRanges = conflictRangesByItemId.get(right.item.id) ?? [];
+      leftRanges.push(overlap);
+      rightRanges.push(overlap);
+      conflictRangesByItemId.set(left.item.id, leftRanges);
+      conflictRangesByItemId.set(right.item.id, rightRanges);
+      const leftConflicts = conflictsWithByItemId.get(left.item.id) ?? /* @__PURE__ */ new Set();
+      const rightConflicts = conflictsWithByItemId.get(right.item.id) ?? /* @__PURE__ */ new Set();
+      leftConflicts.add(right.item.id);
+      rightConflicts.add(left.item.id);
+      conflictsWithByItemId.set(left.item.id, leftConflicts);
+      conflictsWithByItemId.set(right.item.id, rightConflicts);
+    }
+  }
+  const result = /* @__PURE__ */ new Map();
+  for (const parsedItem of parsedItems) {
+    result.set(parsedItem.item.id, {
+      conflictRanges: mergeConflictRanges(conflictRangesByItemId.get(parsedItem.item.id) ?? []),
+      conflictsWith: Array.from(conflictsWithByItemId.get(parsedItem.item.id) ?? []).sort()
+    });
+  }
+  return result;
+};
 var layoutResourceTimelineItems = (resources, options) => {
   const rows = [];
   const items = [];
   const diagnostics = [];
   let currentTop = 0;
-  for (const resource of resources) {
+  const rowGap = options.rowGap ?? 0;
+  resources.forEach((resource, resourceIndex) => {
     const parsedItems = [];
     for (const item of resource.items) {
       try {
@@ -7426,6 +7500,7 @@ var layoutResourceTimelineItems = (resources, options) => {
       }
     }
     parsedItems.sort(compareParsedItems);
+    const conflictInfoByItemId = calculateConflictInfo(parsedItems);
     const laneEndDays = [];
     const laidOutItems = [];
     for (const parsed of parsedItems) {
@@ -7439,6 +7514,7 @@ var layoutResourceTimelineItems = (resources, options) => {
         laneEndDays[laneIndex] = endDay;
       }
       const { left, width } = calculateTaskBar(parsed.startDate, parsed.endDate, options.monthStart, options.dayWidth);
+      const conflictInfo = conflictInfoByItemId.get(parsed.item.id);
       laidOutItems.push({
         item: parsed.item,
         itemId: parsed.item.id,
@@ -7451,15 +7527,19 @@ var layoutResourceTimelineItems = (resources, options) => {
         top: currentTop + laneIndex * options.laneHeight,
         height: options.laneHeight,
         startDate: parsed.startDate,
-        endDate: parsed.endDate
+        endDate: parsed.endDate,
+        conflictRanges: conflictInfo?.conflictRanges ?? [],
+        conflictsWith: conflictInfo?.conflictsWith ?? []
       });
     }
     const laneCount = Math.max(1, laneEndDays.length);
     const resourceRowHeight = laneCount * options.laneHeight;
+    const conflictCount = laidOutItems.filter((item) => item.conflictsWith.length > 0).length;
     const row = {
       resource,
       resourceId: resource.id,
       laneCount,
+      conflictCount,
       resourceRowTop: currentTop,
       resourceRowHeight
     };
@@ -7468,8 +7548,8 @@ var layoutResourceTimelineItems = (resources, options) => {
       ...item,
       resourceRowHeight
     })));
-    currentTop += resourceRowHeight;
-  }
+    currentTop += resourceRowHeight + rowGap;
+  });
   return {
     rows,
     items,
@@ -7486,6 +7566,56 @@ var snapToDay = (pixels, dayWidth) => {
 var addUTCDays = (date, days) => {
   return new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate() + days));
 };
+var getDayOffset2 = (date, monthStart) => {
+  return Math.round(
+    (Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()) - Date.UTC(monthStart.getUTCFullYear(), monthStart.getUTCMonth(), monthStart.getUTCDate())) / (24 * 60 * 60 * 1e3)
+  );
+};
+var resolveResourceMoveRange = (activeDrag, nextLeft, nextWidth) => {
+  const dayOffset = Math.round(nextLeft / activeDrag.dayWidth);
+  const durationDays = Math.round(nextWidth / activeDrag.dayWidth);
+  const rawStartDate = addUTCDays(activeDrag.monthStart, dayOffset);
+  const rawEndDate = addUTCDays(rawStartDate, durationDays - 1);
+  if (!activeDrag.businessDays || !activeDrag.weekendPredicate) {
+    return {
+      startDate: rawStartDate,
+      endDate: rawEndDate,
+      left: nextLeft,
+      width: nextWidth
+    };
+  }
+  const range = (() => {
+    if (activeDrag.mode === "resize-start") {
+      const snapDirection2 = rawStartDate.getTime() >= activeDrag.startDate.getTime() ? 1 : -1;
+      const duration = getBusinessDaysCount(rawStartDate, activeDrag.endDate, activeDrag.weekendPredicate);
+      return buildTaskRangeFromEnd(activeDrag.endDate, duration, true, activeDrag.weekendPredicate, snapDirection2);
+    }
+    if (activeDrag.mode === "resize-end") {
+      const snapDirection2 = rawEndDate.getTime() >= activeDrag.endDate.getTime() ? 1 : -1;
+      const duration = getBusinessDaysCount(activeDrag.startDate, rawEndDate, activeDrag.weekendPredicate);
+      return buildTaskRangeFromStart(activeDrag.startDate, duration, true, activeDrag.weekendPredicate, snapDirection2);
+    }
+    const dayDelta = Math.round((nextLeft - activeDrag.initialLeft) / activeDrag.dayWidth);
+    const proposedStartDate = addUTCDays(activeDrag.startDate, dayDelta);
+    const snapDirection = proposedStartDate.getTime() >= activeDrag.startDate.getTime() ? 1 : -1;
+    return moveTaskRange(
+      activeDrag.startDate,
+      activeDrag.endDate,
+      proposedStartDate,
+      true,
+      activeDrag.weekendPredicate,
+      snapDirection
+    );
+  })();
+  const startOffset = getDayOffset2(range.start, activeDrag.monthStart);
+  const endOffset = getDayOffset2(range.end, activeDrag.monthStart);
+  return {
+    startDate: range.start,
+    endDate: range.end,
+    left: Math.round(startOffset * activeDrag.dayWidth),
+    width: Math.round((endOffset - startOffset + 1) * activeDrag.dayWidth)
+  };
+};
 var resolveTargetResource = (rows, clientY, gridTop) => {
   const localY = clientY - gridTop;
   return rows.find(
@@ -7494,10 +7624,13 @@ var resolveTargetResource = (rows, clientY, gridTop) => {
 };
 var useResourceItemDrag = ({
   dayWidth,
+  monthStart,
   rows,
   gridElementRef,
   readonly,
   disableResourceReassignment,
+  businessDays = false,
+  weekendPredicate,
   onResourceItemMove
 }) => {
   const activeDragRef = (0, import_react13.useRef)(null);
@@ -7534,14 +7667,30 @@ var useResourceItemDrag = ({
         if (!latestDrag) {
           return;
         }
-        const nextLeft = latestDrag.initialLeft + snapToDay(event.clientX - latestDrag.startX, latestDrag.dayWidth);
-        const nextTop = disableResourceReassignment ? latestDrag.initialTop : latestDrag.initialTop + (event.clientY - latestDrag.startY);
-        latestDrag.currentLeft = nextLeft;
+        const snappedDelta = snapToDay(event.clientX - latestDrag.startX, latestDrag.dayWidth);
+        const rightEdge = latestDrag.initialLeft + latestDrag.initialWidth;
+        const nextGeometry = (() => {
+          if (latestDrag.mode === "resize-start") {
+            const left = Math.min(latestDrag.initialLeft + snappedDelta, rightEdge - latestDrag.dayWidth);
+            return { left, width: rightEdge - left };
+          }
+          if (latestDrag.mode === "resize-end") {
+            return { left: latestDrag.initialLeft, width: Math.max(latestDrag.dayWidth, latestDrag.initialWidth + snappedDelta) };
+          }
+          return { left: latestDrag.initialLeft + snappedDelta, width: latestDrag.initialWidth };
+        })();
+        const nextRange = resolveResourceMoveRange(latestDrag, nextGeometry.left, nextGeometry.width);
+        const nextTop = disableResourceReassignment || latestDrag.mode !== "move" ? latestDrag.initialTop : latestDrag.initialTop + (event.clientY - latestDrag.startY);
+        latestDrag.currentLeft = nextRange.left;
+        latestDrag.currentWidth = nextRange.width;
         latestDrag.currentTop = nextTop;
         setPreview({
           itemId: latestDrag.itemId,
-          left: nextLeft,
-          top: nextTop
+          left: nextRange.left,
+          top: nextTop,
+          width: nextRange.width,
+          startDate: nextRange.startDate,
+          endDate: nextRange.endDate
         });
       });
     };
@@ -7554,18 +7703,20 @@ var useResourceItemDrag = ({
       activeDragRef.current = null;
       setPreview(null);
       const gridTop = gridElementRef?.current?.getBoundingClientRect().top ?? 0;
-      const targetResource = disableResourceReassignment ? rowsRef.current.find((row) => row.resourceId === activeDrag.fromResourceId)?.resource ?? null : resolveTargetResource(rowsRef.current, event.clientY, gridTop);
+      const targetResource = disableResourceReassignment || activeDrag.mode !== "move" ? rowsRef.current.find((row) => row.resourceId === activeDrag.fromResourceId)?.resource ?? null : resolveTargetResource(rowsRef.current, event.clientY, gridTop);
       if (!targetResource) {
         return;
       }
-      const dayDelta = Math.round((activeDrag.currentLeft - activeDrag.initialLeft) / activeDrag.dayWidth);
+      const nextRange = resolveResourceMoveRange(activeDrag, activeDrag.currentLeft, activeDrag.currentWidth);
       onResourceItemMoveRef.current?.({
         item: activeDrag.item,
         itemId: activeDrag.itemId,
+        taskId: activeDrag.item.taskId,
         fromResourceId: activeDrag.fromResourceId,
         toResourceId: targetResource.id,
-        startDate: addUTCDays(activeDrag.startDate, dayDelta),
-        endDate: addUTCDays(activeDrag.endDate, dayDelta)
+        startDate: nextRange.startDate,
+        endDate: nextRange.endDate,
+        changeType: activeDrag.mode
       });
     };
     window.addEventListener("mousemove", handleMouseMove);
@@ -7580,27 +7731,38 @@ var useResourceItemDrag = ({
     if (readonly || layoutItem.item.locked || event.button !== 0) {
       return;
     }
+    const target = event.target;
+    const mode = target.closest(".gantt-resourceTimeline-resizeHandleStart") ? "resize-start" : target.closest(".gantt-resourceTimeline-resizeHandleEnd") ? "resize-end" : "move";
     event.preventDefault();
     activeDragRef.current = {
       item: layoutItem.item,
       itemId: layoutItem.itemId,
+      mode,
       fromResourceId: layoutItem.resourceId,
       startX: event.clientX,
       startY: event.clientY,
       initialLeft: layoutItem.left,
       initialTop: layoutItem.top,
+      initialWidth: layoutItem.width,
       currentLeft: layoutItem.left,
       currentTop: layoutItem.top,
+      currentWidth: layoutItem.width,
       dayWidth,
       startDate: layoutItem.startDate,
-      endDate: layoutItem.endDate
+      endDate: layoutItem.endDate,
+      monthStart,
+      businessDays,
+      weekendPredicate
     };
     setPreview({
       itemId: layoutItem.itemId,
       left: layoutItem.left,
-      top: layoutItem.top
+      top: layoutItem.top,
+      width: layoutItem.width,
+      startDate: layoutItem.startDate,
+      endDate: layoutItem.endDate
     });
-  }, [dayWidth, readonly]);
+  }, [businessDays, dayWidth, monthStart, readonly, weekendPredicate]);
   return {
     preview,
     startDrag,
@@ -7614,6 +7776,7 @@ var DEFAULT_DAY_WIDTH = 40;
 var DEFAULT_HEADER_HEIGHT = 40;
 var DEFAULT_LANE_HEIGHT = 40;
 var DEFAULT_ROW_HEADER_WIDTH = 240;
+var DEFAULT_RESOURCE_ROW_GAP = 8;
 var ITEM_OUTER_VERTICAL_INSET = 2;
 var ITEM_INNER_VERTICAL_INSET = 1;
 var ITEM_HORIZONTAL_INSET = 1;
@@ -7673,12 +7836,58 @@ var getVisualItemGeometry = (geometry, laneIndex, laneCount) => {
     height: Math.max(0, geometry.height - topInset - bottomInset)
   };
 };
+var getWeekendOverlaySegments = (startDate, endDate, dayWidth, weekendPredicate) => {
+  const segments2 = [];
+  const current = new Date(Date.UTC(startDate.getUTCFullYear(), startDate.getUTCMonth(), startDate.getUTCDate()));
+  let activeStartOffset = null;
+  let offset = 0;
+  while (current.getTime() <= endDate.getTime()) {
+    const isWeekendDay = weekendPredicate(current);
+    if (isWeekendDay && activeStartOffset === null) {
+      activeStartOffset = offset;
+    }
+    if (!isWeekendDay && activeStartOffset !== null) {
+      segments2.push({
+        left: Math.round(activeStartOffset * dayWidth),
+        width: Math.round((offset - activeStartOffset) * dayWidth)
+      });
+      activeStartOffset = null;
+    }
+    current.setUTCDate(current.getUTCDate() + 1);
+    offset += 1;
+  }
+  if (activeStartOffset !== null) {
+    segments2.push({
+      left: Math.round(activeStartOffset * dayWidth),
+      width: Math.round((offset - activeStartOffset) * dayWidth)
+    });
+  }
+  return segments2;
+};
+var getRangeOverlaySegments = (itemStartDate, ranges, dayWidth) => {
+  return ranges.map((range) => {
+    const startOffset = Math.max(0, Math.round(
+      (Date.UTC(range.startDate.getUTCFullYear(), range.startDate.getUTCMonth(), range.startDate.getUTCDate()) - Date.UTC(itemStartDate.getUTCFullYear(), itemStartDate.getUTCMonth(), itemStartDate.getUTCDate())) / (24 * 60 * 60 * 1e3)
+    ));
+    const endOffset = Math.max(startOffset, Math.round(
+      (Date.UTC(range.endDate.getUTCFullYear(), range.endDate.getUTCMonth(), range.endDate.getUTCDate()) - Date.UTC(itemStartDate.getUTCFullYear(), itemStartDate.getUTCMonth(), itemStartDate.getUTCDate())) / (24 * 60 * 60 * 1e3)
+    ));
+    return {
+      left: Math.round(startOffset * dayWidth),
+      width: Math.round((endOffset - startOffset + 1) * dayWidth)
+    };
+  });
+};
+var getDurationValue = (startDate, endDate, businessDays, weekendPredicate) => businessDays ? getBusinessDaysCount(startDate, endDate, weekendPredicate) : Math.max(1, Math.round((endDate.getTime() - startDate.getTime()) / (24 * 60 * 60 * 1e3)) + 1);
 function ResourceTimelineChart({
   resources,
   dayWidth = DEFAULT_DAY_WIDTH,
   rowHeaderWidth = DEFAULT_ROW_HEADER_WIDTH,
   laneHeight = DEFAULT_LANE_HEIGHT,
   headerHeight = DEFAULT_HEADER_HEIGHT,
+  customDays,
+  isWeekend: isWeekend3,
+  businessDays = true,
   readonly,
   disableResourceReassignment,
   renderItem,
@@ -7696,9 +7905,18 @@ function ResourceTimelineChart({
     const firstDay = dateRange[0] ?? /* @__PURE__ */ new Date();
     return new Date(Date.UTC(firstDay.getUTCFullYear(), firstDay.getUTCMonth(), 1));
   }, [dateRange]);
+  const weekendPredicate = (0, import_react14.useMemo)(
+    () => createCustomDayPredicate({ customDays, isWeekend: isWeekend3 }),
+    [customDays, isWeekend3]
+  );
   const gridWidth = (0, import_react14.useMemo)(() => Math.round(dateRange.length * dayWidth), [dateRange.length, dayWidth]);
   const layout = (0, import_react14.useMemo)(
-    () => layoutResourceTimelineItems(resources, { monthStart, dayWidth, laneHeight }),
+    () => layoutResourceTimelineItems(resources, {
+      monthStart,
+      dayWidth,
+      laneHeight,
+      rowGap: DEFAULT_RESOURCE_ROW_GAP
+    }),
     [resources, monthStart, dayWidth, laneHeight]
   );
   const todayInRange = (0, import_react14.useMemo)(() => {
@@ -7717,10 +7935,13 @@ function ResourceTimelineChart({
   }, [layout.items]);
   const { preview, startDrag } = useResourceItemDrag({
     dayWidth,
+    monthStart,
     rows: layout.rows,
     gridElementRef: gridRef,
     readonly,
     disableResourceReassignment,
+    businessDays,
+    weekendPredicate,
     onResourceItemMove
   });
   const handlePanStart = (0, import_react14.useCallback)((event) => {
@@ -7799,13 +8020,26 @@ function ResourceTimelineChart({
                   style: { height: `${headerHeight}px` }
                 }
               ),
-              layout.rows.map((row) => /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+              layout.rows.map((row) => /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
                 "div",
                 {
                   className: "gantt-resourceTimeline-resourceHeader",
                   "data-resource-row-id": row.resourceId,
-                  style: { height: `${row.resourceRowHeight}px` },
-                  children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "gantt-resourceTimeline-resourceName", children: row.resource.name })
+                  style: {
+                    height: `${row.resourceRowHeight + DEFAULT_RESOURCE_ROW_GAP}px`,
+                    paddingBottom: `${DEFAULT_RESOURCE_ROW_GAP}px`
+                  },
+                  children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "gantt-resourceTimeline-resourceName", children: row.resource.name }),
+                    row.conflictCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+                      "span",
+                      {
+                        className: "gantt-resourceTimeline-conflictBadge",
+                        "aria-label": `${row.conflictCount} \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u043E\u0432`,
+                        children: row.conflictCount
+                      }
+                    )
+                  ]
                 },
                 row.resourceId
               ))
@@ -7818,7 +8052,15 @@ function ResourceTimelineChart({
             className: "gantt-resourceTimeline-chartSurface",
             style: { minWidth: `${gridWidth}px` },
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: "gantt-resourceTimeline-stickyHeader", style: { width: `${gridWidth}px` }, children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(TimeScaleHeader_default, { days: dateRange, dayWidth, headerHeight }) }),
+              /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: "gantt-resourceTimeline-stickyHeader", style: { width: `${gridWidth}px` }, children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+                TimeScaleHeader_default,
+                {
+                  days: dateRange,
+                  dayWidth,
+                  headerHeight,
+                  isCustomWeekend: weekendPredicate
+                }
+              ) }),
               /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
                 "div",
                 {
@@ -7826,7 +8068,15 @@ function ResourceTimelineChart({
                   className: "gantt-resourceTimeline-grid",
                   style: { width: `${gridWidth}px`, height: `${layout.totalHeight}px` },
                   children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(GridBackground_default, { dateRange, dayWidth, totalHeight: layout.totalHeight }),
+                    /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+                      GridBackground_default,
+                      {
+                        dateRange,
+                        dayWidth,
+                        totalHeight: layout.totalHeight,
+                        isCustomWeekend: weekendPredicate
+                      }
+                    ),
                     todayInRange && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(TodayIndicator_default, { monthStart, dayWidth }),
                     layout.rows.map((row) => /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
                       "div",
@@ -7835,7 +8085,7 @@ function ResourceTimelineChart({
                         "data-resource-row-id": row.resourceId,
                         style: {
                           top: `${row.resourceRowTop}px`,
-                          height: `${row.resourceRowHeight}px`
+                          height: `${row.resourceRowHeight + DEFAULT_RESOURCE_ROW_GAP}px`
                         }
                       },
                       row.resourceId
@@ -7843,17 +8093,18 @@ function ResourceTimelineChart({
                     Array.from(itemsByResourceId.values()).flatMap(
                       (resourceItems) => resourceItems.map((layoutItem) => {
                         const customClassName = getItemClassName?.(layoutItem.item);
+                        const isDraggingItem = preview?.itemId === layoutItem.itemId;
                         const className = [
                           "gantt-resourceTimeline-item",
-                          preview?.itemId === layoutItem.itemId && "gantt-resourceTimeline-itemDragging",
+                          isDraggingItem && "gantt-resourceTimeline-itemDragging",
                           (readonly || layoutItem.item.locked) && "gantt-resourceTimeline-itemDisabled",
                           customClassName
                         ].filter(Boolean).join(" ");
                         const laneCount = Math.max(1, Math.round(layoutItem.resourceRowHeight / layoutItem.height));
-                        const previewStyle = preview?.itemId === layoutItem.itemId ? getVisualItemGeometry({
+                        const previewStyle = isDraggingItem ? getVisualItemGeometry({
                           left: preview.left,
                           top: preview.top,
-                          width: layoutItem.width,
+                          width: preview.width,
                           height: layoutItem.height
                         }, layoutItem.laneIndex, laneCount) : void 0;
                         const itemGeometry = getVisualItemGeometry({
@@ -7862,7 +8113,27 @@ function ResourceTimelineChart({
                           width: layoutItem.width,
                           height: layoutItem.height
                         }, layoutItem.laneIndex, laneCount);
-                        return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+                        const overlayStartDate = isDraggingItem ? preview.startDate : layoutItem.startDate;
+                        const overlayEndDate = isDraggingItem ? preview.endDate : layoutItem.endDate;
+                        const weekendOverlaySegments = businessDays ? getWeekendOverlaySegments(overlayStartDate, overlayEndDate, dayWidth, weekendPredicate) : [];
+                        const conflictOverlaySegments = getRangeOverlaySegments(
+                          overlayStartDate,
+                          isDraggingItem ? [] : layoutItem.conflictRanges,
+                          dayWidth
+                        );
+                        const durationValue = getDurationValue(
+                          overlayStartDate,
+                          overlayEndDate,
+                          businessDays,
+                          weekendPredicate
+                        );
+                        const renderContext = {
+                          startDate: overlayStartDate,
+                          endDate: overlayEndDate,
+                          durationDays: durationValue,
+                          isDragging: isDraggingItem
+                        };
+                        return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
                           "div",
                           {
                             className,
@@ -7871,16 +8142,54 @@ function ResourceTimelineChart({
                             style: {
                               left: `${itemGeometry.left}px`,
                               top: `${itemGeometry.top}px`,
-                              ...previewStyle,
                               width: `${itemGeometry.width}px`,
                               height: `${itemGeometry.height}px`,
+                              ...previewStyle,
                               backgroundColor: layoutItem.item.color ?? "var(--gantt-task-bar-default-color, #3b82f6)"
                             },
-                            children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: "gantt-resourceTimeline-itemInner", children: renderItem ? renderItem(layoutItem.item) : /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_jsx_runtime15.Fragment, { children: [
-                              /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "gantt-resourceTimeline-itemTitle", children: layoutItem.item.title }),
-                              layoutItem.item.subtitle && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "gantt-resourceTimeline-itemSubtitle", children: layoutItem.item.subtitle }),
-                              /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "gantt-resourceTimeline-itemDates", children: formatDateRangeLabel(layoutItem.startDate, layoutItem.endDate) })
-                            ] }) })
+                            children: [
+                              !readonly && !layoutItem.item.locked && /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_jsx_runtime15.Fragment, { children: [
+                                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "gantt-resourceTimeline-resizeHandle gantt-resourceTimeline-resizeHandleStart" }),
+                                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "gantt-resourceTimeline-resizeHandle gantt-resourceTimeline-resizeHandleEnd" })
+                              ] }),
+                              weekendOverlaySegments.map((segment, index) => /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+                                "span",
+                                {
+                                  className: "gantt-resourceTimeline-weekendOverlay",
+                                  "data-resource-weekend-overlay": "true",
+                                  style: {
+                                    left: `${segment.left}px`,
+                                    width: `${segment.width}px`
+                                  }
+                                },
+                                `weekend-overlay-${index}`
+                              )),
+                              conflictOverlaySegments.map((segment, index) => /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+                                "span",
+                                {
+                                  className: "gantt-resourceTimeline-conflictOverlay",
+                                  "data-resource-conflict-overlay": "true",
+                                  style: {
+                                    left: `${segment.left}px`,
+                                    width: `${segment.width}px`
+                                  }
+                                },
+                                `conflict-overlay-${index}`
+                              )),
+                              /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: "gantt-resourceTimeline-itemInner", children: renderItem ? renderItem(layoutItem.item, renderContext) : /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_jsx_runtime15.Fragment, { children: [
+                                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+                                  "span",
+                                  {
+                                    className: "gantt-resourceTimeline-itemDurationChip",
+                                    "aria-label": `${durationValue} \u0434`,
+                                    children: durationValue
+                                  }
+                                ),
+                                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "gantt-resourceTimeline-itemTitle", children: layoutItem.item.title }),
+                                layoutItem.item.subtitle && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "gantt-resourceTimeline-itemSubtitle", children: layoutItem.item.subtitle }),
+                                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "gantt-resourceTimeline-itemDates", children: formatDateRangeLabel(layoutItem.startDate, layoutItem.endDate) })
+                              ] }) })
+                            ]
                           },
                           layoutItem.itemId
                         );