@thepocman/gantt-task-react 1.0.29 → 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];
@@ -3504,17 +3503,20 @@ const TaskListInner = ({
               className: styles$d.taskListContent,
               ref: taskListContentRef,
               onScroll: onScrollTableListContentVertically,
+              style: {
+                height: Math.min(
+                  ganttFullHeight,
+                  distances.minimumRowDisplayed * distances.rowHeight
+                ),
+                overflowY: "auto"
+              },
               children: /* @__PURE__ */ jsx(
                 "div",
                 {
                   style: {
-                    height: Math.max(
-                      ganttFullHeight,
-                      distances.minimumRowDisplayed * distances.rowHeight
-                    ),
+                    height: ganttFullHeight,
                     backgroundSize: `100% ${fullRowHeight * 2}px`,
-                    backgroundImage: `linear-gradient(to bottom, transparent ${fullRowHeight}px, #f5f5f5 ${fullRowHeight}px)`,
-                    overflow: "hidden"
+                    backgroundImage: `linear-gradient(to bottom, transparent ${fullRowHeight}px, #f5f5f5 ${fullRowHeight}px)`
                   },
                   children: /* @__PURE__ */ jsx(
                     TaskListTable,
@@ -4576,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}`
           )
         );
       }
@@ -4604,7 +4609,6 @@ const Calendar = ({
     for (let i2 = startColumnIndex; i2 <= endColumnIndex; i2++) {
       const date = getDate(i2);
       const quarter = "Q" + Math.ceil((date.getMonth() + 1) / 3);
-      console.log("quarter :>> ", quarter);
       bottomValues2.push(
         /* @__PURE__ */ jsx(
           "text",
@@ -4810,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(
@@ -4934,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:
@@ -5006,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",
@@ -5239,9 +5247,9 @@ const Grid = (props) => {
     /* @__PURE__ */ jsx(GridBody, { ...props })
   ] });
 };
-const ganttTaskRoot = "_ganttTaskRoot_1mu5y_1";
-const ganttTaskContent = "_ganttTaskContent_1mu5y_83";
-const wrapper$2 = "_wrapper_1mu5y_111";
+const ganttTaskRoot = "_ganttTaskRoot_1lwsd_1";
+const ganttTaskContent = "_ganttTaskContent_1lwsd_83";
+const wrapper$2 = "_wrapper_1lwsd_111";
 const styles$8 = {
   ganttTaskRoot,
   ganttTaskContent,
@@ -6371,6 +6379,7 @@ const TaskItemInner = (props) => {
     rtl,
     selectTaskOnMouseDown,
     setTooltipTask,
+    enableTaskGrouping,
     task,
     task: { styles: taskStyles },
     taskHalfHeight,
@@ -6598,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(
@@ -6800,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
                 }
               )
             },
@@ -6868,7 +6873,6 @@ const TaskGanttContent = ({
         const dependentsByTask = dependentsAtLevel == null ? void 0 : dependentsAtLevel.get(taskId);
         dependentsByTask == null ? void 0 : dependentsByTask.filter(({ dependent }) => visibleTasksMirror[dependent.id]).forEach((dep) => {
           var _a2, _b;
-          console.log("dependent", dep);
           const addedDepsForDep = addedDependenciesAtLevel[_a2 = dep.dependent.id] ?? (addedDependenciesAtLevel[_a2] = {});
           if (addedDepsForDep[taskId])
             return;
@@ -6980,12 +6984,12 @@ const TaskGanttInner = (props) => {
   const containerStyle = {
     // In order to see the vertical scrollbar of the gantt content,
     // we resize dynamically the width of the gantt content
-    height: Math.max(ganttFullHeight, minimumRowDisplayed * rowHeight),
+    height: Math.min(ganttFullHeight, minimumRowDisplayed * rowHeight),
     width: (ganttTaskRootRef == null ? void 0 : ganttTaskRootRef.current) ? ganttTaskRootRef.current.clientWidth + ganttTaskRootRef.current.scrollLeft : fullSvgWidth
   };
   const gridStyle = useMemo(
     () => ({
-      height: Math.max(ganttFullHeight, minimumRowDisplayed * rowHeight),
+      height: ganttFullHeight,
       width: fullSvgWidth,
       backgroundSize: `${columnWidth}px ${fullRowHeight * 2}px`,
       backgroundPositionX: additionalLeftSpace || void 0,
@@ -10476,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);
@@ -11870,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];
@@ -3517,17 +3516,20 @@
                 className: styles$d.taskListContent,
                 ref: taskListContentRef,
                 onScroll: onScrollTableListContentVertically,
+                style: {
+                  height: Math.min(
+                    ganttFullHeight,
+                    distances.minimumRowDisplayed * distances.rowHeight
+                  ),
+                  overflowY: "auto"
+                },
                 children: /* @__PURE__ */ jsxRuntime.jsx(
                   "div",
                   {
                     style: {
-                      height: Math.max(
-                        ganttFullHeight,
-                        distances.minimumRowDisplayed * distances.rowHeight
-                      ),
+                      height: ganttFullHeight,
                       backgroundSize: `100% ${fullRowHeight * 2}px`,
-                      backgroundImage: `linear-gradient(to bottom, transparent ${fullRowHeight}px, #f5f5f5 ${fullRowHeight}px)`,
-                      overflow: "hidden"
+                      backgroundImage: `linear-gradient(to bottom, transparent ${fullRowHeight}px, #f5f5f5 ${fullRowHeight}px)`
                     },
                     children: /* @__PURE__ */ jsxRuntime.jsx(
                       TaskListTable,
@@ -4589,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}`
             )
           );
         }
@@ -4617,7 +4622,6 @@
       for (let i = startColumnIndex; i <= endColumnIndex; i++) {
         const date = getDate(i);
         const quarter = "Q" + Math.ceil((date.getMonth() + 1) / 3);
-        console.log("quarter :>> ", quarter);
         bottomValues2.push(
           /* @__PURE__ */ jsxRuntime.jsx(
             "text",
@@ -4823,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(
@@ -4947,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:
@@ -5019,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",
@@ -5252,9 +5260,9 @@
       /* @__PURE__ */ jsxRuntime.jsx(GridBody, { ...props })
     ] });
   };
-  const ganttTaskRoot = "_ganttTaskRoot_1mu5y_1";
-  const ganttTaskContent = "_ganttTaskContent_1mu5y_83";
-  const wrapper$2 = "_wrapper_1mu5y_111";
+  const ganttTaskRoot = "_ganttTaskRoot_1lwsd_1";
+  const ganttTaskContent = "_ganttTaskContent_1lwsd_83";
+  const wrapper$2 = "_wrapper_1lwsd_111";
   const styles$8 = {
     ganttTaskRoot,
     ganttTaskContent,
@@ -6384,6 +6392,7 @@
       rtl,
       selectTaskOnMouseDown,
       setTooltipTask,
+      enableTaskGrouping,
       task,
       task: { styles: taskStyles },
       taskHalfHeight,
@@ -6611,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(
@@ -6813,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
                   }
                 )
               },
@@ -6881,7 +6886,6 @@
           const dependentsByTask = dependentsAtLevel == null ? void 0 : dependentsAtLevel.get(taskId);
           dependentsByTask == null ? void 0 : dependentsByTask.filter(({ dependent }) => visibleTasksMirror[dependent.id]).forEach((dep) => {
             var _a2, _b;
-            console.log("dependent", dep);
             const addedDepsForDep = addedDependenciesAtLevel[_a2 = dep.dependent.id] ?? (addedDependenciesAtLevel[_a2] = {});
             if (addedDepsForDep[taskId])
               return;
@@ -6993,12 +6997,12 @@
     const containerStyle = {
       // In order to see the vertical scrollbar of the gantt content,
       // we resize dynamically the width of the gantt content
-      height: Math.max(ganttFullHeight, minimumRowDisplayed * rowHeight),
+      height: Math.min(ganttFullHeight, minimumRowDisplayed * rowHeight),
       width: (ganttTaskRootRef == null ? void 0 : ganttTaskRootRef.current) ? ganttTaskRootRef.current.clientWidth + ganttTaskRootRef.current.scrollLeft : fullSvgWidth
     };
     const gridStyle = React.useMemo(
       () => ({
-        height: Math.max(ganttFullHeight, minimumRowDisplayed * rowHeight),
+        height: ganttFullHeight,
         width: fullSvgWidth,
         backgroundSize: `${columnWidth}px ${fullRowHeight * 2}px`,
         backgroundPositionX: additionalLeftSpace || void 0,
@@ -10489,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);
@@ -11883,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/dist/style.css

@@ -332,7 +332,7 @@
   stroke: #e0e0e0;
   stroke-width: 1.4;
 }
-._ganttTaskRoot_1mu5y_1 {
+._ganttTaskRoot_1lwsd_1 {
   display: flex;
   flex-direction: column;
   overflow-x: scroll;
@@ -344,7 +344,7 @@
 
 /* Only chrome otherwise the firefox scrollbar has no edge*/
 @media screen and (-webkit-min-device-pixel-ratio:0) and (min-resolution:.001dpcm) {
-  ._ganttTaskRoot_1mu5y_1 {
+  ._ganttTaskRoot_1lwsd_1 {
     scrollbar-width: thin;
   }
 }
@@ -373,7 +373,7 @@
   background-clip: padding-box;
 } */
 
-._ganttTaskContent_1mu5y_83 {
+._ganttTaskContent_1lwsd_83 {
   margin: 0;
   padding: 0;
   overflow-x: hidden;
@@ -382,12 +382,12 @@
 
 /* Only chrome otherwise the firefox scrollbar has no edges*/
 @media screen and (-webkit-min-device-pixel-ratio:0) and (min-resolution:.001dpcm) {
-  ._ganttTaskContent_1mu5y_83 {
+  ._ganttTaskContent_1lwsd_83 {
     scrollbar-width: thin;
   }
 }
 
-._wrapper_1mu5y_111 {
+._wrapper_1lwsd_111 {
   display: grid;
   overflow-x: hidden;
   overflow-y: auto;
@@ -396,7 +396,6 @@
   list-style: none;
   outline: none;
   position: relative;
-  height: 600px;
 }._hoverVisibleWrapper_11ld1_1:hover ._wrapper_11ld1_1 {
   display: initial;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thepocman/gantt-task-react",
-  "version": "1.0.29",
+  "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[];