gantt-task-react-v 1.0.54 → 1.0.56

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

@@ -10901,26 +10901,6 @@ const TaskListInner = ({
   ] });
 };
 const TaskList = memo(TaskListInner);
-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 ganttToday = "_ganttToday_1oyhk_1";
 const ganttTodayCircle = "_ganttTodayCircle_1oyhk_9";
 const styles$c = {
@@ -10948,15 +10928,32 @@ const GanttTodayInner = ({
       return null;
     }
     const today = /* @__PURE__ */ new Date();
-    const index2 = getDatesDiff(today, startDate, viewMode);
-    const currentDate = getDateByOffset(startDate, index2, viewMode);
-    const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
-    const remainderMillis = today.getTime() - currentDate.getTime();
-    const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
-    const tickX = index2 * columnWidth + percentOfInterval * columnWidth;
-    const offset2 = 5;
-    const adjustedTickX = tickX + (rtl ? -offset2 : offset2);
-    const x = rtl ? adjustedTickX + columnWidth : adjustedTickX;
+    const todayIndex = getDatesDiff(today, startDate, viewMode);
+    const extraMultiplier = () => {
+      switch (viewMode) {
+        case ViewMode.Week: {
+          const percent = today.getDay() / 7;
+          return 1 + percent * 0.2;
+        }
+        case ViewMode.Month: {
+          const dayInMonth = today.getDate();
+          const maxDaysInMonth = getDaysInMonth(
+            today.getMonth(),
+            today.getFullYear()
+          );
+          const percent = dayInMonth / maxDaysInMonth;
+          return 1 + percent * 0.5;
+        }
+        case ViewMode.Year: {
+          const percent = today.getMonth() / 12;
+          return 1 + percent * 0.5;
+        }
+        default:
+          return 1;
+      }
+    };
+    const tickX = todayIndex * columnWidth * extraMultiplier();
+    const x = rtl ? tickX + columnWidth : tickX;
     const color = todayColor || "var(--gantt-calendar-today-color)";
     return /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(
@@ -11007,15 +11004,32 @@ const GanttTodayInner = ({
     if (!showDataDateLine || !dataDate) {
       return null;
     }
-    const index2 = getDatesDiff(dataDate, startDate, viewMode);
-    const currentDate = getDateByOffset(startDate, index2, viewMode);
-    const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
-    const remainderMillis = dataDate.getTime() - currentDate.getTime();
-    const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
-    const tickX = index2 * columnWidth + percentOfInterval * columnWidth;
-    const offset2 = 5;
-    const adjustedTickX = tickX + (rtl ? -offset2 : offset2);
-    const x = rtl ? adjustedTickX + columnWidth : adjustedTickX;
+    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 color = dataDateColor || "var(--gantt-calendar-today-color)";
     return /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(
@@ -11756,6 +11770,26 @@ 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);
@@ -19876,7 +19910,7 @@ const Gantt = (props) => {
       viewMode,
       showTodayLine,
       showDataDateLine,
-      dataDate: dataDate ? roundStartDate(dataDate) : null,
+      dataDate,
       todayColor,
       dataDateColor,
       todayLabel,
@@ -19896,8 +19930,7 @@ const Gantt = (props) => {
       todayColor,
       dataDateColor,
       todayLabel,
-      dataDateLabel,
-      roundStartDate
+      dataDateLabel
     ]
   );
   const calendarProps = useMemo(

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

@@ -10918,26 +10918,6 @@
     ] });
   };
   const TaskList = React.memo(TaskListInner);
-  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 ganttToday = "_ganttToday_1oyhk_1";
   const ganttTodayCircle = "_ganttTodayCircle_1oyhk_9";
   const styles$c = {
@@ -10965,15 +10945,32 @@
         return null;
       }
       const today = /* @__PURE__ */ new Date();
-      const index2 = getDatesDiff(today, startDate, viewMode);
-      const currentDate = getDateByOffset(startDate, index2, viewMode);
-      const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
-      const remainderMillis = today.getTime() - currentDate.getTime();
-      const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
-      const tickX = index2 * columnWidth + percentOfInterval * columnWidth;
-      const offset2 = 5;
-      const adjustedTickX = tickX + (rtl ? -offset2 : offset2);
-      const x = rtl ? adjustedTickX + columnWidth : adjustedTickX;
+      const todayIndex = getDatesDiff(today, startDate, viewMode);
+      const extraMultiplier = () => {
+        switch (viewMode) {
+          case ViewMode.Week: {
+            const percent = today.getDay() / 7;
+            return 1 + percent * 0.2;
+          }
+          case ViewMode.Month: {
+            const dayInMonth = today.getDate();
+            const maxDaysInMonth = getDaysInMonth(
+              today.getMonth(),
+              today.getFullYear()
+            );
+            const percent = dayInMonth / maxDaysInMonth;
+            return 1 + percent * 0.5;
+          }
+          case ViewMode.Year: {
+            const percent = today.getMonth() / 12;
+            return 1 + percent * 0.5;
+          }
+          default:
+            return 1;
+        }
+      };
+      const tickX = todayIndex * columnWidth * extraMultiplier();
+      const x = rtl ? tickX + columnWidth : tickX;
       const color = todayColor || "var(--gantt-calendar-today-color)";
       return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
         /* @__PURE__ */ jsxRuntime.jsx(
@@ -11024,15 +11021,32 @@
       if (!showDataDateLine || !dataDate) {
         return null;
       }
-      const index2 = getDatesDiff(dataDate, startDate, viewMode);
-      const currentDate = getDateByOffset(startDate, index2, viewMode);
-      const nextDate = getDateByOffset(startDate, index2 + 1, viewMode);
-      const remainderMillis = dataDate.getTime() - currentDate.getTime();
-      const percentOfInterval = remainderMillis / (nextDate.getTime() - currentDate.getTime());
-      const tickX = index2 * columnWidth + percentOfInterval * columnWidth;
-      const offset2 = 5;
-      const adjustedTickX = tickX + (rtl ? -offset2 : offset2);
-      const x = rtl ? adjustedTickX + columnWidth : adjustedTickX;
+      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 color = dataDateColor || "var(--gantt-calendar-today-color)";
       return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
         /* @__PURE__ */ jsxRuntime.jsx(
@@ -11773,6 +11787,26 @@
       }
     );
   };
+  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);
@@ -19893,7 +19927,7 @@
         viewMode,
         showTodayLine,
         showDataDateLine,
-        dataDate: dataDate ? roundStartDate(dataDate) : null,
+        dataDate,
         todayColor,
         dataDateColor,
         todayLabel,
@@ -19913,8 +19947,7 @@
         todayColor,
         dataDateColor,
         todayLabel,
-        dataDateLabel,
-        roundStartDate
+        dataDateLabel
       ]
     );
     const calendarProps = React.useMemo(

package/package.json

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