@thepocman/gantt-task-react 1.0.30 → 1.0.31

package/dist/components/task-item/task-item.d.ts

@@ -38,6 +38,5 @@ export type TaskItemProps = {
     handleDeleteTasks: (task: TaskOrEmpty[]) => void;
     colorStyles: ColorStyles;
     enableTaskGrouping?: boolean;
-    getTaskInitials?: (task: Task) => string;
 };
 export declare const TaskItem: React.NamedExoticComponent<TaskItemProps>;

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

@@ -465,14 +465,13 @@ const collectChildren = (arrayRes, mirrorRes, task, childTasksOnLevel, enableTas
   if (comparisonLevel === 1) {
     mirrorRes[task.id] = true;
   }
-  const isTaskGroupingEnabled = enableTaskGrouping ? task.hideChildren && task.type !== "user" : task.hideChildren;
-  if (task.type === "empty" || isTaskGroupingEnabled) {
+  if (task.type === "empty") {
     return;
   }
   const childs = childTasksOnLevel.get(task.id);
   if (childs && childs.length > 0) {
     childs.forEach((childTask) => {
-      collectChildren(arrayRes, mirrorRes, childTask, childTasksOnLevel, enableTaskGrouping);
+      collectChildren(arrayRes, mirrorRes, childTask, childTasksOnLevel);
     });
   }
 };
@@ -482,7 +481,7 @@ const collectVisibleTasks = (childTasksMap, rootTasksMap, enableTaskGrouping) =>
   for (const [comparisonLevel, rootTasks] of rootTasksMap.entries()) {
     const childTasksOnLevel = childTasksMap.get(comparisonLevel) || /* @__PURE__ */ new Map();
     rootTasks.forEach((task) => {
-      collectChildren(arrayRes, mirrorRes, task, childTasksOnLevel, enableTaskGrouping);
+      collectChildren(arrayRes, mirrorRes, task, childTasksOnLevel);
     });
   }
   return [arrayRes, mirrorRes];
@@ -4579,21 +4578,24 @@ const Calendar = ({
         )
       );
       if (!isUnknownDates && (i2 === startColumnIndex || date.getFullYear() !== getDate(i2 - 1).getFullYear())) {
-        const year = date.getFullYear().toString();
-        const startHalf = Math.floor(i2 / 6) * 6;
+        const year = date.getFullYear();
+        console.log("Fulll year :>> ", year);
+        const topValue = year.toString();
+        const startHalfYearIndex = i2 - date.getMonth();
+        const centerX = additionalLeftSpace + columnWidth * i2 + columnWidth;
         topValues2.push(
           /* @__PURE__ */ jsx(
             TopPartOfCalendar,
             {
-              value: year,
-              x1Line: additionalLeftSpace + columnWidth * startHalf,
+              value: topValue,
+              x1Line: additionalLeftSpace + columnWidth * startHalfYearIndex,
               y1Line: 0,
               y2Line: topDefaultHeight,
-              xText: additionalLeftSpace + columnWidth * (startHalf + 3),
+              xText: centerX,
               yText: topDefaultHeight * 0.9,
               colors
             },
-            year
+            `year-${year}`
           )
         );
       }
@@ -4812,6 +4814,7 @@ const Calendar = ({
       );
       const dayOfMonth = date.getDate();
       const prevDate = getDate(i2 - 1);
+      console.log("testing center :>> ", additionalLeftSpace + columnWidth * i2 + ticks * columnWidth * 0.5);
       if (!isUnknownDates && dayOfMonth !== prevDate.getDate()) {
         const topValue = renderTopHeaderByDate(date);
         topValues2.push(
@@ -4936,7 +4939,9 @@ const shouldDrawVerticalDivider = (currentDate, previousDate, viewMode, isUnknow
     case ViewMode.Year:
       return currentDate.getFullYear() !== previousDate.getFullYear();
     case ViewMode.HalfYear:
-      return currentDate.getFullYear() !== previousDate.getFullYear();
+      const currentHalf = Math.ceil((currentDate.getMonth() + 1) / 6);
+      const previousHalf = Math.ceil((previousDate.getMonth() + 1) / 6);
+      return currentHalf !== previousHalf || currentDate.getFullYear() !== previousDate.getFullYear();
     case ViewMode.QuarterYear:
       return Math.ceil((currentDate.getMonth() + 1) / 3) !== Math.ceil((previousDate.getMonth() + 1) / 3) || currentDate.getFullYear() !== previousDate.getFullYear();
     case ViewMode.Month:
@@ -5008,6 +5013,7 @@ const GridBodyInner = ({
         startColumnIndex
       )) {
         const x3 = additionalLeftSpace + columnWidth * i2;
+        console.log("drawing divider at x:", x3, "for index:", i2, "date:", currentDate);
         dividers.push(
           /* @__PURE__ */ jsx(
             "line",
@@ -6373,6 +6379,7 @@ const TaskItemInner = (props) => {
     rtl,
     selectTaskOnMouseDown,
     setTooltipTask,
+    enableTaskGrouping,
     task,
     task: { styles: taskStyles },
     taskHalfHeight,
@@ -6600,7 +6607,7 @@ const TaskItemInner = (props) => {
             y: taskYOffset + taskHeight * 0.5,
             className: isTextInside ? style.barLabel : style.barLabel && style.barLabelOutside,
             ref: textRef,
-            children: isTextInside ? task.name : ""
+            children: enableTaskGrouping ? isTextInside ? task.name : "" : task.name
           }
         ),
         (outOfParentWarnings || hasDependencyWarning) && /* @__PURE__ */ jsx(
@@ -6802,11 +6809,7 @@ const TaskGanttContent = ({
                   fixEndPosition,
                   handleDeleteTasks,
                   colorStyles,
-                  enableTaskGrouping,
-                  getTaskInitials: (task2) => {
-                    var _a2;
-                    return ((_a2 = task2.name) == null ? void 0 : _a2.split(" ").map((word) => word[0]).join("").toUpperCase()) ?? "";
-                  }
+                  enableTaskGrouping
                 }
               )
             },
@@ -10477,6 +10480,14 @@ const defaultRoundEndDate = (date, viewMode) => {
       }
       return subQuarters(end, 1);
     }
+    case ViewMode.HalfYear: {
+      const month = date.getMonth();
+      if (month < 6) {
+        return endOfHour(new Date(date.getFullYear(), 5, 1));
+      } else {
+        return endOfYear(date);
+      }
+    }
     case ViewMode.Year: {
       const end = endOfYear(date);
       const diff = differenceInMonths(end, date);
@@ -11871,7 +11882,7 @@ const Gantt = ({
     [sortedTasks]
   );
   const [visibleTasks, visibleTasksMirror] = useMemo(
-    () => collectVisibleTasks(childTasksMap, rootTasksMap, enableTaskGrouping),
+    () => collectVisibleTasks(childTasksMap, rootTasksMap),
     [childTasksMap, rootTasksMap]
   );
   const tasksMap = useMemo(() => getTasksMap(tasks), [tasks]);

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

@@ -478,14 +478,13 @@
     if (comparisonLevel === 1) {
       mirrorRes[task.id] = true;
     }
-    const isTaskGroupingEnabled = enableTaskGrouping ? task.hideChildren && task.type !== "user" : task.hideChildren;
-    if (task.type === "empty" || isTaskGroupingEnabled) {
+    if (task.type === "empty") {
       return;
     }
     const childs = childTasksOnLevel.get(task.id);
     if (childs && childs.length > 0) {
       childs.forEach((childTask) => {
-        collectChildren(arrayRes, mirrorRes, childTask, childTasksOnLevel, enableTaskGrouping);
+        collectChildren(arrayRes, mirrorRes, childTask, childTasksOnLevel);
       });
     }
   };
@@ -495,7 +494,7 @@
     for (const [comparisonLevel, rootTasks] of rootTasksMap.entries()) {
       const childTasksOnLevel = childTasksMap.get(comparisonLevel) || /* @__PURE__ */ new Map();
       rootTasks.forEach((task) => {
-        collectChildren(arrayRes, mirrorRes, task, childTasksOnLevel, enableTaskGrouping);
+        collectChildren(arrayRes, mirrorRes, task, childTasksOnLevel);
       });
     }
     return [arrayRes, mirrorRes];
@@ -4592,21 +4591,24 @@
           )
         );
         if (!isUnknownDates && (i === startColumnIndex || date.getFullYear() !== getDate(i - 1).getFullYear())) {
-          const year = date.getFullYear().toString();
-          const startHalf = Math.floor(i / 6) * 6;
+          const year = date.getFullYear();
+          console.log("Fulll year :>> ", year);
+          const topValue = year.toString();
+          const startHalfYearIndex = i - date.getMonth();
+          const centerX = additionalLeftSpace + columnWidth * i + columnWidth;
           topValues2.push(
             /* @__PURE__ */ jsxRuntime.jsx(
               TopPartOfCalendar,
               {
-                value: year,
-                x1Line: additionalLeftSpace + columnWidth * startHalf,
+                value: topValue,
+                x1Line: additionalLeftSpace + columnWidth * startHalfYearIndex,
                 y1Line: 0,
                 y2Line: topDefaultHeight,
-                xText: additionalLeftSpace + columnWidth * (startHalf + 3),
+                xText: centerX,
                 yText: topDefaultHeight * 0.9,
                 colors
               },
-              year
+              `year-${year}`
             )
           );
         }
@@ -4825,6 +4827,7 @@
         );
         const dayOfMonth = date.getDate();
         const prevDate = getDate(i - 1);
+        console.log("testing center :>> ", additionalLeftSpace + columnWidth * i + ticks * columnWidth * 0.5);
         if (!isUnknownDates && dayOfMonth !== prevDate.getDate()) {
           const topValue = renderTopHeaderByDate(date);
           topValues2.push(
@@ -4949,7 +4952,9 @@
       case ViewMode.Year:
         return currentDate.getFullYear() !== previousDate.getFullYear();
       case ViewMode.HalfYear:
-        return currentDate.getFullYear() !== previousDate.getFullYear();
+        const currentHalf = Math.ceil((currentDate.getMonth() + 1) / 6);
+        const previousHalf = Math.ceil((previousDate.getMonth() + 1) / 6);
+        return currentHalf !== previousHalf || currentDate.getFullYear() !== previousDate.getFullYear();
       case ViewMode.QuarterYear:
         return Math.ceil((currentDate.getMonth() + 1) / 3) !== Math.ceil((previousDate.getMonth() + 1) / 3) || currentDate.getFullYear() !== previousDate.getFullYear();
       case ViewMode.Month:
@@ -5021,6 +5026,7 @@
           startColumnIndex
         )) {
           const x2 = additionalLeftSpace + columnWidth * i;
+          console.log("drawing divider at x:", x2, "for index:", i, "date:", currentDate);
           dividers.push(
             /* @__PURE__ */ jsxRuntime.jsx(
               "line",
@@ -6386,6 +6392,7 @@
       rtl,
       selectTaskOnMouseDown,
       setTooltipTask,
+      enableTaskGrouping,
       task,
       task: { styles: taskStyles },
       taskHalfHeight,
@@ -6613,7 +6620,7 @@
               y: taskYOffset + taskHeight * 0.5,
               className: isTextInside ? style.barLabel : style.barLabel && style.barLabelOutside,
               ref: textRef,
-              children: isTextInside ? task.name : ""
+              children: enableTaskGrouping ? isTextInside ? task.name : "" : task.name
             }
           ),
           (outOfParentWarnings || hasDependencyWarning) && /* @__PURE__ */ jsxRuntime.jsx(
@@ -6815,11 +6822,7 @@
                     fixEndPosition,
                     handleDeleteTasks,
                     colorStyles,
-                    enableTaskGrouping,
-                    getTaskInitials: (task2) => {
-                      var _a2;
-                      return ((_a2 = task2.name) == null ? void 0 : _a2.split(" ").map((word) => word[0]).join("").toUpperCase()) ?? "";
-                    }
+                    enableTaskGrouping
                   }
                 )
               },
@@ -10490,6 +10493,14 @@
         }
         return subQuarters(end, 1);
       }
+      case ViewMode.HalfYear: {
+        const month = date.getMonth();
+        if (month < 6) {
+          return endOfHour(new Date(date.getFullYear(), 5, 1));
+        } else {
+          return endOfYear(date);
+        }
+      }
       case ViewMode.Year: {
         const end = endOfYear(date);
         const diff = differenceInMonths(end, date);
@@ -11884,7 +11895,7 @@
       [sortedTasks]
     );
     const [visibleTasks, visibleTasksMirror] = React.useMemo(
-      () => collectVisibleTasks(childTasksMap, rootTasksMap, enableTaskGrouping),
+      () => collectVisibleTasks(childTasksMap, rootTasksMap),
       [childTasksMap, rootTasksMap]
     );
     const tasksMap = React.useMemo(() => getTasksMap(tasks), [tasks]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thepocman/gantt-task-react",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "Fork of gantt-task-react with support for grouped tasks on a single row when collapsed",
   "author": "Adrian Bueno <adrianlbueno@users.noreply.github.com>",
   "homepage": "https://github.com/adrianlbueno/gantt-task-react#readme",

package/dist/helpers/get-initial-closed-tasks.d.ts

@@ -1,2 +0,0 @@
-import { TaskOrEmpty } from "../types/public-types";
-export declare const getInitialClosedTasks: (tasks: readonly TaskOrEmpty[]) => Readonly<Record<string, true>>;

package/dist/helpers/get-unique-tasks-from-row-index-to-tasks-map.d.ts

@@ -1,2 +0,0 @@
-import { RowIndexToTasksMap, TaskOrEmpty } from "../types/public-types";
-export declare const getUniqueTasksFromRowIndexToTasksMap: (rowIndexToTasksMap: RowIndexToTasksMap) => TaskOrEmpty[];

package/dist/helpers/sort-visible-tasks.d.ts

@@ -1,2 +0,0 @@
-import { TaskOrEmpty } from "../types/public-types";
-export declare const sortVisibleUserTasks: (tasks: TaskOrEmpty[]) => TaskOrEmpty[];