gantt-task-react-v 1.2.3 → 1.2.5

package/dist/components/gantt-today/index.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { Distances, ViewMode } from "../../types";
+import { Distances, ViewMode, Task } from "../../types";
 export type GanttTodayProps = {
     additionalLeftSpace: number;
     distances: Distances;
@@ -15,5 +15,6 @@ export type GanttTodayProps = {
     dataDateColor?: string | null;
     todayLabel?: string;
     dataDateLabel?: string;
+    tasks?: readonly Task[];
 };
 export declare const GanttToday: React.NamedExoticComponent<GanttTodayProps>;

package/dist/gantt-task-react.es.js

@@ -10909,6 +10909,318 @@ const styles$c = {
   ganttToday,
   ganttTodayCircle
 };
+const getDateByOffset = (startDate, offset2, viewMode) => {
+  switch (viewMode) {
+    case ViewMode.Day:
+      return addDays(startDate, offset2);
+    case ViewMode.HalfDay:
+      return addHours(startDate, offset2 * 12);
+    case ViewMode.QuarterDay:
+      return addHours(startDate, offset2 * 6);
+    case ViewMode.Hour:
+      return addHours(startDate, offset2);
+    case ViewMode.Month:
+      return addMonths(startDate, offset2);
+    case ViewMode.Week:
+      return addWeeks(startDate, offset2);
+    case ViewMode.Year:
+      return addYears(startDate, offset2);
+    default:
+      throw new Error("Unknown view mode");
+  }
+};
+const taskXCoordinate = (xDate, startDate, viewMode, columnWidth) => {
+  const index2 = getDatesDiff(xDate, startDate, viewMode);
+  const currentDate = getDateByOffset(startDate, index2, viewMode);
+  const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
+  const remainderMillis = xDate.getTime() - currentDate.getTime();
+  const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
+  return index2 * columnWidth + percentOfInterval * columnWidth;
+};
+const taskComparisonXCoordinate = (xDate, startDate, viewMode, columnWidth) => {
+  const index2 = getDatesDiff(xDate, startDate, viewMode);
+  const currentDate = getDateByOffset(startDate, index2, viewMode);
+  const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
+  const remainderMillis = xDate.getTime() - currentDate.getTime();
+  const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
+  return index2 * columnWidth + percentOfInterval * columnWidth;
+};
+const progressWithByParams = (taskX1, taskX2, progress, rtl) => {
+  const progressWidth = Math.max((taskX2 - taskX1) * progress * 0.01, 0);
+  let progressX;
+  if (rtl) {
+    progressX = taskX2 - progressWidth;
+  } else {
+    progressX = taskX1;
+  }
+  return [progressWidth, progressX];
+};
+const dateByX = (x, taskX, taskDate, xStep, timeStep) => {
+  let newDate = new Date((x - taskX) / xStep * timeStep + taskDate.getTime());
+  newDate = new Date(
+    newDate.getTime() + (newDate.getTimezoneOffset() - taskDate.getTimezoneOffset()) * 6e4
+  );
+  return newDate;
+};
+const handleTaskBySVGMouseEvent = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep, rtl) => {
+  let result;
+  switch (selectedTask.type) {
+    case "milestone":
+      result = handleTaskBySVGMouseEventForMilestone(
+        action,
+        selectedTask,
+        initialCoordinates,
+        coordinates,
+        xStep,
+        timeStep
+      );
+      break;
+    default:
+      result = handleTaskBySVGMouseEventForBar(
+        action,
+        selectedTask,
+        initialCoordinates,
+        coordinates,
+        xStep,
+        timeStep,
+        rtl
+      );
+      break;
+  }
+  return result;
+};
+const handleTaskBySVGMouseEventForBar = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep, rtl) => {
+  const changedTask = { ...selectedTask };
+  let isChanged = false;
+  switch (action) {
+    case "progress":
+      isChanged = initialCoordinates.progressWidth !== coordinates.progressWidth;
+      if (isChanged) {
+        changedTask.progress = Math.round(
+          coordinates.progressWidth * 100 / (coordinates.x2 - coordinates.x1)
+        );
+      }
+      break;
+    case "start": {
+      isChanged = initialCoordinates.x1 !== coordinates.x1;
+      if (isChanged) {
+        if (rtl) {
+          changedTask.end = dateByX(
+            coordinates.x1,
+            initialCoordinates.x1,
+            selectedTask.end,
+            xStep,
+            timeStep
+          );
+        } else {
+          changedTask.start = dateByX(
+            coordinates.x1,
+            initialCoordinates.x1,
+            selectedTask.start,
+            xStep,
+            timeStep
+          );
+        }
+      }
+      break;
+    }
+    case "end": {
+      isChanged = initialCoordinates.x2 !== coordinates.x2;
+      if (isChanged) {
+        if (rtl) {
+          changedTask.start = dateByX(
+            coordinates.x2,
+            initialCoordinates.x2,
+            selectedTask.start,
+            xStep,
+            timeStep
+          );
+        } else {
+          changedTask.end = dateByX(
+            coordinates.x2,
+            initialCoordinates.x2,
+            selectedTask.end,
+            xStep,
+            timeStep
+          );
+        }
+      }
+      break;
+    }
+    case "move": {
+      isChanged = initialCoordinates.x1 !== coordinates.x1;
+      if (isChanged) {
+        if (rtl) {
+          changedTask.end = dateByX(
+            coordinates.x1,
+            initialCoordinates.x1,
+            selectedTask.end,
+            xStep,
+            timeStep
+          );
+          changedTask.start = dateByX(
+            coordinates.x2,
+            initialCoordinates.x2,
+            selectedTask.start,
+            xStep,
+            timeStep
+          );
+        } else {
+          changedTask.start = dateByX(
+            coordinates.x1,
+            initialCoordinates.x1,
+            selectedTask.start,
+            xStep,
+            timeStep
+          );
+          changedTask.end = dateByX(
+            coordinates.x2,
+            initialCoordinates.x2,
+            selectedTask.end,
+            xStep,
+            timeStep
+          );
+        }
+      }
+      break;
+    }
+  }
+  return { isChanged, changedTask };
+};
+const handleTaskBySVGMouseEventForMilestone = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep) => {
+  const changedTask = { ...selectedTask };
+  const isChanged = coordinates.x1 !== initialCoordinates.x1;
+  if (isChanged) {
+    switch (action) {
+      case "move": {
+        changedTask.start = dateByX(
+          coordinates.x1,
+          initialCoordinates.x1,
+          selectedTask.start,
+          xStep,
+          timeStep
+        );
+        changedTask.end = changedTask.start;
+        break;
+      }
+    }
+  }
+  return { isChanged, changedTask };
+};
+const calculateDataDatePosition = ({
+  dataDate,
+  startDate,
+  viewMode,
+  columnWidth,
+  tasks = [],
+  rtl = false
+}) => {
+  const tasksStartingOnDataDate = tasks.filter((task) => {
+    if (!task || !task.start)
+      return false;
+    const taskStartDate = new Date(task.start);
+    const dataDateNormalized = new Date(dataDate);
+    switch (viewMode) {
+      case ViewMode.Hour:
+        return taskStartDate.getFullYear() === dataDateNormalized.getFullYear() && taskStartDate.getMonth() === dataDateNormalized.getMonth() && taskStartDate.getDate() === dataDateNormalized.getDate() && taskStartDate.getHours() === dataDateNormalized.getHours();
+      case ViewMode.QuarterDay:
+        return taskStartDate.getFullYear() === dataDateNormalized.getFullYear() && taskStartDate.getMonth() === dataDateNormalized.getMonth() && taskStartDate.getDate() === dataDateNormalized.getDate() && Math.floor(taskStartDate.getHours() / 6) === Math.floor(dataDateNormalized.getHours() / 6);
+      case ViewMode.HalfDay:
+        return taskStartDate.getFullYear() === dataDateNormalized.getFullYear() && taskStartDate.getMonth() === dataDateNormalized.getMonth() && taskStartDate.getDate() === dataDateNormalized.getDate() && Math.floor(taskStartDate.getHours() / 12) === Math.floor(dataDateNormalized.getHours() / 12);
+      case ViewMode.Day:
+        return taskStartDate.getFullYear() === dataDateNormalized.getFullYear() && taskStartDate.getMonth() === dataDateNormalized.getMonth() && taskStartDate.getDate() === dataDateNormalized.getDate();
+      case ViewMode.Week: {
+        const taskWeekStart = new Date(taskStartDate);
+        taskWeekStart.setDate(taskStartDate.getDate() - taskStartDate.getDay());
+        const dataWeekStart = new Date(dataDateNormalized);
+        dataWeekStart.setDate(
+          dataDateNormalized.getDate() - dataDateNormalized.getDay()
+        );
+        return taskWeekStart.getTime() === dataWeekStart.getTime();
+      }
+      case ViewMode.Month:
+        return taskStartDate.getFullYear() === dataDateNormalized.getFullYear() && taskStartDate.getMonth() === dataDateNormalized.getMonth();
+      case ViewMode.Year:
+        return taskStartDate.getFullYear() === dataDateNormalized.getFullYear();
+      default:
+        return false;
+    }
+  });
+  if (tasksStartingOnDataDate.length > 0) {
+    let dataDateEndTime;
+    switch (viewMode) {
+      case ViewMode.Hour:
+        dataDateEndTime = new Date(dataDate.getTime() + 60 * 60 * 1e3);
+        break;
+      case ViewMode.QuarterDay:
+        dataDateEndTime = new Date(dataDate.getTime() + 6 * 60 * 60 * 1e3);
+        break;
+      case ViewMode.HalfDay:
+        dataDateEndTime = new Date(dataDate.getTime() + 12 * 60 * 60 * 1e3);
+        break;
+      case ViewMode.Day:
+        dataDateEndTime = new Date(dataDate);
+        dataDateEndTime.setHours(23, 59, 59, 999);
+        break;
+      case ViewMode.Week: {
+        dataDateEndTime = new Date(dataDate);
+        dataDateEndTime.setDate(dataDate.getDate() + (6 - dataDate.getDay()));
+        dataDateEndTime.setHours(23, 59, 59, 999);
+        break;
+      }
+      case ViewMode.Month: {
+        dataDateEndTime = new Date(
+          dataDate.getFullYear(),
+          dataDate.getMonth() + 1,
+          0
+        );
+        dataDateEndTime.setHours(23, 59, 59, 999);
+        break;
+      }
+      case ViewMode.Year: {
+        dataDateEndTime = new Date(dataDate.getFullYear(), 11, 31);
+        dataDateEndTime.setHours(23, 59, 59, 999);
+        break;
+      }
+      default:
+        dataDateEndTime = new Date(dataDate);
+        dataDateEndTime.setHours(23, 59, 59, 999);
+    }
+    const dataDateEndPosition = taskXCoordinate(
+      dataDateEndTime,
+      startDate,
+      viewMode,
+      columnWidth
+    );
+    return dataDateEndPosition;
+  }
+  const dataIndex = getDatesDiff(dataDate, startDate, viewMode);
+  const extraMultiplier = () => {
+    switch (viewMode) {
+      case ViewMode.Week: {
+        const percent = dataDate.getDay() / 7;
+        return 1 + percent * 0.2;
+      }
+      case ViewMode.Month: {
+        const dayInMonth = dataDate.getDate();
+        const maxDaysInMonth = getDaysInMonth(
+          dataDate.getMonth(),
+          dataDate.getFullYear()
+        );
+        const percent = dayInMonth / maxDaysInMonth;
+        return 1 + percent * 0.5;
+      }
+      case ViewMode.Year: {
+        const percent = dataDate.getMonth() / 12;
+        return 1 + percent * 0.5;
+      }
+      default:
+        return 1;
+    }
+  };
+  const tickX = dataIndex * columnWidth * extraMultiplier();
+  return rtl ? tickX + columnWidth : tickX;
+};
 const GanttTodayInner = ({
   additionalLeftSpace,
   distances: { columnWidth },
@@ -10923,7 +11235,8 @@ const GanttTodayInner = ({
   todayColor = null,
   dataDateColor = null,
   todayLabel = "Today",
-  dataDateLabel = "Data Date"
+  dataDateLabel = "Data Date",
+  tasks = []
 }) => {
   const todayElement = useMemo(() => {
     if (isUnknownDates || !showTodayLine) {
@@ -11006,32 +11319,15 @@ const GanttTodayInner = ({
     if (!showDataDateLine || !dataDate) {
       return null;
     }
-    const dataIndex = getDatesDiff(dataDate, startDate, viewMode);
-    const extraMultiplier = () => {
-      switch (viewMode) {
-        case ViewMode.Week: {
-          const percent = dataDate.getDay() / 7;
-          return 1 + percent * 0.2;
-        }
-        case ViewMode.Month: {
-          const dayInMonth = dataDate.getDate();
-          const maxDaysInMonth = getDaysInMonth(
-            dataDate.getMonth(),
-            dataDate.getFullYear()
-          );
-          const percent = dayInMonth / maxDaysInMonth;
-          return 1 + percent * 0.5;
-        }
-        case ViewMode.Year: {
-          const percent = dataDate.getMonth() / 12;
-          return 1 + percent * 0.5;
-        }
-        default:
-          return 1;
-      }
-    };
-    const tickX = dataIndex * columnWidth * extraMultiplier();
-    const x = rtl ? tickX + columnWidth : tickX;
+    const tickX = calculateDataDatePosition({
+      dataDate,
+      startDate,
+      viewMode,
+      columnWidth,
+      tasks,
+      rtl
+    });
+    const x = rtl ? tickX : tickX;
     const color = dataDateColor || "var(--gantt-calendar-today-color)";
     return /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(
@@ -11077,7 +11373,8 @@ const GanttTodayInner = ({
     showDataDateLine,
     dataDate,
     dataDateColor,
-    dataDateLabel
+    dataDateLabel,
+    tasks
   ]);
   return /* @__PURE__ */ jsxs("g", { className: "today", children: [
     dataDateElement,
@@ -11772,204 +12069,6 @@ const RelationLine = ({
     }
   );
 };
-const getDateByOffset = (startDate, offset2, viewMode) => {
-  switch (viewMode) {
-    case ViewMode.Day:
-      return addDays(startDate, offset2);
-    case ViewMode.HalfDay:
-      return addHours(startDate, offset2 * 12);
-    case ViewMode.QuarterDay:
-      return addHours(startDate, offset2 * 6);
-    case ViewMode.Hour:
-      return addHours(startDate, offset2);
-    case ViewMode.Month:
-      return addMonths(startDate, offset2);
-    case ViewMode.Week:
-      return addWeeks(startDate, offset2);
-    case ViewMode.Year:
-      return addYears(startDate, offset2);
-    default:
-      throw new Error("Unknown view mode");
-  }
-};
-const taskXCoordinate = (xDate, startDate, viewMode, columnWidth) => {
-  const index2 = getDatesDiff(xDate, startDate, viewMode);
-  const currentDate = getDateByOffset(startDate, index2, viewMode);
-  const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
-  const remainderMillis = xDate.getTime() - currentDate.getTime();
-  const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
-  return index2 * columnWidth + percentOfInterval * columnWidth;
-};
-const taskComparisonXCoordinate = (xDate, startDate, viewMode, columnWidth) => {
-  const index2 = getDatesDiff(xDate, startDate, viewMode);
-  const currentDate = getDateByOffset(startDate, index2, viewMode);
-  const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
-  const remainderMillis = xDate.getTime() - currentDate.getTime();
-  const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
-  return index2 * columnWidth + percentOfInterval * columnWidth;
-};
-const progressWithByParams = (taskX1, taskX2, progress, rtl) => {
-  const progressWidth = Math.max((taskX2 - taskX1) * progress * 0.01, 0);
-  let progressX;
-  if (rtl) {
-    progressX = taskX2 - progressWidth;
-  } else {
-    progressX = taskX1;
-  }
-  return [progressWidth, progressX];
-};
-const dateByX = (x, taskX, taskDate, xStep, timeStep) => {
-  let newDate = new Date((x - taskX) / xStep * timeStep + taskDate.getTime());
-  newDate = new Date(
-    newDate.getTime() + (newDate.getTimezoneOffset() - taskDate.getTimezoneOffset()) * 6e4
-  );
-  return newDate;
-};
-const handleTaskBySVGMouseEvent = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep, rtl) => {
-  let result;
-  switch (selectedTask.type) {
-    case "milestone":
-      result = handleTaskBySVGMouseEventForMilestone(
-        action,
-        selectedTask,
-        initialCoordinates,
-        coordinates,
-        xStep,
-        timeStep
-      );
-      break;
-    default:
-      result = handleTaskBySVGMouseEventForBar(
-        action,
-        selectedTask,
-        initialCoordinates,
-        coordinates,
-        xStep,
-        timeStep,
-        rtl
-      );
-      break;
-  }
-  return result;
-};
-const handleTaskBySVGMouseEventForBar = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep, rtl) => {
-  const changedTask = { ...selectedTask };
-  let isChanged = false;
-  switch (action) {
-    case "progress":
-      isChanged = initialCoordinates.progressWidth !== coordinates.progressWidth;
-      if (isChanged) {
-        changedTask.progress = Math.round(
-          coordinates.progressWidth * 100 / (coordinates.x2 - coordinates.x1)
-        );
-      }
-      break;
-    case "start": {
-      isChanged = initialCoordinates.x1 !== coordinates.x1;
-      if (isChanged) {
-        if (rtl) {
-          changedTask.end = dateByX(
-            coordinates.x1,
-            initialCoordinates.x1,
-            selectedTask.end,
-            xStep,
-            timeStep
-          );
-        } else {
-          changedTask.start = dateByX(
-            coordinates.x1,
-            initialCoordinates.x1,
-            selectedTask.start,
-            xStep,
-            timeStep
-          );
-        }
-      }
-      break;
-    }
-    case "end": {
-      isChanged = initialCoordinates.x2 !== coordinates.x2;
-      if (isChanged) {
-        if (rtl) {
-          changedTask.start = dateByX(
-            coordinates.x2,
-            initialCoordinates.x2,
-            selectedTask.start,
-            xStep,
-            timeStep
-          );
-        } else {
-          changedTask.end = dateByX(
-            coordinates.x2,
-            initialCoordinates.x2,
-            selectedTask.end,
-            xStep,
-            timeStep
-          );
-        }
-      }
-      break;
-    }
-    case "move": {
-      isChanged = initialCoordinates.x1 !== coordinates.x1;
-      if (isChanged) {
-        if (rtl) {
-          changedTask.end = dateByX(
-            coordinates.x1,
-            initialCoordinates.x1,
-            selectedTask.end,
-            xStep,
-            timeStep
-          );
-          changedTask.start = dateByX(
-            coordinates.x2,
-            initialCoordinates.x2,
-            selectedTask.start,
-            xStep,
-            timeStep
-          );
-        } else {
-          changedTask.start = dateByX(
-            coordinates.x1,
-            initialCoordinates.x1,
-            selectedTask.start,
-            xStep,
-            timeStep
-          );
-          changedTask.end = dateByX(
-            coordinates.x2,
-            initialCoordinates.x2,
-            selectedTask.end,
-            xStep,
-            timeStep
-          );
-        }
-      }
-      break;
-    }
-  }
-  return { isChanged, changedTask };
-};
-const handleTaskBySVGMouseEventForMilestone = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep) => {
-  const changedTask = { ...selectedTask };
-  const isChanged = coordinates.x1 !== initialCoordinates.x1;
-  if (isChanged) {
-    switch (action) {
-      case "move": {
-        changedTask.start = dateByX(
-          coordinates.x1,
-          initialCoordinates.x1,
-          selectedTask.start,
-          xStep,
-          timeStep
-        );
-        changedTask.end = changedTask.start;
-        break;
-      }
-    }
-  }
-  return { isChanged, changedTask };
-};
 const barWrapper = "_barWrapper_5jhkr_1";
 const barHandle = "_barHandle_5jhkr_11";
 const barHandleImportantVisible = "_barHandleImportantVisible_5jhkr_37";
@@ -20186,7 +20285,8 @@ const Gantt = (props) => {
       todayColor,
       dataDateColor,
       todayLabel,
-      dataDateLabel
+      dataDateLabel,
+      tasks: sortedTasks.filter((task) => task.type !== "empty")
     }),
     [
       additionalLeftSpace,
@@ -20202,7 +20302,8 @@ const Gantt = (props) => {
       todayColor,
       dataDateColor,
       todayLabel,
-      dataDateLabel
+      dataDateLabel,
+      sortedTasks
     ]
   );
   const calendarProps = useMemo(

package/dist/gantt-task-react.umd.js

@@ -10926,6 +10926,318 @@
     ganttToday,
     ganttTodayCircle
   };
+  const getDateByOffset = (startDate, offset2, viewMode) => {
+    switch (viewMode) {
+      case ViewMode.Day:
+        return addDays(startDate, offset2);
+      case ViewMode.HalfDay:
+        return addHours(startDate, offset2 * 12);
+      case ViewMode.QuarterDay:
+        return addHours(startDate, offset2 * 6);
+      case ViewMode.Hour:
+        return addHours(startDate, offset2);
+      case ViewMode.Month:
+        return addMonths(startDate, offset2);
+      case ViewMode.Week:
+        return addWeeks(startDate, offset2);
+      case ViewMode.Year:
+        return addYears(startDate, offset2);
+      default:
+        throw new Error("Unknown view mode");
+    }
+  };
+  const taskXCoordinate = (xDate, startDate, viewMode, columnWidth) => {
+    const index2 = getDatesDiff(xDate, startDate, viewMode);
+    const currentDate = getDateByOffset(startDate, index2, viewMode);
+    const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
+    const remainderMillis = xDate.getTime() - currentDate.getTime();
+    const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
+    return index2 * columnWidth + percentOfInterval * columnWidth;
+  };
+  const taskComparisonXCoordinate = (xDate, startDate, viewMode, columnWidth) => {
+    const index2 = getDatesDiff(xDate, startDate, viewMode);
+    const currentDate = getDateByOffset(startDate, index2, viewMode);
+    const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
+    const remainderMillis = xDate.getTime() - currentDate.getTime();
+    const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
+    return index2 * columnWidth + percentOfInterval * columnWidth;
+  };
+  const progressWithByParams = (taskX1, taskX2, progress, rtl) => {
+    const progressWidth = Math.max((taskX2 - taskX1) * progress * 0.01, 0);
+    let progressX;
+    if (rtl) {
+      progressX = taskX2 - progressWidth;
+    } else {
+      progressX = taskX1;
+    }
+    return [progressWidth, progressX];
+  };
+  const dateByX = (x, taskX, taskDate, xStep, timeStep) => {
+    let newDate = new Date((x - taskX) / xStep * timeStep + taskDate.getTime());
+    newDate = new Date(
+      newDate.getTime() + (newDate.getTimezoneOffset() - taskDate.getTimezoneOffset()) * 6e4
+    );
+    return newDate;
+  };
+  const handleTaskBySVGMouseEvent = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep, rtl) => {
+    let result;
+    switch (selectedTask.type) {
+      case "milestone":
+        result = handleTaskBySVGMouseEventForMilestone(
+          action,
+          selectedTask,
+          initialCoordinates,
+          coordinates,
+          xStep,
+          timeStep
+        );
+        break;
+      default:
+        result = handleTaskBySVGMouseEventForBar(
+          action,
+          selectedTask,
+          initialCoordinates,
+          coordinates,
+          xStep,
+          timeStep,
+          rtl
+        );
+        break;
+    }
+    return result;
+  };
+  const handleTaskBySVGMouseEventForBar = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep, rtl) => {
+    const changedTask = { ...selectedTask };
+    let isChanged = false;
+    switch (action) {
+      case "progress":
+        isChanged = initialCoordinates.progressWidth !== coordinates.progressWidth;
+        if (isChanged) {
+          changedTask.progress = Math.round(
+            coordinates.progressWidth * 100 / (coordinates.x2 - coordinates.x1)
+          );
+        }
+        break;
+      case "start": {
+        isChanged = initialCoordinates.x1 !== coordinates.x1;
+        if (isChanged) {
+          if (rtl) {
+            changedTask.end = dateByX(
+              coordinates.x1,
+              initialCoordinates.x1,
+              selectedTask.end,
+              xStep,
+              timeStep
+            );
+          } else {
+            changedTask.start = dateByX(
+              coordinates.x1,
+              initialCoordinates.x1,
+              selectedTask.start,
+              xStep,
+              timeStep
+            );
+          }
+        }
+        break;
+      }
+      case "end": {
+        isChanged = initialCoordinates.x2 !== coordinates.x2;
+        if (isChanged) {
+          if (rtl) {
+            changedTask.start = dateByX(
+              coordinates.x2,
+              initialCoordinates.x2,
+              selectedTask.start,
+              xStep,
+              timeStep
+            );
+          } else {
+            changedTask.end = dateByX(
+              coordinates.x2,
+              initialCoordinates.x2,
+              selectedTask.end,
+              xStep,
+              timeStep
+            );
+          }
+        }
+        break;
+      }
+      case "move": {
+        isChanged = initialCoordinates.x1 !== coordinates.x1;
+        if (isChanged) {
+          if (rtl) {
+            changedTask.end = dateByX(
+              coordinates.x1,
+              initialCoordinates.x1,
+              selectedTask.end,
+              xStep,
+              timeStep
+            );
+            changedTask.start = dateByX(
+              coordinates.x2,
+              initialCoordinates.x2,
+              selectedTask.start,
+              xStep,
+              timeStep
+            );
+          } else {
+            changedTask.start = dateByX(
+              coordinates.x1,
+              initialCoordinates.x1,
+              selectedTask.start,
+              xStep,
+              timeStep
+            );
+            changedTask.end = dateByX(
+              coordinates.x2,
+              initialCoordinates.x2,
+              selectedTask.end,
+              xStep,
+              timeStep
+            );
+          }
+        }
+        break;
+      }
+    }
+    return { isChanged, changedTask };
+  };
+  const handleTaskBySVGMouseEventForMilestone = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep) => {
+    const changedTask = { ...selectedTask };
+    const isChanged = coordinates.x1 !== initialCoordinates.x1;
+    if (isChanged) {
+      switch (action) {
+        case "move": {
+          changedTask.start = dateByX(
+            coordinates.x1,
+            initialCoordinates.x1,
+            selectedTask.start,
+            xStep,
+            timeStep
+          );
+          changedTask.end = changedTask.start;
+          break;
+        }
+      }
+    }
+    return { isChanged, changedTask };
+  };
+  const calculateDataDatePosition = ({
+    dataDate,
+    startDate,
+    viewMode,
+    columnWidth,
+    tasks = [],
+    rtl = false
+  }) => {
+    const tasksStartingOnDataDate = tasks.filter((task) => {
+      if (!task || !task.start)
+        return false;
+      const taskStartDate = new Date(task.start);
+      const dataDateNormalized = new Date(dataDate);
+      switch (viewMode) {
+        case ViewMode.Hour:
+          return taskStartDate.getFullYear() === dataDateNormalized.getFullYear() && taskStartDate.getMonth() === dataDateNormalized.getMonth() && taskStartDate.getDate() === dataDateNormalized.getDate() && taskStartDate.getHours() === dataDateNormalized.getHours();
+        case ViewMode.QuarterDay:
+          return taskStartDate.getFullYear() === dataDateNormalized.getFullYear() && taskStartDate.getMonth() === dataDateNormalized.getMonth() && taskStartDate.getDate() === dataDateNormalized.getDate() && Math.floor(taskStartDate.getHours() / 6) === Math.floor(dataDateNormalized.getHours() / 6);
+        case ViewMode.HalfDay:
+          return taskStartDate.getFullYear() === dataDateNormalized.getFullYear() && taskStartDate.getMonth() === dataDateNormalized.getMonth() && taskStartDate.getDate() === dataDateNormalized.getDate() && Math.floor(taskStartDate.getHours() / 12) === Math.floor(dataDateNormalized.getHours() / 12);
+        case ViewMode.Day:
+          return taskStartDate.getFullYear() === dataDateNormalized.getFullYear() && taskStartDate.getMonth() === dataDateNormalized.getMonth() && taskStartDate.getDate() === dataDateNormalized.getDate();
+        case ViewMode.Week: {
+          const taskWeekStart = new Date(taskStartDate);
+          taskWeekStart.setDate(taskStartDate.getDate() - taskStartDate.getDay());
+          const dataWeekStart = new Date(dataDateNormalized);
+          dataWeekStart.setDate(
+            dataDateNormalized.getDate() - dataDateNormalized.getDay()
+          );
+          return taskWeekStart.getTime() === dataWeekStart.getTime();
+        }
+        case ViewMode.Month:
+          return taskStartDate.getFullYear() === dataDateNormalized.getFullYear() && taskStartDate.getMonth() === dataDateNormalized.getMonth();
+        case ViewMode.Year:
+          return taskStartDate.getFullYear() === dataDateNormalized.getFullYear();
+        default:
+          return false;
+      }
+    });
+    if (tasksStartingOnDataDate.length > 0) {
+      let dataDateEndTime;
+      switch (viewMode) {
+        case ViewMode.Hour:
+          dataDateEndTime = new Date(dataDate.getTime() + 60 * 60 * 1e3);
+          break;
+        case ViewMode.QuarterDay:
+          dataDateEndTime = new Date(dataDate.getTime() + 6 * 60 * 60 * 1e3);
+          break;
+        case ViewMode.HalfDay:
+          dataDateEndTime = new Date(dataDate.getTime() + 12 * 60 * 60 * 1e3);
+          break;
+        case ViewMode.Day:
+          dataDateEndTime = new Date(dataDate);
+          dataDateEndTime.setHours(23, 59, 59, 999);
+          break;
+        case ViewMode.Week: {
+          dataDateEndTime = new Date(dataDate);
+          dataDateEndTime.setDate(dataDate.getDate() + (6 - dataDate.getDay()));
+          dataDateEndTime.setHours(23, 59, 59, 999);
+          break;
+        }
+        case ViewMode.Month: {
+          dataDateEndTime = new Date(
+            dataDate.getFullYear(),
+            dataDate.getMonth() + 1,
+            0
+          );
+          dataDateEndTime.setHours(23, 59, 59, 999);
+          break;
+        }
+        case ViewMode.Year: {
+          dataDateEndTime = new Date(dataDate.getFullYear(), 11, 31);
+          dataDateEndTime.setHours(23, 59, 59, 999);
+          break;
+        }
+        default:
+          dataDateEndTime = new Date(dataDate);
+          dataDateEndTime.setHours(23, 59, 59, 999);
+      }
+      const dataDateEndPosition = taskXCoordinate(
+        dataDateEndTime,
+        startDate,
+        viewMode,
+        columnWidth
+      );
+      return dataDateEndPosition;
+    }
+    const dataIndex = getDatesDiff(dataDate, startDate, viewMode);
+    const extraMultiplier = () => {
+      switch (viewMode) {
+        case ViewMode.Week: {
+          const percent = dataDate.getDay() / 7;
+          return 1 + percent * 0.2;
+        }
+        case ViewMode.Month: {
+          const dayInMonth = dataDate.getDate();
+          const maxDaysInMonth = getDaysInMonth(
+            dataDate.getMonth(),
+            dataDate.getFullYear()
+          );
+          const percent = dayInMonth / maxDaysInMonth;
+          return 1 + percent * 0.5;
+        }
+        case ViewMode.Year: {
+          const percent = dataDate.getMonth() / 12;
+          return 1 + percent * 0.5;
+        }
+        default:
+          return 1;
+      }
+    };
+    const tickX = dataIndex * columnWidth * extraMultiplier();
+    return rtl ? tickX + columnWidth : tickX;
+  };
   const GanttTodayInner = ({
     additionalLeftSpace,
     distances: { columnWidth },
@@ -10940,7 +11252,8 @@
     todayColor = null,
     dataDateColor = null,
     todayLabel = "Today",
-    dataDateLabel = "Data Date"
+    dataDateLabel = "Data Date",
+    tasks = []
   }) => {
     const todayElement = React.useMemo(() => {
       if (isUnknownDates || !showTodayLine) {
@@ -11023,32 +11336,15 @@
       if (!showDataDateLine || !dataDate) {
         return null;
       }
-      const dataIndex = getDatesDiff(dataDate, startDate, viewMode);
-      const extraMultiplier = () => {
-        switch (viewMode) {
-          case ViewMode.Week: {
-            const percent = dataDate.getDay() / 7;
-            return 1 + percent * 0.2;
-          }
-          case ViewMode.Month: {
-            const dayInMonth = dataDate.getDate();
-            const maxDaysInMonth = getDaysInMonth(
-              dataDate.getMonth(),
-              dataDate.getFullYear()
-            );
-            const percent = dayInMonth / maxDaysInMonth;
-            return 1 + percent * 0.5;
-          }
-          case ViewMode.Year: {
-            const percent = dataDate.getMonth() / 12;
-            return 1 + percent * 0.5;
-          }
-          default:
-            return 1;
-        }
-      };
-      const tickX = dataIndex * columnWidth * extraMultiplier();
-      const x = rtl ? tickX + columnWidth : tickX;
+      const tickX = calculateDataDatePosition({
+        dataDate,
+        startDate,
+        viewMode,
+        columnWidth,
+        tasks,
+        rtl
+      });
+      const x = rtl ? tickX : tickX;
       const color = dataDateColor || "var(--gantt-calendar-today-color)";
       return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
         /* @__PURE__ */ jsxRuntime.jsx(
@@ -11094,7 +11390,8 @@
       showDataDateLine,
       dataDate,
       dataDateColor,
-      dataDateLabel
+      dataDateLabel,
+      tasks
     ]);
     return /* @__PURE__ */ jsxRuntime.jsxs("g", { className: "today", children: [
       dataDateElement,
@@ -11789,204 +12086,6 @@
       }
     );
   };
-  const getDateByOffset = (startDate, offset2, viewMode) => {
-    switch (viewMode) {
-      case ViewMode.Day:
-        return addDays(startDate, offset2);
-      case ViewMode.HalfDay:
-        return addHours(startDate, offset2 * 12);
-      case ViewMode.QuarterDay:
-        return addHours(startDate, offset2 * 6);
-      case ViewMode.Hour:
-        return addHours(startDate, offset2);
-      case ViewMode.Month:
-        return addMonths(startDate, offset2);
-      case ViewMode.Week:
-        return addWeeks(startDate, offset2);
-      case ViewMode.Year:
-        return addYears(startDate, offset2);
-      default:
-        throw new Error("Unknown view mode");
-    }
-  };
-  const taskXCoordinate = (xDate, startDate, viewMode, columnWidth) => {
-    const index2 = getDatesDiff(xDate, startDate, viewMode);
-    const currentDate = getDateByOffset(startDate, index2, viewMode);
-    const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
-    const remainderMillis = xDate.getTime() - currentDate.getTime();
-    const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
-    return index2 * columnWidth + percentOfInterval * columnWidth;
-  };
-  const taskComparisonXCoordinate = (xDate, startDate, viewMode, columnWidth) => {
-    const index2 = getDatesDiff(xDate, startDate, viewMode);
-    const currentDate = getDateByOffset(startDate, index2, viewMode);
-    const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
-    const remainderMillis = xDate.getTime() - currentDate.getTime();
-    const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
-    return index2 * columnWidth + percentOfInterval * columnWidth;
-  };
-  const progressWithByParams = (taskX1, taskX2, progress, rtl) => {
-    const progressWidth = Math.max((taskX2 - taskX1) * progress * 0.01, 0);
-    let progressX;
-    if (rtl) {
-      progressX = taskX2 - progressWidth;
-    } else {
-      progressX = taskX1;
-    }
-    return [progressWidth, progressX];
-  };
-  const dateByX = (x, taskX, taskDate, xStep, timeStep) => {
-    let newDate = new Date((x - taskX) / xStep * timeStep + taskDate.getTime());
-    newDate = new Date(
-      newDate.getTime() + (newDate.getTimezoneOffset() - taskDate.getTimezoneOffset()) * 6e4
-    );
-    return newDate;
-  };
-  const handleTaskBySVGMouseEvent = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep, rtl) => {
-    let result;
-    switch (selectedTask.type) {
-      case "milestone":
-        result = handleTaskBySVGMouseEventForMilestone(
-          action,
-          selectedTask,
-          initialCoordinates,
-          coordinates,
-          xStep,
-          timeStep
-        );
-        break;
-      default:
-        result = handleTaskBySVGMouseEventForBar(
-          action,
-          selectedTask,
-          initialCoordinates,
-          coordinates,
-          xStep,
-          timeStep,
-          rtl
-        );
-        break;
-    }
-    return result;
-  };
-  const handleTaskBySVGMouseEventForBar = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep, rtl) => {
-    const changedTask = { ...selectedTask };
-    let isChanged = false;
-    switch (action) {
-      case "progress":
-        isChanged = initialCoordinates.progressWidth !== coordinates.progressWidth;
-        if (isChanged) {
-          changedTask.progress = Math.round(
-            coordinates.progressWidth * 100 / (coordinates.x2 - coordinates.x1)
-          );
-        }
-        break;
-      case "start": {
-        isChanged = initialCoordinates.x1 !== coordinates.x1;
-        if (isChanged) {
-          if (rtl) {
-            changedTask.end = dateByX(
-              coordinates.x1,
-              initialCoordinates.x1,
-              selectedTask.end,
-              xStep,
-              timeStep
-            );
-          } else {
-            changedTask.start = dateByX(
-              coordinates.x1,
-              initialCoordinates.x1,
-              selectedTask.start,
-              xStep,
-              timeStep
-            );
-          }
-        }
-        break;
-      }
-      case "end": {
-        isChanged = initialCoordinates.x2 !== coordinates.x2;
-        if (isChanged) {
-          if (rtl) {
-            changedTask.start = dateByX(
-              coordinates.x2,
-              initialCoordinates.x2,
-              selectedTask.start,
-              xStep,
-              timeStep
-            );
-          } else {
-            changedTask.end = dateByX(
-              coordinates.x2,
-              initialCoordinates.x2,
-              selectedTask.end,
-              xStep,
-              timeStep
-            );
-          }
-        }
-        break;
-      }
-      case "move": {
-        isChanged = initialCoordinates.x1 !== coordinates.x1;
-        if (isChanged) {
-          if (rtl) {
-            changedTask.end = dateByX(
-              coordinates.x1,
-              initialCoordinates.x1,
-              selectedTask.end,
-              xStep,
-              timeStep
-            );
-            changedTask.start = dateByX(
-              coordinates.x2,
-              initialCoordinates.x2,
-              selectedTask.start,
-              xStep,
-              timeStep
-            );
-          } else {
-            changedTask.start = dateByX(
-              coordinates.x1,
-              initialCoordinates.x1,
-              selectedTask.start,
-              xStep,
-              timeStep
-            );
-            changedTask.end = dateByX(
-              coordinates.x2,
-              initialCoordinates.x2,
-              selectedTask.end,
-              xStep,
-              timeStep
-            );
-          }
-        }
-        break;
-      }
-    }
-    return { isChanged, changedTask };
-  };
-  const handleTaskBySVGMouseEventForMilestone = (action, selectedTask, initialCoordinates, coordinates, xStep, timeStep) => {
-    const changedTask = { ...selectedTask };
-    const isChanged = coordinates.x1 !== initialCoordinates.x1;
-    if (isChanged) {
-      switch (action) {
-        case "move": {
-          changedTask.start = dateByX(
-            coordinates.x1,
-            initialCoordinates.x1,
-            selectedTask.start,
-            xStep,
-            timeStep
-          );
-          changedTask.end = changedTask.start;
-          break;
-        }
-      }
-    }
-    return { isChanged, changedTask };
-  };
   const barWrapper = "_barWrapper_5jhkr_1";
   const barHandle = "_barHandle_5jhkr_11";
   const barHandleImportantVisible = "_barHandleImportantVisible_5jhkr_37";
@@ -20203,7 +20302,8 @@
         todayColor,
         dataDateColor,
         todayLabel,
-        dataDateLabel
+        dataDateLabel,
+        tasks: sortedTasks.filter((task) => task.type !== "empty")
       }),
       [
         additionalLeftSpace,
@@ -20219,7 +20319,8 @@
         todayColor,
         dataDateColor,
         todayLabel,
-        dataDateLabel
+        dataDateLabel,
+        sortedTasks
       ]
     );
     const calendarProps = React.useMemo(

package/dist/helpers/data-date-helper.d.ts

@@ -0,0 +1,14 @@
+import { Task, ViewMode } from "../types";
+export interface DataDatePositionOptions {
+    dataDate: Date;
+    startDate: Date;
+    viewMode: ViewMode;
+    columnWidth: number;
+    tasks?: readonly Task[];
+    rtl?: boolean;
+}
+/**
+ * Calculate enhanced data date line position that considers tasks starting on the same date
+ * When tasks start exactly on the data date, positions the line at the end of those task bars
+ */
+export declare const calculateDataDatePosition: ({ dataDate, startDate, viewMode, columnWidth, tasks, rtl, }: DataDatePositionOptions) => number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gantt-task-react-v",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "Interactive Gantt Chart for React with TypeScript.",
   "author": "aguilanbon",
   "homepage": "https://github.com/aguilanbon/gantt-task-react-v",