@thepocman/gantt-task-react 1.0.28 → 1.0.30

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

@@ -3504,17 +3504,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,
@@ -4604,7 +4607,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",
@@ -5006,8 +5008,6 @@ const GridBodyInner = ({
         startColumnIndex
       )) {
         const x3 = additionalLeftSpace + columnWidth * i2;
-        console.log("debugging x:", x3);
-        console.log("divider color", dividerColor);
         dividers.push(
           /* @__PURE__ */ jsx(
             "line",
@@ -5037,7 +5037,6 @@ const GridBodyInner = ({
     getDate,
     dividerColor
   ]);
-  console.log("verticalDividers :>> ", verticalDividers);
   return /* @__PURE__ */ jsxs("g", { className: "gridBody", children: [
     /* @__PURE__ */ jsx("g", { className: "today", children: today }),
     /* @__PURE__ */ jsx("g", { className: "verticalDividers", children: verticalDividers })
@@ -5242,9 +5241,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,
@@ -6871,7 +6870,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;
@@ -6983,12 +6981,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,
@@ -10553,6 +10551,28 @@ const defaultRoundStartDate = (date, viewMode) => {
       }
       return addMonths(start, 1);
     }
+    case ViewMode.QuarterYear: {
+      const start = startOfYear(date);
+      const diff = differenceInMonths(date, start);
+      if (diff < 3)
+        return start;
+      if (diff < 6)
+        return addMonths(start, 3);
+      if (diff < 9)
+        return addMonths(start, 6);
+      if (diff < 12)
+        return addMonths(start, 9);
+      return addYears(start, 1);
+    }
+    case ViewMode.HalfYear: {
+      const start = startOfYear(date);
+      const diff = differenceInMonths(date, start);
+      if (diff < 6)
+        return start;
+      if (diff < 12)
+        return addMonths(start, 6);
+      return addYears(start, 1);
+    }
     case ViewMode.Year: {
       const start = startOfYear(date);
       const diff = differenceInMonths(date, start);
@@ -11720,6 +11740,7 @@ const defaultDateFormats = {
 };
 const defaultDistances = {
   actionColumnWidth: 40,
+  ganttHeight: 0,
   arrowIndent: 20,
   taskHeight: 24,
   barCornerRadius: 3,

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

@@ -3517,17 +3517,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,
@@ -4617,7 +4620,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",
@@ -5019,8 +5021,6 @@
           startColumnIndex
         )) {
           const x2 = additionalLeftSpace + columnWidth * i;
-          console.log("debugging x:", x2);
-          console.log("divider color", dividerColor);
           dividers.push(
             /* @__PURE__ */ jsxRuntime.jsx(
               "line",
@@ -5050,7 +5050,6 @@
       getDate,
       dividerColor
     ]);
-    console.log("verticalDividers :>> ", verticalDividers);
     return /* @__PURE__ */ jsxRuntime.jsxs("g", { className: "gridBody", children: [
       /* @__PURE__ */ jsxRuntime.jsx("g", { className: "today", children: today }),
       /* @__PURE__ */ jsxRuntime.jsx("g", { className: "verticalDividers", children: verticalDividers })
@@ -5255,9 +5254,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,
@@ -6884,7 +6883,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;
@@ -6996,12 +6994,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,
@@ -10566,6 +10564,28 @@
         }
         return addMonths(start, 1);
       }
+      case ViewMode.QuarterYear: {
+        const start = startOfYear(date);
+        const diff = differenceInMonths(date, start);
+        if (diff < 3)
+          return start;
+        if (diff < 6)
+          return addMonths(start, 3);
+        if (diff < 9)
+          return addMonths(start, 6);
+        if (diff < 12)
+          return addMonths(start, 9);
+        return addYears(start, 1);
+      }
+      case ViewMode.HalfYear: {
+        const start = startOfYear(date);
+        const diff = differenceInMonths(date, start);
+        if (diff < 6)
+          return start;
+        if (diff < 12)
+          return addMonths(start, 6);
+        return addYears(start, 1);
+      }
       case ViewMode.Year: {
         const start = startOfYear(date);
         const diff = differenceInMonths(date, start);
@@ -11733,6 +11753,7 @@
   };
   const defaultDistances = {
     actionColumnWidth: 40,
+    ganttHeight: 0,
     arrowIndent: 20,
     taskHeight: 24,
     barCornerRadius: 3,

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/dist/types/public-types.d.ts

@@ -114,6 +114,7 @@ export interface Distances {
      * From 0 to 100
      */
     barFill: number;
+    ganttHeight: number;
     columnWidth: number;
     contextMenuIconWidth: number;
     contextMenuOptionHeight: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thepocman/gantt-task-react",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "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",