gantt-task-react-v 1.2.8 → 1.2.10

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

@@ -11111,87 +11111,16 @@ const calculateDataDatePosition = ({
   dataDate,
   startDate,
   viewMode,
-  columnWidth,
-  tasks = [],
-  rtl = false
+  columnWidth
 }) => {
-  const tasksStartingOnDataDate = tasks.filter((task) => {
-    if (!task || !task.start)
-      return false;
-    const taskStartDate = new Date(task.start);
-    const dataDateNormalized = new Date(dataDate);
-    if (viewMode === ViewMode.Day) {
-      return taskStartDate.getFullYear() === dataDateNormalized.getFullYear() && taskStartDate.getMonth() === dataDateNormalized.getMonth() && taskStartDate.getDate() === dataDateNormalized.getDate();
-    }
-    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.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) {
-    const dataDatePosition = taskXCoordinate(
-      dataDate,
-      startDate,
-      viewMode,
-      columnWidth
-    );
-    const overlapProportion = 0.75;
-    return dataDatePosition + columnWidth * overlapProportion;
-  }
-  if (viewMode === ViewMode.Day) {
-    const dataDatePosition = taskXCoordinate(
-      dataDate,
-      startDate,
-      viewMode,
-      columnWidth
-    );
-    return dataDatePosition + columnWidth * 0.5;
-  }
-  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 milestonePosition = taskXCoordinate(
+    dataDate,
+    startDate,
+    viewMode,
+    columnWidth
+  );
+  const milestoneHalfWidth = 6;
+  return milestonePosition + milestoneHalfWidth;
 };
 const GanttTodayInner = ({
   additionalLeftSpace,

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

@@ -11128,87 +11128,16 @@
     dataDate,
     startDate,
     viewMode,
-    columnWidth,
-    tasks = [],
-    rtl = false
+    columnWidth
   }) => {
-    const tasksStartingOnDataDate = tasks.filter((task) => {
-      if (!task || !task.start)
-        return false;
-      const taskStartDate = new Date(task.start);
-      const dataDateNormalized = new Date(dataDate);
-      if (viewMode === ViewMode.Day) {
-        return taskStartDate.getFullYear() === dataDateNormalized.getFullYear() && taskStartDate.getMonth() === dataDateNormalized.getMonth() && taskStartDate.getDate() === dataDateNormalized.getDate();
-      }
-      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.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) {
-      const dataDatePosition = taskXCoordinate(
-        dataDate,
-        startDate,
-        viewMode,
-        columnWidth
-      );
-      const overlapProportion = 0.75;
-      return dataDatePosition + columnWidth * overlapProportion;
-    }
-    if (viewMode === ViewMode.Day) {
-      const dataDatePosition = taskXCoordinate(
-        dataDate,
-        startDate,
-        viewMode,
-        columnWidth
-      );
-      return dataDatePosition + columnWidth * 0.5;
-    }
-    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 milestonePosition = taskXCoordinate(
+      dataDate,
+      startDate,
+      viewMode,
+      columnWidth
+    );
+    const milestoneHalfWidth = 6;
+    return milestonePosition + milestoneHalfWidth;
   };
   const GanttTodayInner = ({
     additionalLeftSpace,

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

@@ -11,4 +11,4 @@ export interface DataDatePositionOptions {
  * Calculate data date line position by creating a virtual milestone bar for the data date
  * and positioning the line at the end of that milestone bar (just like the custom frontend fix)
  */
-export declare const calculateDataDatePosition: ({ dataDate, startDate, viewMode, columnWidth, tasks, rtl, }: DataDatePositionOptions) => number;
+export declare const calculateDataDatePosition: ({ dataDate, startDate, viewMode, columnWidth, }: DataDatePositionOptions) => number;

package/package.json

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