gantt-task-react-v 1.0.37 → 1.0.39

package/dist/components/other/vertical-scroll.d.ts

@@ -8,5 +8,4 @@ export declare const VerticalScroll: React.FC<{
     onScroll: (event: SyntheticEvent<HTMLDivElement>) => void;
     rtl: boolean;
     verticalScrollbarRef: RefObject<HTMLDivElement>;
-    containerHeight?: number | null;
 }>;

package/dist/components/task-list/index.d.ts

@@ -14,6 +14,7 @@ export type TaskListProps = {
     distances: Distances;
     fullRowHeight: number;
     ganttFullHeight: number;
+    ganttHeight: number;
     getTaskCurrentState: (task: Task) => Task;
     handleAddTask: (task: Task | null) => void;
     handleDeleteTasks: (task: RenderTask[]) => void;

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

@@ -4661,15 +4661,13 @@ const VerticalScroll = ({
   isChangeInProgress,
   onScroll,
   rtl,
-  verticalScrollbarRef,
-  containerHeight
+  verticalScrollbarRef
 }) => {
-  const scrollHeight = containerHeight !== null && containerHeight !== void 0 ? Math.max(containerHeight - headerHeight, 100) : ganttHeight;
   return /* @__PURE__ */ jsx(
     "div",
     {
       style: {
-        height: scrollHeight,
+        height: ganttHeight,
         marginTop: headerHeight,
         marginLeft: rtl ? void 0 : "-1rem",
         pointerEvents: isChangeInProgress ? "none" : void 0
@@ -5164,7 +5162,6 @@ const DEFAULT_THEME = {
     expandIconWidth: 20,
     handleWidth: 8,
     headerHeight: 50,
-    ganttHeight: 600,
     minimumRowDisplayed: 4,
     nestedTaskNameOffset: 20,
     relationCircleOffset: 10,
@@ -5299,7 +5296,8 @@ const useTableListResize = (clientColumns, canMoveTasks, onResizeColumn, ganttRe
     titleCellWidth,
     dateCellWidth,
     dependenciesCellWidth,
-    actionColumnWidth
+    actionColumnWidth,
+    tableWidth: defaultTableWidth = 400
   } = theme.distances;
   const defaultColumns = useMemo(() => {
     return [
@@ -5335,6 +5333,10 @@ const useTableListResize = (clientColumns, canMoveTasks, onResizeColumn, ganttRe
   const [columnsState, setColumns] = useState(
     clientColumns || defaultColumns
   );
+  const taskListWidth = useMemo(
+    () => columnsState.reduce((res, { width }) => res + width, 0) + extraWidth,
+    [columnsState, extraWidth]
+  );
   useEffect(() => {
     if (clientColumns) {
       setColumns([...clientColumns]);
@@ -5342,19 +5344,23 @@ const useTableListResize = (clientColumns, canMoveTasks, onResizeColumn, ganttRe
       const newColumnIds = clientColumns.map((col) => col.id);
       const widthOfAddedColumns = clientColumns.filter((col) => !currentColumnIds.includes(col.id)).reduce((res, { width }) => res + width, 0);
       const widthOfRemovedColumns = clientColumns.filter((col) => !newColumnIds.includes(col.id)).reduce((res, { width }) => res + width, 0);
-      setTableWidth(
-        (prev) => Math.min(
-          prev + widthOfAddedColumns - widthOfRemovedColumns,
-          clientColumns.reduce((res, { width }) => res + width, 0) + extraWidth
-        )
-      );
+      setTableWidth((prev) => {
+        const newWidth = prev + widthOfAddedColumns - widthOfRemovedColumns;
+        return Math.max(newWidth, 100);
+      });
     }
-  }, [clientColumns, extraWidth]);
+  }, [clientColumns, extraWidth, taskListWidth]);
   const [tableResizeEvent, setTableResizeEvent] = useState(null);
   const [columnResizeEvent, setColumnResizeEvent] = useState(null);
-  const [tableWidthState, setTableWidth] = useState(
-    () => columnsState.reduce((res, { width }) => res + width, 0) + extraWidth
-  );
+  const [tableWidthState, setTableWidth] = useState(() => {
+    const calculatedWidth = columnsState.reduce((res, { width }) => res + width, 0) + extraWidth;
+    const MAX_INITIAL_WIDTH = 600;
+    if (calculatedWidth <= MAX_INITIAL_WIDTH) {
+      return calculatedWidth;
+    } else {
+      return defaultTableWidth;
+    }
+  });
   const onTableResizeStart = (clientX) => {
     const newTableResizeEvent = {
       initialClientX: clientX,
@@ -5373,7 +5379,6 @@ const useTableListResize = (clientColumns, canMoveTasks, onResizeColumn, ganttRe
   };
   const isResizeTableInProgress = Boolean(tableResizeEvent);
   const isResizeColumnInProgress = Boolean(columnResizeEvent);
-  const taskListWidth = columnsState.reduce((res, { width }) => res + width, 0) + extraWidth;
   useEffect(() => {
     if (!isResizeTableInProgress) {
       return void 0;
@@ -5381,9 +5386,15 @@ const useTableListResize = (clientColumns, canMoveTasks, onResizeColumn, ganttRe
     const handleMove = (clientX) => {
       const moveDelta = clientX - tableResizeEvent.initialClientX;
       setTableWidth(() => {
+        const newWidth = tableResizeEvent.initialTableWidth + moveDelta;
+        const ganttContainer = ganttRef.current;
+        const containerWidth = ganttContainer ? ganttContainer.offsetWidth : 1e3;
+        const maxTableWidth = Math.max(containerWidth - 100, taskListWidth);
         return Math.min(
-          Math.max(tableResizeEvent.initialTableWidth + moveDelta, 50),
-          taskListWidth
+          Math.max(newWidth, 50),
+          // Minimum width of 50px
+          maxTableWidth
+          // Allow table to expand much more
         );
       });
     };
@@ -5443,12 +5454,18 @@ const useTableListResize = (clientColumns, canMoveTasks, onResizeColumn, ganttRe
         return newColumns;
       });
       if (previousColumnWidth !== newColumnWidth) {
-        setTableWidth(
-          () => Math.min(
-            Math.max(columnResizeEvent.initialTableWidth + moveDelta, 50),
-            taskListWidth
-          )
-        );
+        setTableWidth(() => {
+          const newTableWidth = columnResizeEvent.initialTableWidth + moveDelta;
+          const ganttContainer = ganttRef.current;
+          const containerWidth = ganttContainer ? ganttContainer.offsetWidth : 1e3;
+          const maxTableWidth = Math.max(containerWidth - 100, taskListWidth);
+          return Math.min(
+            Math.max(newTableWidth, 50),
+            // Minimum width
+            maxTableWidth
+            // Allow expansion beyond column width
+          );
+        });
       }
     };
     const handleMouseMove = (event) => {
@@ -10640,14 +10657,14 @@ const TaskListTableDefaultInner = ({
   );
 };
 const TaskListTable = memo(TaskListTableDefaultInner);
-const taskListRoot = "_taskListRoot_apbmu_1";
-const taskListHorizontalScroll = "_taskListHorizontalScroll_apbmu_19";
-const taskListResizer = "_taskListResizer_apbmu_83";
-const horizontalContainer$1 = "_horizontalContainer_apbmu_147";
-const tableWrapper = "_tableWrapper_apbmu_163";
-const scrollToTop = "_scrollToTop_apbmu_177";
-const scrollToBottom = "_scrollToBottom_apbmu_193";
-const hidden = "_hidden_apbmu_209";
+const taskListRoot = "_taskListRoot_13wkq_1";
+const taskListHorizontalScroll = "_taskListHorizontalScroll_13wkq_23";
+const taskListResizer = "_taskListResizer_13wkq_87";
+const horizontalContainer$1 = "_horizontalContainer_13wkq_151";
+const tableWrapper = "_tableWrapper_13wkq_165";
+const scrollToTop = "_scrollToTop_13wkq_179";
+const scrollToBottom = "_scrollToBottom_13wkq_195";
+const hidden = "_hidden_13wkq_211";
 const styles$d = {
   taskListRoot,
   taskListHorizontalScroll,
@@ -10681,6 +10698,7 @@ const TaskListInner = ({
   distances,
   fullRowHeight,
   ganttFullHeight,
+  ganttHeight,
   getTaskCurrentState,
   handleAddTask,
   handleDeleteTasks,
@@ -10811,16 +10829,17 @@ const TaskListInner = ({
                 ref: taskListContainerRef,
                 className: styles$d.horizontalContainer,
                 style: {
-                  height: "100%",
-                  minHeight: distances.minimumRowDisplayed * distances.rowHeight,
+                  height: Math.max(
+                    ganttHeight - ((tableBottom == null ? void 0 : tableBottom.height) || 0),
+                    distances.minimumRowDisplayed * distances.rowHeight
+                  ),
                   width: taskListWidth
                 },
                 children: /* @__PURE__ */ jsx(
                   "div",
                   {
                     style: {
-                      height: "100%",
-                      minHeight: Math.max(
+                      height: Math.max(
                         ganttFullHeight,
                         distances.minimumRowDisplayed * distances.rowHeight
                       ),
@@ -13136,10 +13155,10 @@ const TaskGanttContentInner = (props) => {
   ] });
 };
 const TaskGanttContent = memo(TaskGanttContentInner);
-const ganttVerticalContainer = "_ganttVerticalContainer_i4cef_1";
-const horizontalContainer = "_horizontalContainer_i4cef_79";
-const wrapper = "_wrapper_i4cef_95";
-const calendarDragging = "_calendarDragging_i4cef_125";
+const ganttVerticalContainer = "_ganttVerticalContainer_5z1c2_1";
+const horizontalContainer = "_horizontalContainer_5z1c2_75";
+const wrapper = "_wrapper_5z1c2_87";
+const calendarDragging = "_calendarDragging_5z1c2_117";
 const styles$2 = {
   ganttVerticalContainer,
   horizontalContainer,
@@ -13154,6 +13173,7 @@ const TaskGanttInner = (props) => {
     fullRowHeight,
     fullSvgWidth,
     ganttFullHeight,
+    ganttHeight,
     ganttSVGRef,
     ganttTodayProps,
     ganttTodayProps: {
@@ -13170,16 +13190,14 @@ const TaskGanttInner = (props) => {
   const moveStateScrollRef = useRef(null);
   const containerStyle = useMemo(
     () => ({
-      height: "100%",
-      width: fullSvgWidth,
-      minHeight: minimumRowDisplayed * rowHeight
+      height: Math.max(ganttHeight, minimumRowDisplayed * rowHeight),
+      width: fullSvgWidth
     }),
-    [minimumRowDisplayed, rowHeight, fullSvgWidth]
+    [ganttHeight, minimumRowDisplayed, rowHeight, fullSvgWidth]
   );
   const gridStyle = useMemo(
     () => ({
-      height: "100%",
-      minHeight: Math.max(ganttFullHeight, minimumRowDisplayed * rowHeight),
+      height: Math.max(ganttFullHeight, minimumRowDisplayed * rowHeight),
       width: fullSvgWidth,
       backgroundSize: `${columnWidth}px ${fullRowHeight * 2}px`,
       backgroundPositionX: additionalLeftSpace || void 0,
@@ -13210,7 +13228,7 @@ const TaskGanttInner = (props) => {
         clientX: event.clientX,
         clientY: event.clientY,
         scrollLeft: verticalGanttContainerRef.current.scrollLeft,
-        scrollTop: verticalGanttContainerRef.current.scrollTop
+        scrollTop: horizontalContainerRef.current.scrollTop
       };
       moveStateHorRef.current = {
         clientX: event.clientX,
@@ -13231,10 +13249,9 @@ const TaskGanttInner = (props) => {
         return;
       }
       event.preventDefault();
-      const { clientX, scrollLeft, scrollTop, clientY } = moveStateVertRef.current;
+      const { clientX, scrollLeft } = moveStateVertRef.current;
       const scrollVertContainer = verticalGanttContainerRef.current;
       scrollVertContainer.scrollLeft = scrollLeft + clientX - event.clientX;
-      scrollVertContainer.scrollTop = scrollTop + clientY - event.clientY;
       const {
         clientX: clientXH,
         scrollLeft: scrollLeftH,
@@ -13258,6 +13275,7 @@ const TaskGanttInner = (props) => {
       event.preventDefault();
       moveStateVertRef.current = null;
       moveStateHorRef.current = null;
+      moveStateScrollRef.current = null;
       contentContainer.classList.remove(styles$2.calendarDragging);
     };
     contentContainer.addEventListener("mousemove", onScrollMove);
@@ -18598,9 +18616,28 @@ const Gantt = (props) => {
   const [sortedTasks, setSortedTasks] = useState(
     () => [...clientTasks].sort(sortTasks)
   );
+  const [containerHeight, setContainerHeight] = useState(
+    void 0
+  );
   useEffect(() => {
     setSortedTasks([...clientTasks].sort(sortTasks));
   }, [clientTasks]);
+  useEffect(() => {
+    if (!wrapperRef.current) {
+      return () => {
+      };
+    }
+    const resizeObserver = new ResizeObserver((entries) => {
+      for (const entry of entries) {
+        const { height } = entry.contentRect;
+        setContainerHeight(height);
+      }
+    });
+    resizeObserver.observe(wrapperRef.current);
+    return () => {
+      resizeObserver.disconnect();
+    };
+  }, []);
   const [childTasksMap, rootTasksMap] = useMemo(
     () => getChildsAndRoots(sortedTasks, null),
     [sortedTasks]
@@ -18678,34 +18715,21 @@ const Gantt = (props) => {
     },
     [maxLevelLength, fullRowHeight, (_a = taskList == null ? void 0 : taskList.tableBottom) == null ? void 0 : _a.height]
   );
-  const [containerHeight, setContainerHeight] = useState(null);
-  useEffect(() => {
-    const wrapperElement = wrapperRef.current;
-    if (!wrapperElement) {
-      return void 0;
-    }
-    const resizeObserver = new ResizeObserver((entries) => {
-      for (const entry of entries) {
-        const { height } = entry.contentRect;
-        if (height > 0) {
-          setContainerHeight(height);
-        }
-      }
-    });
-    resizeObserver.observe(wrapperElement);
-    return () => {
-      resizeObserver.disconnect();
-    };
-  }, []);
   const ganttHeight = useMemo(() => {
-    if (containerHeight !== null) {
-      return Math.min(
-        containerHeight - distances.headerHeight,
-        ganttFullHeight
-      );
+    if (distances.ganttHeight) {
+      return Math.min(distances.ganttHeight, ganttFullHeight);
+    }
+    if (containerHeight) {
+      const availableHeight = containerHeight - distances.headerHeight;
+      return Math.min(availableHeight, ganttFullHeight);
     }
-    return distances.ganttHeight ? Math.min(distances.ganttHeight, ganttFullHeight) : ganttFullHeight;
-  }, [distances, ganttFullHeight, containerHeight]);
+    return ganttFullHeight;
+  }, [
+    distances.ganttHeight,
+    distances.headerHeight,
+    ganttFullHeight,
+    containerHeight
+  ]);
   const [taskToRowIndexMap, rowIndexToTaskMap, mapGlobalRowIndexToTask] = useMemo(
     () => getMapTaskToRowIndex(visibleTasks, comparisonLevels),
     [visibleTasks, comparisonLevels]
@@ -19787,6 +19811,7 @@ const Gantt = (props) => {
       distances,
       fullRowHeight,
       ganttFullHeight,
+      ganttHeight,
       getTaskCurrentState,
       handleAddTask,
       handleDeleteTasks,
@@ -19816,6 +19841,7 @@ const Gantt = (props) => {
       distances,
       fullRowHeight,
       ganttFullHeight,
+      ganttHeight,
       getTaskCurrentState,
       handleAddTask,
       handleDeleteTasks,
@@ -19886,8 +19912,7 @@ const Gantt = (props) => {
             isChangeInProgress: Boolean(changeInProgress),
             onScroll: onVerticalScrollbarScrollY,
             rtl,
-            verticalScrollbarRef,
-            containerHeight
+            verticalScrollbarRef
           }
         ),
         taskList.enableTableListContextMenu && !waitCommitTasks && /* @__PURE__ */ jsx(

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

@@ -4678,15 +4678,13 @@
     isChangeInProgress,
     onScroll,
     rtl,
-    verticalScrollbarRef,
-    containerHeight
+    verticalScrollbarRef
   }) => {
-    const scrollHeight = containerHeight !== null && containerHeight !== void 0 ? Math.max(containerHeight - headerHeight, 100) : ganttHeight;
     return /* @__PURE__ */ jsxRuntime.jsx(
       "div",
       {
         style: {
-          height: scrollHeight,
+          height: ganttHeight,
           marginTop: headerHeight,
           marginLeft: rtl ? void 0 : "-1rem",
           pointerEvents: isChangeInProgress ? "none" : void 0
@@ -5181,7 +5179,6 @@
       expandIconWidth: 20,
       handleWidth: 8,
       headerHeight: 50,
-      ganttHeight: 600,
       minimumRowDisplayed: 4,
       nestedTaskNameOffset: 20,
       relationCircleOffset: 10,
@@ -5316,7 +5313,8 @@
       titleCellWidth,
       dateCellWidth,
       dependenciesCellWidth,
-      actionColumnWidth
+      actionColumnWidth,
+      tableWidth: defaultTableWidth = 400
     } = theme.distances;
     const defaultColumns = React.useMemo(() => {
       return [
@@ -5352,6 +5350,10 @@
     const [columnsState, setColumns] = React.useState(
       clientColumns || defaultColumns
     );
+    const taskListWidth = React.useMemo(
+      () => columnsState.reduce((res, { width }) => res + width, 0) + extraWidth,
+      [columnsState, extraWidth]
+    );
     React.useEffect(() => {
       if (clientColumns) {
         setColumns([...clientColumns]);
@@ -5359,19 +5361,23 @@
         const newColumnIds = clientColumns.map((col) => col.id);
         const widthOfAddedColumns = clientColumns.filter((col) => !currentColumnIds.includes(col.id)).reduce((res, { width }) => res + width, 0);
         const widthOfRemovedColumns = clientColumns.filter((col) => !newColumnIds.includes(col.id)).reduce((res, { width }) => res + width, 0);
-        setTableWidth(
-          (prev) => Math.min(
-            prev + widthOfAddedColumns - widthOfRemovedColumns,
-            clientColumns.reduce((res, { width }) => res + width, 0) + extraWidth
-          )
-        );
+        setTableWidth((prev) => {
+          const newWidth = prev + widthOfAddedColumns - widthOfRemovedColumns;
+          return Math.max(newWidth, 100);
+        });
       }
-    }, [clientColumns, extraWidth]);
+    }, [clientColumns, extraWidth, taskListWidth]);
     const [tableResizeEvent, setTableResizeEvent] = React.useState(null);
     const [columnResizeEvent, setColumnResizeEvent] = React.useState(null);
-    const [tableWidthState, setTableWidth] = React.useState(
-      () => columnsState.reduce((res, { width }) => res + width, 0) + extraWidth
-    );
+    const [tableWidthState, setTableWidth] = React.useState(() => {
+      const calculatedWidth = columnsState.reduce((res, { width }) => res + width, 0) + extraWidth;
+      const MAX_INITIAL_WIDTH = 600;
+      if (calculatedWidth <= MAX_INITIAL_WIDTH) {
+        return calculatedWidth;
+      } else {
+        return defaultTableWidth;
+      }
+    });
     const onTableResizeStart = (clientX) => {
       const newTableResizeEvent = {
         initialClientX: clientX,
@@ -5390,7 +5396,6 @@
     };
     const isResizeTableInProgress = Boolean(tableResizeEvent);
     const isResizeColumnInProgress = Boolean(columnResizeEvent);
-    const taskListWidth = columnsState.reduce((res, { width }) => res + width, 0) + extraWidth;
     React.useEffect(() => {
       if (!isResizeTableInProgress) {
         return void 0;
@@ -5398,9 +5403,15 @@
       const handleMove = (clientX) => {
         const moveDelta = clientX - tableResizeEvent.initialClientX;
         setTableWidth(() => {
+          const newWidth = tableResizeEvent.initialTableWidth + moveDelta;
+          const ganttContainer = ganttRef.current;
+          const containerWidth = ganttContainer ? ganttContainer.offsetWidth : 1e3;
+          const maxTableWidth = Math.max(containerWidth - 100, taskListWidth);
           return Math.min(
-            Math.max(tableResizeEvent.initialTableWidth + moveDelta, 50),
-            taskListWidth
+            Math.max(newWidth, 50),
+            // Minimum width of 50px
+            maxTableWidth
+            // Allow table to expand much more
           );
         });
       };
@@ -5460,12 +5471,18 @@
           return newColumns;
         });
         if (previousColumnWidth !== newColumnWidth) {
-          setTableWidth(
-            () => Math.min(
-              Math.max(columnResizeEvent.initialTableWidth + moveDelta, 50),
-              taskListWidth
-            )
-          );
+          setTableWidth(() => {
+            const newTableWidth = columnResizeEvent.initialTableWidth + moveDelta;
+            const ganttContainer = ganttRef.current;
+            const containerWidth = ganttContainer ? ganttContainer.offsetWidth : 1e3;
+            const maxTableWidth = Math.max(containerWidth - 100, taskListWidth);
+            return Math.min(
+              Math.max(newTableWidth, 50),
+              // Minimum width
+              maxTableWidth
+              // Allow expansion beyond column width
+            );
+          });
         }
       };
       const handleMouseMove = (event) => {
@@ -10657,14 +10674,14 @@
     );
   };
   const TaskListTable = React.memo(TaskListTableDefaultInner);
-  const taskListRoot = "_taskListRoot_apbmu_1";
-  const taskListHorizontalScroll = "_taskListHorizontalScroll_apbmu_19";
-  const taskListResizer = "_taskListResizer_apbmu_83";
-  const horizontalContainer$1 = "_horizontalContainer_apbmu_147";
-  const tableWrapper = "_tableWrapper_apbmu_163";
-  const scrollToTop = "_scrollToTop_apbmu_177";
-  const scrollToBottom = "_scrollToBottom_apbmu_193";
-  const hidden = "_hidden_apbmu_209";
+  const taskListRoot = "_taskListRoot_13wkq_1";
+  const taskListHorizontalScroll = "_taskListHorizontalScroll_13wkq_23";
+  const taskListResizer = "_taskListResizer_13wkq_87";
+  const horizontalContainer$1 = "_horizontalContainer_13wkq_151";
+  const tableWrapper = "_tableWrapper_13wkq_165";
+  const scrollToTop = "_scrollToTop_13wkq_179";
+  const scrollToBottom = "_scrollToBottom_13wkq_195";
+  const hidden = "_hidden_13wkq_211";
   const styles$d = {
     taskListRoot,
     taskListHorizontalScroll,
@@ -10698,6 +10715,7 @@
     distances,
     fullRowHeight,
     ganttFullHeight,
+    ganttHeight,
     getTaskCurrentState,
     handleAddTask,
     handleDeleteTasks,
@@ -10828,16 +10846,17 @@
                   ref: taskListContainerRef,
                   className: styles$d.horizontalContainer,
                   style: {
-                    height: "100%",
-                    minHeight: distances.minimumRowDisplayed * distances.rowHeight,
+                    height: Math.max(
+                      ganttHeight - ((tableBottom == null ? void 0 : tableBottom.height) || 0),
+                      distances.minimumRowDisplayed * distances.rowHeight
+                    ),
                     width: taskListWidth
                   },
                   children: /* @__PURE__ */ jsxRuntime.jsx(
                     "div",
                     {
                       style: {
-                        height: "100%",
-                        minHeight: Math.max(
+                        height: Math.max(
                           ganttFullHeight,
                           distances.minimumRowDisplayed * distances.rowHeight
                         ),
@@ -13153,10 +13172,10 @@
     ] });
   };
   const TaskGanttContent = React.memo(TaskGanttContentInner);
-  const ganttVerticalContainer = "_ganttVerticalContainer_i4cef_1";
-  const horizontalContainer = "_horizontalContainer_i4cef_79";
-  const wrapper = "_wrapper_i4cef_95";
-  const calendarDragging = "_calendarDragging_i4cef_125";
+  const ganttVerticalContainer = "_ganttVerticalContainer_5z1c2_1";
+  const horizontalContainer = "_horizontalContainer_5z1c2_75";
+  const wrapper = "_wrapper_5z1c2_87";
+  const calendarDragging = "_calendarDragging_5z1c2_117";
   const styles$2 = {
     ganttVerticalContainer,
     horizontalContainer,
@@ -13171,6 +13190,7 @@
       fullRowHeight,
       fullSvgWidth,
       ganttFullHeight,
+      ganttHeight,
       ganttSVGRef,
       ganttTodayProps,
       ganttTodayProps: {
@@ -13187,16 +13207,14 @@
     const moveStateScrollRef = React.useRef(null);
     const containerStyle = React.useMemo(
       () => ({
-        height: "100%",
-        width: fullSvgWidth,
-        minHeight: minimumRowDisplayed * rowHeight
+        height: Math.max(ganttHeight, minimumRowDisplayed * rowHeight),
+        width: fullSvgWidth
       }),
-      [minimumRowDisplayed, rowHeight, fullSvgWidth]
+      [ganttHeight, minimumRowDisplayed, rowHeight, fullSvgWidth]
     );
     const gridStyle = React.useMemo(
       () => ({
-        height: "100%",
-        minHeight: Math.max(ganttFullHeight, minimumRowDisplayed * rowHeight),
+        height: Math.max(ganttFullHeight, minimumRowDisplayed * rowHeight),
         width: fullSvgWidth,
         backgroundSize: `${columnWidth}px ${fullRowHeight * 2}px`,
         backgroundPositionX: additionalLeftSpace || void 0,
@@ -13227,7 +13245,7 @@
           clientX: event.clientX,
           clientY: event.clientY,
           scrollLeft: verticalGanttContainerRef.current.scrollLeft,
-          scrollTop: verticalGanttContainerRef.current.scrollTop
+          scrollTop: horizontalContainerRef.current.scrollTop
         };
         moveStateHorRef.current = {
           clientX: event.clientX,
@@ -13248,10 +13266,9 @@
           return;
         }
         event.preventDefault();
-        const { clientX, scrollLeft, scrollTop, clientY } = moveStateVertRef.current;
+        const { clientX, scrollLeft } = moveStateVertRef.current;
         const scrollVertContainer = verticalGanttContainerRef.current;
         scrollVertContainer.scrollLeft = scrollLeft + clientX - event.clientX;
-        scrollVertContainer.scrollTop = scrollTop + clientY - event.clientY;
         const {
           clientX: clientXH,
           scrollLeft: scrollLeftH,
@@ -13275,6 +13292,7 @@
         event.preventDefault();
         moveStateVertRef.current = null;
         moveStateHorRef.current = null;
+        moveStateScrollRef.current = null;
         contentContainer.classList.remove(styles$2.calendarDragging);
       };
       contentContainer.addEventListener("mousemove", onScrollMove);
@@ -18615,9 +18633,28 @@
     const [sortedTasks, setSortedTasks] = React.useState(
       () => [...clientTasks].sort(sortTasks)
     );
+    const [containerHeight, setContainerHeight] = React.useState(
+      void 0
+    );
     React.useEffect(() => {
       setSortedTasks([...clientTasks].sort(sortTasks));
     }, [clientTasks]);
+    React.useEffect(() => {
+      if (!wrapperRef.current) {
+        return () => {
+        };
+      }
+      const resizeObserver = new ResizeObserver((entries) => {
+        for (const entry of entries) {
+          const { height } = entry.contentRect;
+          setContainerHeight(height);
+        }
+      });
+      resizeObserver.observe(wrapperRef.current);
+      return () => {
+        resizeObserver.disconnect();
+      };
+    }, []);
     const [childTasksMap, rootTasksMap] = React.useMemo(
       () => getChildsAndRoots(sortedTasks, null),
       [sortedTasks]
@@ -18695,34 +18732,21 @@
       },
       [maxLevelLength, fullRowHeight, (_a = taskList == null ? void 0 : taskList.tableBottom) == null ? void 0 : _a.height]
     );
-    const [containerHeight, setContainerHeight] = React.useState(null);
-    React.useEffect(() => {
-      const wrapperElement = wrapperRef.current;
-      if (!wrapperElement) {
-        return void 0;
-      }
-      const resizeObserver = new ResizeObserver((entries) => {
-        for (const entry of entries) {
-          const { height } = entry.contentRect;
-          if (height > 0) {
-            setContainerHeight(height);
-          }
-        }
-      });
-      resizeObserver.observe(wrapperElement);
-      return () => {
-        resizeObserver.disconnect();
-      };
-    }, []);
     const ganttHeight = React.useMemo(() => {
-      if (containerHeight !== null) {
-        return Math.min(
-          containerHeight - distances.headerHeight,
-          ganttFullHeight
-        );
+      if (distances.ganttHeight) {
+        return Math.min(distances.ganttHeight, ganttFullHeight);
+      }
+      if (containerHeight) {
+        const availableHeight = containerHeight - distances.headerHeight;
+        return Math.min(availableHeight, ganttFullHeight);
       }
-      return distances.ganttHeight ? Math.min(distances.ganttHeight, ganttFullHeight) : ganttFullHeight;
-    }, [distances, ganttFullHeight, containerHeight]);
+      return ganttFullHeight;
+    }, [
+      distances.ganttHeight,
+      distances.headerHeight,
+      ganttFullHeight,
+      containerHeight
+    ]);
     const [taskToRowIndexMap, rowIndexToTaskMap, mapGlobalRowIndexToTask] = React.useMemo(
       () => getMapTaskToRowIndex(visibleTasks, comparisonLevels),
       [visibleTasks, comparisonLevels]
@@ -19804,6 +19828,7 @@
         distances,
         fullRowHeight,
         ganttFullHeight,
+        ganttHeight,
         getTaskCurrentState,
         handleAddTask,
         handleDeleteTasks,
@@ -19833,6 +19858,7 @@
         distances,
         fullRowHeight,
         ganttFullHeight,
+        ganttHeight,
         getTaskCurrentState,
         handleAddTask,
         handleDeleteTasks,
@@ -19903,8 +19929,7 @@
               isChangeInProgress: Boolean(changeInProgress),
               onScroll: onVerticalScrollbarScrollY,
               rtl,
-              verticalScrollbarRef,
-              containerHeight
+              verticalScrollbarRef
             }
           ),
           taskList.enableTableListContextMenu && !waitCommitTasks && /* @__PURE__ */ jsxRuntime.jsx(

package/dist/style.css

@@ -282,33 +282,35 @@
   border-bottom: 1px solid var(--gantt-divider-color);
   table-layout: fixed;
 }
-._taskListRoot_apbmu_1 {
+._taskListRoot_13wkq_1 {
   position: relative;
-  /*noinspection CssUnresolvedCustomProperty*/
-  border-left: 1px solid var(--gantt-table-divider-color, var(--gantt-divider-color));
   height: 100%;
   display: flex;
   flex-direction: column;
+  min-width: 0;
+  flex-shrink: 0;
+  /*noinspection CssUnresolvedCustomProperty*/
+  border-left: 1px solid var(--gantt-table-divider-color, var(--gantt-divider-color));
 }
 
-._taskListHorizontalScroll_apbmu_19 {
+._taskListHorizontalScroll_13wkq_23 {
   overflow-x: scroll;
-  flex: 1;
-  min-height: 0;
+  height: 100%;
   display: flex;
   flex-direction: column;
+  min-width: 0;
 }
 
-._taskListHorizontalScroll_apbmu_19::-webkit-scrollbar {
+._taskListHorizontalScroll_13wkq_23::-webkit-scrollbar {
   width: 1rem;
   height: 1rem;
 }
 
-._taskListHorizontalScroll_apbmu_19::-webkit-scrollbar-corner {
+._taskListHorizontalScroll_13wkq_23::-webkit-scrollbar-corner {
   background: transparent;
 }
 
-._taskListHorizontalScroll_apbmu_19::-webkit-scrollbar-thumb {
+._taskListHorizontalScroll_13wkq_23::-webkit-scrollbar-thumb {
   border: 4px solid transparent;
   /*noinspection CssUnresolvedCustomProperty*/
   background: var(--gantt-scrollbar-thumb-color);
@@ -316,14 +318,14 @@
   background-clip: padding-box;
 }
 
-._taskListHorizontalScroll_apbmu_19::-webkit-scrollbar-thumb:hover {
+._taskListHorizontalScroll_13wkq_23::-webkit-scrollbar-thumb:hover {
   border: 2px solid transparent;
   /*noinspection CssUnresolvedCustomProperty*/
   background: var(--gantt-scrollbar-thumb-color);
   background-clip: padding-box;
 }
 
-._taskListResizer_apbmu_83 {
+._taskListResizer_13wkq_87 {
   position: absolute;
   top: 0;
   right: -3px;
@@ -335,16 +337,16 @@
 }
 
 /*noinspection CssUnresolvedCustomProperty*/
-._taskListResizer_apbmu_83:hover {
+._taskListResizer_13wkq_87:hover {
   background-color: var(--gantt-table-hover-action-color);
   filter: var(--gantt-hover-filter);
 }
 
-._taskListResizer_apbmu_83:hover::before {
+._taskListResizer_13wkq_87:hover::before {
   display: none;
 }
 
-._taskListResizer_apbmu_83::before {
+._taskListResizer_13wkq_87::before {
   content: "";
   position: absolute;
   top: 0;
@@ -355,22 +357,21 @@
   background-color: var(--gantt-table-resize-color, var(--gantt-divider-color));
 }
 
-._horizontalContainer_apbmu_147 {
+._horizontalContainer_13wkq_151 {
   margin: 0;
   padding: 0;
   overflow: hidden;
-  flex: 1;
-  min-height: 0;
+  flex-grow: 1;
 }
 
-._tableWrapper_apbmu_163 {
+._tableWrapper_13wkq_165 {
   position: relative;
-  flex: 1;
-  min-height: 0;
-  overflow: hidden;
+  flex-grow: 1;
+  display: flex;
+  flex-direction: column;
 }
 
-._scrollToTop_apbmu_177 {
+._scrollToTop_13wkq_179 {
   position: absolute;
   top: 0;
   left: 0;
@@ -378,7 +379,7 @@
   height: 20px;
 }
 
-._scrollToBottom_apbmu_193 {
+._scrollToBottom_13wkq_195 {
   position: absolute;
   bottom: 0;
   left: 0;
@@ -386,7 +387,7 @@
   height: 20px;
 }
 
-._hidden_apbmu_209 {
+._hidden_13wkq_211 {
   display: none;
 }
 ._ganttToday_1oyhk_1 {
@@ -580,7 +581,7 @@
   user-select: none;
   stroke-width: 0;
 }
-._ganttVerticalContainer_i4cef_1 {
+._ganttVerticalContainer_5z1c2_1 {
   overflow-x: scroll;
   overflow-y: hidden;
   font-size: 0;
@@ -589,22 +590,20 @@
   /*noinspection CssUnresolvedCustomProperty*/
   border-right: 1px solid var(--gantt-calendar-divider-color, var(--gantt-divider-color));
   flex-grow: 1;
-  min-width: 0;
   height: 100%;
-  display: flex;
-  flex-direction: column;
+  min-width: 0;
 }
 
-._ganttVerticalContainer_i4cef_1::-webkit-scrollbar {
+._ganttVerticalContainer_5z1c2_1::-webkit-scrollbar {
   width: 1rem;
   height: 1rem;
 }
 
-._ganttVerticalContainer_i4cef_1::-webkit-scrollbar-corner {
+._ganttVerticalContainer_5z1c2_1::-webkit-scrollbar-corner {
   background: transparent;
 }
 
-._ganttVerticalContainer_i4cef_1::-webkit-scrollbar-thumb {
+._ganttVerticalContainer_5z1c2_1::-webkit-scrollbar-thumb {
   border: 4px solid transparent;
   /*noinspection CssUnresolvedCustomProperty*/
   background: var(--gantt-scrollbar-thumb-color);
@@ -612,37 +611,35 @@
   background-clip: padding-box;
 }
 
-._ganttVerticalContainer_i4cef_1::-webkit-scrollbar-thumb:hover {
+._ganttVerticalContainer_5z1c2_1::-webkit-scrollbar-thumb:hover {
   border: 2px solid transparent;
   /*noinspection CssUnresolvedCustomProperty*/
   background: var(--gantt-scrollbar-thumb-color);
   background-clip: padding-box;
 }
 
-._horizontalContainer_i4cef_79 {
+._horizontalContainer_5z1c2_75 {
   margin: 0;
   padding: 0;
   overflow: hidden;
-  flex: 1;
-  min-height: 0;
 }
 
-._wrapper_i4cef_95 {
+._wrapper_5z1c2_87 {
   display: flex;
   padding: 0;
   margin: 0;
   list-style: none;
   outline: none;
   position: relative;
-  /*noinspection CssUnresolvedCustomProperty*/
-  border-bottom: 1px solid var(--gantt-divider-color);
   height: 100%;
-  min-height: 0;
-  flex: 1;
+  width: 100%;
+  max-width: 100%;
   overflow: hidden;
+  /*noinspection CssUnresolvedCustomProperty*/
+  border-bottom: 1px solid var(--gantt-divider-color);
 }
 
-._calendarDragging_i4cef_125 {
+._calendarDragging_5z1c2_117 {
   cursor: grabbing;
 }
 /*noinspection CssUnresolvedCustomProperty*/

package/package.json

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