@thepocman/gantt-task-react 1.0.14 → 1.0.17

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

@@ -1944,31 +1944,26 @@ const useOptimizedList = (containerRef, property, cellSize) => {
   return indexes;
 };
 const TASK_SPACING = 2;
-const buildRowEntries = (rowIndexToTasksMap, taskHeight) => {
-  const rowToTaskCount = /* @__PURE__ */ new Map();
-  for (const rowMap of rowIndexToTasksMap.values()) {
-    for (const [rowIndex, tasks] of rowMap.entries()) {
-      rowToTaskCount.set(rowIndex, (rowToTaskCount.get(rowIndex) ?? 0) + tasks.length);
+const useGroupedVirtualization = (_containerRef, rowIndexToTasksMap, taskHeight) => {
+  const rowEntries = useMemo(() => {
+    if (!rowIndexToTasksMap || rowIndexToTasksMap.size === 0)
+      return [];
+    const rowToHeight = /* @__PURE__ */ new Map();
+    for (const levelMap of rowIndexToTasksMap.values()) {
+      for (const [rowIndex, tasks] of levelMap.entries()) {
+        const height = tasks.length * (taskHeight + TASK_SPACING);
+        rowToHeight.set(rowIndex, (rowToHeight.get(rowIndex) ?? 0) + height);
+      }
     }
+    return [...rowToHeight.entries()].map(([rowIndex, height]) => ({ rowIndex, height })).sort((a4, b3) => a4.rowIndex - b3.rowIndex);
+  }, [rowIndexToTasksMap, taskHeight]);
+  if (rowEntries.length === 0) {
+    return [0, 0, true, true, 0];
   }
-  return [...rowToTaskCount.entries()].map(([rowIndex, count2]) => ({
-    rowIndex,
-    height: count2 * (taskHeight + TASK_SPACING)
-  })).sort((a4, b3) => a4.rowIndex - b3.rowIndex);
-};
-const useGroupedVirtualization = (rowIndexToTasksMap, taskHeight) => {
-  var _a, _b;
-  const rowEntries = useMemo(
-    () => buildRowEntries(rowIndexToTasksMap, taskHeight),
-    [rowIndexToTasksMap, taskHeight]
-  );
-  return [
-    ((_a = rowEntries[0]) == null ? void 0 : _a.rowIndex) ?? 0,
-    ((_b = rowEntries[rowEntries.length - 1]) == null ? void 0 : _b.rowIndex) ?? 0,
-    true,
-    true,
-    rowEntries.reduce((sum, entry) => sum + entry.height, 0)
-  ];
+  const startRow = rowEntries[0].rowIndex;
+  const endRow = rowEntries[rowEntries.length - 1].rowIndex;
+  const fullHeight = rowEntries.reduce((sum, r) => sum + r.height, 0);
+  return [startRow, endRow, true, true, fullHeight];
 };
 const button$2 = "_button_1eue5_1";
 const styles$i = {
@@ -3446,7 +3441,7 @@ const TaskListInner = ({
     onColumnResizeStart
   ] = useTableListResize(columnsProp, distances, onResizeColumn);
   const renderedIndexes = enableTaskGrouping ? useGroupedVirtualization(
-    //taskListContentRef,
+    taskListContentRef,
     rowIndexToTasksMap,
     distances.taskHeight
   ) : useOptimizedList(
@@ -11788,7 +11783,7 @@ const Gantt = ({
     return totalRows * fullRowHeight;
   }, [enableTaskGrouping, rowIndexToTasksMap, maxLevelLength, fullRowHeight]);
   const renderedRowIndexes = enableTaskGrouping ? useGroupedVirtualization(
-    //ganttTaskContentRef,
+    ganttTaskContentRef,
     rowIndexToTasksMap,
     fullRowHeight
   ) : useOptimizedList(

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

@@ -1957,31 +1957,26 @@
     return indexes;
   };
   const TASK_SPACING = 2;
-  const buildRowEntries = (rowIndexToTasksMap, taskHeight) => {
-    const rowToTaskCount = /* @__PURE__ */ new Map();
-    for (const rowMap of rowIndexToTasksMap.values()) {
-      for (const [rowIndex, tasks] of rowMap.entries()) {
-        rowToTaskCount.set(rowIndex, (rowToTaskCount.get(rowIndex) ?? 0) + tasks.length);
+  const useGroupedVirtualization = (_containerRef, rowIndexToTasksMap, taskHeight) => {
+    const rowEntries = React.useMemo(() => {
+      if (!rowIndexToTasksMap || rowIndexToTasksMap.size === 0)
+        return [];
+      const rowToHeight = /* @__PURE__ */ new Map();
+      for (const levelMap of rowIndexToTasksMap.values()) {
+        for (const [rowIndex, tasks] of levelMap.entries()) {
+          const height = tasks.length * (taskHeight + TASK_SPACING);
+          rowToHeight.set(rowIndex, (rowToHeight.get(rowIndex) ?? 0) + height);
+        }
       }
+      return [...rowToHeight.entries()].map(([rowIndex, height]) => ({ rowIndex, height })).sort((a2, b2) => a2.rowIndex - b2.rowIndex);
+    }, [rowIndexToTasksMap, taskHeight]);
+    if (rowEntries.length === 0) {
+      return [0, 0, true, true, 0];
     }
-    return [...rowToTaskCount.entries()].map(([rowIndex, count2]) => ({
-      rowIndex,
-      height: count2 * (taskHeight + TASK_SPACING)
-    })).sort((a2, b2) => a2.rowIndex - b2.rowIndex);
-  };
-  const useGroupedVirtualization = (rowIndexToTasksMap, taskHeight) => {
-    var _a, _b;
-    const rowEntries = React.useMemo(
-      () => buildRowEntries(rowIndexToTasksMap, taskHeight),
-      [rowIndexToTasksMap, taskHeight]
-    );
-    return [
-      ((_a = rowEntries[0]) == null ? void 0 : _a.rowIndex) ?? 0,
-      ((_b = rowEntries[rowEntries.length - 1]) == null ? void 0 : _b.rowIndex) ?? 0,
-      true,
-      true,
-      rowEntries.reduce((sum, entry) => sum + entry.height, 0)
-    ];
+    const startRow = rowEntries[0].rowIndex;
+    const endRow = rowEntries[rowEntries.length - 1].rowIndex;
+    const fullHeight = rowEntries.reduce((sum, r) => sum + r.height, 0);
+    return [startRow, endRow, true, true, fullHeight];
   };
   const button$2 = "_button_1eue5_1";
   const styles$i = {
@@ -3459,7 +3454,7 @@
       onColumnResizeStart
     ] = useTableListResize(columnsProp, distances, onResizeColumn);
     const renderedIndexes = enableTaskGrouping ? useGroupedVirtualization(
-      //taskListContentRef,
+      taskListContentRef,
       rowIndexToTasksMap,
       distances.taskHeight
     ) : useOptimizedList(
@@ -11801,7 +11796,7 @@
       return totalRows * fullRowHeight;
     }, [enableTaskGrouping, rowIndexToTasksMap, maxLevelLength, fullRowHeight]);
     const renderedRowIndexes = enableTaskGrouping ? useGroupedVirtualization(
-      //ganttTaskContentRef,
+      ganttTaskContentRef,
       rowIndexToTasksMap,
       fullRowHeight
     ) : useOptimizedList(

package/dist/helpers/use-grouped-optimized-list.d.ts

@@ -1,3 +1,3 @@
 import type { RowIndexToTasksMap } from "../types/public-types";
-import { OptimizedListParams } from "./use-optimized-list";
-export declare const useGroupedVirtualization: (rowIndexToTasksMap: RowIndexToTasksMap, taskHeight: number) => OptimizedListParams;
+import type { OptimizedListParams } from "./use-optimized-list";
+export declare const useGroupedVirtualization: (_containerRef: React.RefObject<HTMLElement>, rowIndexToTasksMap: RowIndexToTasksMap, taskHeight: number) => OptimizedListParams;

package/package.json

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