gantt-task-react-v 1.0.46 → 1.0.47

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

@@ -8,5 +8,8 @@ export type GanttTodayProps = {
     startDate: Date;
     rtl: boolean;
     viewMode: ViewMode;
+    showTodayLine?: boolean;
+    showDataDateLine?: boolean;
+    dataDate?: Date | null;
 };
 export declare const GanttToday: React.NamedExoticComponent<GanttTodayProps>;

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

@@ -10914,31 +10914,34 @@ const GanttTodayInner = ({
   isUnknownDates,
   rtl,
   startDate,
-  viewMode
+  viewMode,
+  showTodayLine = true,
+  showDataDateLine = false,
+  dataDate = null
 }) => {
-  const today = useMemo(() => {
-    if (isUnknownDates) {
+  const todayElement = useMemo(() => {
+    if (isUnknownDates || !showTodayLine) {
       return null;
     }
-    const today2 = /* @__PURE__ */ new Date();
-    const todayIndex = getDatesDiff(today2, startDate, viewMode);
+    const today = /* @__PURE__ */ new Date();
+    const todayIndex = getDatesDiff(today, startDate, viewMode);
     const extraMultiplier = () => {
       switch (viewMode) {
         case ViewMode.Week: {
-          const percent = today2.getDay() / 7;
+          const percent = today.getDay() / 7;
           return 1 + percent * 0.2;
         }
         case ViewMode.Month: {
-          const dayInMonth = today2.getDate();
+          const dayInMonth = today.getDate();
           const maxDaysInMonth = getDaysInMonth(
-            today2.getMonth(),
-            today2.getFullYear()
+            today.getMonth(),
+            today.getFullYear()
           );
           const percent = dayInMonth / maxDaysInMonth;
           return 1 + percent * 0.5;
         }
         case ViewMode.Year: {
-          const percent = today2.getMonth() / 12;
+          const percent = today.getMonth() / 12;
           return 1 + percent * 0.5;
         }
         default:
@@ -10976,9 +10979,88 @@ const GanttTodayInner = ({
     isUnknownDates,
     rtl,
     startDate,
-    viewMode
+    viewMode,
+    showTodayLine
   ]);
-  return /* @__PURE__ */ jsx("g", { className: "today", children: today });
+  const dataDateElement = useMemo(() => {
+    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;
+    return /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(
+        "rect",
+        {
+          x: additionalLeftSpace + x,
+          y: 0,
+          width: 2,
+          height: ganttFullHeight,
+          fill: "var(--gantt-calendar-today-color)",
+          opacity: 0.9
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        "circle",
+        {
+          className: styles$c.ganttTodayCircle,
+          cx: x + 1,
+          cy: 6,
+          r: 6,
+          fill: "var(--gantt-calendar-today-color)"
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        "text",
+        {
+          x: additionalLeftSpace + x + 8,
+          y: 6,
+          dy: 2,
+          fill: "var(--gantt-calendar-today-color)",
+          fontSize: 12,
+          fontWeight: 600,
+          children: "Data Date"
+        }
+      )
+    ] });
+  }, [
+    additionalLeftSpace,
+    columnWidth,
+    ganttFullHeight,
+    rtl,
+    startDate,
+    viewMode,
+    showDataDateLine,
+    dataDate
+  ]);
+  return /* @__PURE__ */ jsxs("g", { className: "today", children: [
+    dataDateElement,
+    todayElement
+  ] });
 };
 const GanttToday = memo(GanttTodayInner);
 const calendarBottomText = "_calendarBottomText_15t8b_1";
@@ -18563,14 +18645,25 @@ const Gantt = (props) => {
     viewDate,
     viewMode = ViewMode.Day,
     locale: clientLocale,
-    language
+    language,
+    rowHeight,
+    showTodayLine = true,
+    showDataDateLine = false,
+    dataDate = null
   } = props;
   const ganttSVGRef = useRef(null);
   const wrapperRef = useRef(null);
   const taskListRef = useRef(null);
   const locale = useMemo(() => clientLocale ?? GANTT_EN_LOCALE, [clientLocale]);
   const theme = useMemo(() => buildGanttTheme(clientTheme), [clientTheme]);
-  const { distances, dateFormats: dateFormats2, rtl } = theme;
+  const { dateFormats: dateFormats2, rtl } = theme;
+  const distances = useMemo(
+    () => ({
+      ...theme.distances,
+      rowHeight: rowHeight ?? theme.distances.rowHeight
+    }),
+    [theme, rowHeight]
+  );
   const [waitCommitTasks, setWaitCommitTasks] = useState(false);
   const taskBar = useMemo(() => {
     return mergeDeepObj(
@@ -18988,20 +19081,20 @@ const Gantt = (props) => {
     horizontalContainerRef
   ]);
   const handleKeyDown = (event) => {
-    const { columnWidth, rowHeight } = distances;
+    const { columnWidth, rowHeight: rowHeight2 } = distances;
     let newScrollY = scrollY;
     let newScrollX = scrollX;
     let isX = true;
     switch (event.key) {
       case "Down":
       case "ArrowDown":
-        newScrollY += rowHeight;
+        newScrollY += rowHeight2;
         isX = false;
         event.preventDefault();
         break;
       case "Up":
       case "ArrowUp":
-        newScrollY -= rowHeight;
+        newScrollY -= rowHeight2;
         isX = false;
         event.preventDefault();
         break;
@@ -19693,7 +19786,10 @@ const Gantt = (props) => {
       isUnknownDates,
       rtl,
       startDate,
-      viewMode
+      viewMode,
+      showTodayLine,
+      showDataDateLine,
+      dataDate
     }),
     [
       additionalLeftSpace,
@@ -19702,7 +19798,10 @@ const Gantt = (props) => {
       isUnknownDates,
       rtl,
       startDate,
-      viewMode
+      viewMode,
+      showTodayLine,
+      showDataDateLine,
+      dataDate
     ]
   );
   const calendarProps = useMemo(

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

@@ -10931,31 +10931,34 @@
     isUnknownDates,
     rtl,
     startDate,
-    viewMode
+    viewMode,
+    showTodayLine = true,
+    showDataDateLine = false,
+    dataDate = null
   }) => {
-    const today = React.useMemo(() => {
-      if (isUnknownDates) {
+    const todayElement = React.useMemo(() => {
+      if (isUnknownDates || !showTodayLine) {
         return null;
       }
-      const today2 = /* @__PURE__ */ new Date();
-      const todayIndex = getDatesDiff(today2, startDate, viewMode);
+      const today = /* @__PURE__ */ new Date();
+      const todayIndex = getDatesDiff(today, startDate, viewMode);
       const extraMultiplier = () => {
         switch (viewMode) {
           case ViewMode.Week: {
-            const percent = today2.getDay() / 7;
+            const percent = today.getDay() / 7;
             return 1 + percent * 0.2;
           }
           case ViewMode.Month: {
-            const dayInMonth = today2.getDate();
+            const dayInMonth = today.getDate();
             const maxDaysInMonth = getDaysInMonth(
-              today2.getMonth(),
-              today2.getFullYear()
+              today.getMonth(),
+              today.getFullYear()
             );
             const percent = dayInMonth / maxDaysInMonth;
             return 1 + percent * 0.5;
           }
           case ViewMode.Year: {
-            const percent = today2.getMonth() / 12;
+            const percent = today.getMonth() / 12;
             return 1 + percent * 0.5;
           }
           default:
@@ -10993,9 +10996,88 @@
       isUnknownDates,
       rtl,
       startDate,
-      viewMode
+      viewMode,
+      showTodayLine
     ]);
-    return /* @__PURE__ */ jsxRuntime.jsx("g", { className: "today", children: today });
+    const dataDateElement = React.useMemo(() => {
+      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;
+      return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          "rect",
+          {
+            x: additionalLeftSpace + x,
+            y: 0,
+            width: 2,
+            height: ganttFullHeight,
+            fill: "var(--gantt-calendar-today-color)",
+            opacity: 0.9
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          "circle",
+          {
+            className: styles$c.ganttTodayCircle,
+            cx: x + 1,
+            cy: 6,
+            r: 6,
+            fill: "var(--gantt-calendar-today-color)"
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          "text",
+          {
+            x: additionalLeftSpace + x + 8,
+            y: 6,
+            dy: 2,
+            fill: "var(--gantt-calendar-today-color)",
+            fontSize: 12,
+            fontWeight: 600,
+            children: "Data Date"
+          }
+        )
+      ] });
+    }, [
+      additionalLeftSpace,
+      columnWidth,
+      ganttFullHeight,
+      rtl,
+      startDate,
+      viewMode,
+      showDataDateLine,
+      dataDate
+    ]);
+    return /* @__PURE__ */ jsxRuntime.jsxs("g", { className: "today", children: [
+      dataDateElement,
+      todayElement
+    ] });
   };
   const GanttToday = React.memo(GanttTodayInner);
   const calendarBottomText = "_calendarBottomText_15t8b_1";
@@ -18580,14 +18662,25 @@
       viewDate,
       viewMode = ViewMode.Day,
       locale: clientLocale,
-      language
+      language,
+      rowHeight,
+      showTodayLine = true,
+      showDataDateLine = false,
+      dataDate = null
     } = props;
     const ganttSVGRef = React.useRef(null);
     const wrapperRef = React.useRef(null);
     const taskListRef = React.useRef(null);
     const locale = React.useMemo(() => clientLocale ?? GANTT_EN_LOCALE, [clientLocale]);
     const theme = React.useMemo(() => buildGanttTheme(clientTheme), [clientTheme]);
-    const { distances, dateFormats: dateFormats2, rtl } = theme;
+    const { dateFormats: dateFormats2, rtl } = theme;
+    const distances = React.useMemo(
+      () => ({
+        ...theme.distances,
+        rowHeight: rowHeight ?? theme.distances.rowHeight
+      }),
+      [theme, rowHeight]
+    );
     const [waitCommitTasks, setWaitCommitTasks] = React.useState(false);
     const taskBar = React.useMemo(() => {
       return mergeDeepObj(
@@ -19005,20 +19098,20 @@
       horizontalContainerRef
     ]);
     const handleKeyDown = (event) => {
-      const { columnWidth, rowHeight } = distances;
+      const { columnWidth, rowHeight: rowHeight2 } = distances;
       let newScrollY = scrollY;
       let newScrollX = scrollX;
       let isX = true;
       switch (event.key) {
         case "Down":
         case "ArrowDown":
-          newScrollY += rowHeight;
+          newScrollY += rowHeight2;
           isX = false;
           event.preventDefault();
           break;
         case "Up":
         case "ArrowUp":
-          newScrollY -= rowHeight;
+          newScrollY -= rowHeight2;
           isX = false;
           event.preventDefault();
           break;
@@ -19710,7 +19803,10 @@
         isUnknownDates,
         rtl,
         startDate,
-        viewMode
+        viewMode,
+        showTodayLine,
+        showDataDateLine,
+        dataDate
       }),
       [
         additionalLeftSpace,
@@ -19719,7 +19815,10 @@
         isUnknownDates,
         rtl,
         startDate,
-        viewMode
+        viewMode,
+        showTodayLine,
+        showDataDateLine,
+        dataDate
       ]
     );
     const calendarProps = React.useMemo(

package/dist/types/public-types.d.ts

@@ -320,6 +320,22 @@ export interface GanttProps {
      * Move dates of tasks to working days during change
      */
     isAdjustToWorkingDates?: boolean;
+    /**
+     * Force row height (in pixels) for each single row. If not provided theme distances.rowHeight is used.
+     */
+    rowHeight?: number;
+    /**
+     * Show vertical line for current day on the chart
+     */
+    showTodayLine?: boolean;
+    /**
+     * Show vertical line for a custom 'data date' on the chart
+     */
+    showDataDateLine?: boolean;
+    /**
+     * Custom date to render as data date line when `showDataDateLine` is true
+     */
+    dataDate?: Date | null;
 }
 export interface GanttTaskBarActions {
     allowMoveTaskBar?: (action: TaskBarMoveAction, task: RenderTask) => boolean;

package/package.json

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