gantt-task-react-v 1.0.50 → 1.0.52

package/README.md

@@ -14,7 +14,7 @@
 ## Install
 
 ```
-npm install https://github.com/aguilanbon/gantt-task-react-v"
+npm install gantt-task-react-v
 ```
 
 ## How to use it

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

@@ -10901,6 +10901,26 @@ 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 = {
@@ -10928,31 +10948,12 @@ const GanttTodayInner = ({
       return null;
     }
     const today = /* @__PURE__ */ new Date();
-    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 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 x = rtl ? tickX + columnWidth : tickX;
     const color = todayColor || "var(--gantt-calendar-today-color)";
     return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -11004,31 +11005,12 @@ 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 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 x = rtl ? tickX + columnWidth : tickX;
     const color = dataDateColor || "var(--gantt-calendar-today-color)";
     return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -11770,26 +11752,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);
@@ -19910,7 +19872,7 @@ const Gantt = (props) => {
       viewMode,
       showTodayLine,
       showDataDateLine,
-      dataDate,
+      dataDate: dataDate ? roundStartDate(dataDate) : null,
       todayColor,
       dataDateColor,
       todayLabel,
@@ -19930,7 +19892,8 @@ const Gantt = (props) => {
       todayColor,
       dataDateColor,
       todayLabel,
-      dataDateLabel
+      dataDateLabel,
+      roundStartDate
     ]
   );
   const calendarProps = useMemo(

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

@@ -10918,6 +10918,26 @@
     ] });
   };
   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 = {
@@ -10945,31 +10965,12 @@
         return null;
       }
       const today = /* @__PURE__ */ new Date();
-      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 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 x = rtl ? tickX + columnWidth : tickX;
       const color = todayColor || "var(--gantt-calendar-today-color)";
       return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
@@ -11021,31 +11022,12 @@
       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 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 x = rtl ? tickX + columnWidth : tickX;
       const color = dataDateColor || "var(--gantt-calendar-today-color)";
       return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
@@ -11787,26 +11769,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);
@@ -19927,7 +19889,7 @@
         viewMode,
         showTodayLine,
         showDataDateLine,
-        dataDate,
+        dataDate: dataDate ? roundStartDate(dataDate) : null,
         todayColor,
         dataDateColor,
         todayLabel,
@@ -19947,7 +19909,8 @@
         todayColor,
         dataDateColor,
         todayLabel,
-        dataDateLabel
+        dataDateLabel,
+        roundStartDate
       ]
     );
     const calendarProps = React.useMemo(

package/package.json

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