es-grid-template 1.9.95 → 1.9.97

package/es/grid-component/GridRefreshButton.css

@@ -1,9 +1,9 @@
-.ui-rc-grid-refresh-spin {
-  transform-origin: center;
-  transform-box: fill-box;
-  animation: ui-rc-grid-refresh-spin 0.8s linear infinite;
-}
-
-@keyframes ui-rc-grid-refresh-spin {
-  to { transform: rotate(360deg); }
-}
+.ui-rc-grid-refresh-spin {
+  transform-origin: center;
+  transform-box: fill-box;
+  animation: ui-rc-grid-refresh-spin 0.8s linear infinite;
+}
+
+@keyframes ui-rc-grid-refresh-spin {
+  to { transform: rotate(360deg); }
+}

package/es/grid-component/hooks/rowFocus.d.ts

@@ -1,4 +1,4 @@
-import type { MouseEvent } from 'react';
+import type { KeyboardEvent, MouseEvent } from 'react';
 import type { RowFocusEventArgs } from '../type';
 type RowFocus<T> = (args: RowFocusEventArgs<T>) => void;
 /** Capture clicks even when a cell handles the event itself. */
@@ -8,4 +8,5 @@ export declare function getRowFocusHandlers<T>(rowData: T, rowFocus?: RowFocus<T
 };
 /** Notify arrow focus without changing the existing navigation or selection. */
 export declare function notifyArrowRowFocus<T>(rowData: T, method: 'arrowUp' | 'arrowDown', useArrow?: boolean, rowFocus?: RowFocus<T>): void;
+export declare function focusArrowRow(event: KeyboardEvent, rowId: string, columnId: string, scrollToRow: () => void): void;
 export {};

package/es/grid-component/hooks/rowFocus.js

@@ -22,4 +22,30 @@ export function notifyArrowRowFocus(rowData, method, useArrow, rowFocus) {
     rowData,
     method
   });
+}
+export function focusArrowRow(event, rowId, columnId, scrollToRow) {
+  event.preventDefault();
+  const source = event.currentTarget;
+  const body = source.closest('.ui-rc-grid-row')?.parentElement;
+  const row = body && Array.from(body.children).find(child => child.getAttribute('data-row-key') === rowId);
+  const viewport = source.closest('[data-grid-scroll], [data-virtuoso-scroller]');
+  const canScroll = viewport && viewport.scrollHeight > viewport.clientHeight;
+  if (!row) {
+    if (canScroll) scrollToRow();
+    return;
+  }
+  const cell = Array.from(row.querySelectorAll(':scope > [data-col-key]')).find(element => element.getAttribute('data-col-key') === columnId) ?? row.querySelector(':scope > .ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
+  cell?.focus({
+    preventScroll: true
+  });
+  if (canScroll) {
+    const header = body?.parentElement?.querySelector(':scope > .ui-rc-grid-thead');
+    const footer = body?.parentElement?.querySelector(':scope > .ui-rc-grid-tfoot');
+    const headerHeight = header?.getBoundingClientRect().height ?? 0;
+    const footerHeight = footer?.getBoundingClientRect().height ?? 0;
+    const viewportTop = viewport.getBoundingClientRect().top + viewport.clientTop;
+    const viewportCenter = viewportTop + (viewport.clientHeight + headerHeight - footerHeight) / 2;
+    const rowRect = row.getBoundingClientRect();
+    viewport.scrollTop += rowRect.top + rowRect.height / 2 - viewportCenter;
+  }
 }

package/es/grid-component/type.d.ts

@@ -494,7 +494,7 @@ export type TableProps<RecordType = AnyObject> = {
     allowResizing?: boolean;
     /** Hiển thị dòng tổng hợp */
     summary?: boolean;
-    /** Dữ liệu footer */
+    /** Dữ liệu footer theo field của cột, dùng khi summary=true. Không truyền thì tự tính tổng; [] ẩn các dòng footer. */
     footerDataSource?: any[];
     /** Hiển thị text khi không có dữ liệu */
     showEmptyText?: boolean;

package/es/group-component/TableContainer.js

@@ -339,6 +339,7 @@ const TableContainer = props => {
       groupColumns
     }
   }, /*#__PURE__*/React.createElement(TableWrapper, {
+    footerDataSource: props.footerDataSource,
     contextMenuItems: contextMenuItems,
     height: tableHeight,
     minHeight: minHeight,

package/es/group-component/TableContainerEdit.js

@@ -2259,6 +2259,7 @@ const TableContainerEdit = props => {
       groupColumns
     }
   }, /*#__PURE__*/React.createElement(TableWrapper, {
+    footerDataSource: props.footerDataSource,
     contextMenuItems: contextMenuItems,
     height: tableHeight,
     minHeight: minHeight,

package/es/group-component/body/TableBodyCell.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="react" />
+import type { Virtualizer } from "@tanstack/react-virtual";
 import type { Cell, Table } from "@tanstack/react-table";
 import type { CommandClick } from "../../grid-component/type";
 interface TableBodyCellProps<T> {
     table: Table<T>;
+    rowVirtualizer?: Virtualizer<HTMLDivElement, HTMLDivElement>;
     tableId: string;
     cell: Cell<T, unknown>;
     commandClick?: (args: CommandClick<T>) => void;

package/es/group-component/body/TableBodyCell.js

@@ -1,4 +1,4 @@
-import { notifyArrowRowFocus } from "../../grid-component/hooks/rowFocus";
+import { focusArrowRow, notifyArrowRowFocus } from "../../grid-component/hooks/rowFocus";
 import Space from "rc-master-ui/es/space";
 import Command from "../components/command/Command";
 import { getCommonPinningStyles, getSelectedCellMatrix } from "../hook/utils";
@@ -446,35 +446,20 @@ const TableBodyCell = props => {
       }
     },
     onKeyDown: e => {
-      const flatRows = table.getRowModel().flatRows;
-      if (e.key === 'ArrowDown' && rowNumber < flatRows.length - 1) {
-        const nextIndex = cell.row.index + 1;
-        // const nextIndex = rowNumber + 1
-
-        const nextId = flatRows[nextIndex].id;
-        setFocusedCell?.({
-          colId: cell.column.id,
-          rowId: nextId
-        });
-        notifyArrowRowFocus(table.getRow(nextId).original, 'arrowDown', selectionSettings?.useArrow, rowFocus);
-        const rowQr = document.querySelector(`.ui-rc-grid-row[data-row-key="${nextId}"]`);
-        const cellFocus = rowQr?.querySelector('.ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
-        if (cellFocus) {
-          cellFocus.focus();
-        }
-      }
-      if (e.key === 'ArrowUp' && rowNumber > 0) {
-        const prevIndex = cell.row.index - 1;
-        const nextId = flatRows[prevIndex].id;
-        setFocusedCell?.({
-          colId: cell.column.id,
-          rowId: nextId
-        });
-        notifyArrowRowFocus(table.getRow(nextId).original, 'arrowUp', selectionSettings?.useArrow, rowFocus);
-        const rowQr = document.querySelector(`.ui-rc-grid-row[data-row-key="${nextId}"]`);
-        const cellFocus = rowQr?.querySelector('.ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
-        if (cellFocus) {
-          cellFocus.focus();
+      if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
+        const rows = table.getRowModel().rows;
+        const currentIndex = rows.findIndex(row => row.id === cell.row.id);
+        const nextIndex = currentIndex + (e.key === 'ArrowDown' ? 1 : -1);
+        const nextRow = currentIndex >= 0 ? rows[nextIndex] : undefined;
+        if (nextRow) {
+          setFocusedCell?.({
+            colId: cell.column.id,
+            rowId: nextRow.id
+          });
+          focusArrowRow(e, nextRow.id, cell.column.id, () => props.rowVirtualizer?.scrollToIndex(nextIndex, {
+            align: 'center'
+          }));
+          notifyArrowRowFocus(nextRow.original, e.key === 'ArrowDown' ? 'arrowDown' : 'arrowUp', selectionSettings?.useArrow, rowFocus);
         }
       }
       if (e.ctrlKey && e.code === 'Space' && cell.row.getCanSelect()) {

package/es/group-component/body/TableBodyCellEdit.js

@@ -1,4 +1,4 @@
-import { notifyArrowRowFocus } from "../../grid-component/hooks/rowFocus";
+import { focusArrowRow, notifyArrowRowFocus } from "../../grid-component/hooks/rowFocus";
 import Space from "rc-master-ui/es/space";
 import Command from "../components/command/Command";
 import { addRowsDown, addRowsDownWithCtrl, addRowsUp, addRowsUpWithCtrl, findFirst, flattenArray, flattenData, getColIdsBetween, getCommonPinningStyles, getEditType, getRowIdsBetween, getSelectedCellMatrix, isEditable, isObjEmpty, isObjEqual, newGuid, unFlattenData, updateOrInsert } from "../hook/utils";
@@ -787,93 +787,30 @@ const TableBodyCellEdit = props => {
       }
       return;
     }
-    if (e.key === 'ArrowDown') {
-      // e.preventDefault()
-      // e.stopPropagation()
-
-      let nextRowIndex = rowNumber + 1;
-      let nextRow = table.getRowModel().rows[nextRowIndex];
-
-      // Nếu nextRow có children và chưa được expand, thì tìm tiếp dòng tiếp theo
-      while (nextRow && nextRow.subRows && nextRow.subRows.length > 0) {
-        nextRowIndex++;
-        nextRow = table.getRowModel().rows[nextRowIndex];
+    if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
+      const rows = table.getRowModel().rows;
+      const currentIndex = rows.findIndex(row => row.id === rowId);
+      if (currentIndex < 0) return;
+      const step = e.key === 'ArrowDown' ? 1 : -1;
+      let nextIndex = currentIndex + step;
+      let nextRow = rows[nextIndex];
+      while (nextRow?.subRows.length) {
+        nextIndex += step;
+        nextRow = rows[nextIndex];
       }
       if (nextRow) {
-        const nextRowId = nextRow.id;
-        setFocusedCell?.({
-          rowId: nextRowId,
-          colId
-        });
-        notifyArrowRowFocus(table.getRow(nextRowId).original, 'arrowDown', selectionSettings?.useArrow, rowFocus);
-        setStartCell?.({
-          rowId: nextRowId,
-          colId
-        });
-        setEndCell?.({
-          rowId: nextRowId,
-          colId
-        });
-        setRangeState?.(getSelectedCellMatrix(table, {
-          rowId: nextRowId,
-          colId
-        }, {
-          rowId: nextRowId,
-          colId
-        }));
-
-        // columnVirtualizer.scrollToIndex(nextCol.getIndex(), { align: 'center' })
-        // rowVirtualizer.scrollToIndex(nextRow.index, { align: 'center' })
-
-        const row = document.querySelector(`.ui-rc-grid-row[data-row-key="${nextRowId}"]`);
-        const cellFocus = row?.querySelector('.ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
-        if (cellFocus) {
-          cellFocus.focus();
-        }
-      }
-      return;
-    }
-    if (e.key === 'ArrowUp') {
-      // e.preventDefault()
-      // e.stopPropagation()
-
-      // const nextRow = table.getRowModel().rows[rowNumber - 1]
-
-      let prevRowIndex = rowNumber - 1;
-      let prevRow = table.getRowModel().rows[prevRowIndex];
-
-      // Nếu nextRow có children và chưa được expand, thì tìm tiếp dòng tiếp theo
-      while (prevRow && prevRow.subRows && prevRow.subRows.length > 0) {
-        prevRowIndex--;
-        prevRow = table.getRowModel().rows[prevRowIndex];
-      }
-      if (prevRow) {
-        const nextRowId = prevRow.id;
-        setFocusedCell?.({
-          rowId: nextRowId,
-          colId
-        });
-        notifyArrowRowFocus(table.getRow(nextRowId).original, 'arrowUp', selectionSettings?.useArrow, rowFocus);
-        setStartCell?.({
-          rowId: nextRowId,
-          colId
-        });
-        setEndCell?.({
-          rowId: nextRowId,
-          colId
-        });
-        setRangeState?.(getSelectedCellMatrix(table, {
-          rowId: nextRowId,
-          colId
-        }, {
-          rowId: nextRowId,
+        const nextCell = {
+          rowId: nextRow.id,
           colId
+        };
+        setFocusedCell?.(nextCell);
+        setStartCell?.(nextCell);
+        setEndCell?.(nextCell);
+        setRangeState?.(getSelectedCellMatrix(table, nextCell, nextCell));
+        focusArrowRow(e, nextRow.id, colId, () => rowVirtualizer.scrollToIndex(nextIndex, {
+          align: 'center'
         }));
-        const row = document.querySelector(`.ui-rc-grid-row[data-row-key="${nextRowId}"]`);
-        const cellFocus = row?.querySelector('.ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
-        if (cellFocus) {
-          cellFocus.focus();
-        }
+        notifyArrowRowFocus(nextRow.original, e.key === 'ArrowDown' ? 'arrowDown' : 'arrowUp', selectionSettings?.useArrow, rowFocus);
       }
       return;
     }

package/es/group-component/body/TableBodyCellEmpty.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="react" />
+import type { Virtualizer } from "@tanstack/react-virtual";
 import type { Cell, Table } from "@tanstack/react-table";
 import type { CommandClick } from "../../grid-component/type";
 interface TableBodyCellProps<T> {
     table: Table<T>;
+    rowVirtualizer?: Virtualizer<HTMLDivElement, HTMLDivElement>;
     tableId: string;
     cell: Cell<T, unknown>;
     commandClick?: (args: CommandClick<T>) => void;

package/es/group-component/body/TableBodyCellEmpty.js

@@ -1,4 +1,4 @@
-import { notifyArrowRowFocus } from "../../grid-component/hooks/rowFocus";
+import { focusArrowRow, notifyArrowRowFocus } from "../../grid-component/hooks/rowFocus";
 // import ReactDOMServer from 'react-dom/server'
 
 import { getCommonPinningStyles } from "../hook/utils";
@@ -92,35 +92,20 @@ const TableBodyCellEmpty = props => {
       setIsPasting?.(false);
     },
     onKeyDown: e => {
-      const flatRows = table.getRowModel().flatRows;
-      if (e.key === 'ArrowDown' && rowNumber < flatRows.length - 1) {
-        const nextIndex = cell.row.index + 1;
-        // const nextIndex = rowNumber + 1
-
-        const nextId = flatRows[nextIndex].id;
-        setFocusedCell?.({
-          colId: cell.column.id,
-          rowId: nextId
-        });
-        notifyArrowRowFocus(table.getRow(nextId).original, 'arrowDown', selectionSettings?.useArrow, rowFocus);
-        const row = document.querySelector(`.ui-rc-grid-row[data-row-key="${nextId}"]`);
-        const cellFocus = row?.querySelector('.ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
-        if (cellFocus) {
-          cellFocus.focus();
-        }
-      }
-      if (e.key === 'ArrowUp' && rowNumber > 0) {
-        const prevIndex = cell.row.index - 1;
-        const nextId = flatRows[prevIndex].id;
-        setFocusedCell?.({
-          colId: cell.column.id,
-          rowId: nextId
-        });
-        notifyArrowRowFocus(table.getRow(nextId).original, 'arrowUp', selectionSettings?.useArrow, rowFocus);
-        const row = document.querySelector(`.ui-rc-grid-row[data-row-key="${nextId}"]`);
-        const cellFocus = row?.querySelector('.ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
-        if (cellFocus) {
-          cellFocus.focus();
+      if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
+        const rows = table.getRowModel().rows;
+        const currentIndex = rows.findIndex(row => row.id === cell.row.id);
+        const nextIndex = currentIndex + (e.key === 'ArrowDown' ? 1 : -1);
+        const nextRow = currentIndex >= 0 ? rows[nextIndex] : undefined;
+        if (nextRow) {
+          setFocusedCell?.({
+            colId: cell.column.id,
+            rowId: nextRow.id
+          });
+          focusArrowRow(e, nextRow.id, cell.column.id, () => props.rowVirtualizer?.scrollToIndex(nextIndex, {
+            align: 'center'
+          }));
+          notifyArrowRowFocus(nextRow.original, e.key === 'ArrowDown' ? 'arrowDown' : 'arrowUp', selectionSettings?.useArrow, rowFocus);
         }
       }
       if (e.ctrlKey && e.code === 'Space' && cell.row.getCanSelect()) {

package/es/group-component/body/TableBodyRowGroupCell.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="react" />
+import type { Virtualizer } from "@tanstack/react-virtual";
 import type { Cell, Table } from "@tanstack/react-table";
 import type { CommandClick } from "../../grid-component/type";
 interface TableBodyCellProps<T> {
     table: Table<T>;
+    rowVirtualizer?: Virtualizer<HTMLDivElement, HTMLDivElement>;
     tableId: string;
     cell: Cell<T, unknown>;
     commandClick?: (args: CommandClick<T>) => void;

package/es/group-component/body/TableBodyRowGroupCell.js

@@ -1,4 +1,4 @@
-import { notifyArrowRowFocus } from "../../grid-component/hooks/rowFocus";
+import { focusArrowRow, notifyArrowRowFocus } from "../../grid-component/hooks/rowFocus";
 import Space from "rc-master-ui/es/space";
 import Command from "../components/command/Command";
 import { getCommonPinningStyles } from "../hook/utils";
@@ -426,35 +426,20 @@ const TableBodyCell = props => {
       setIsPasting?.(false);
     },
     onKeyDown: e => {
-      const flatRows = table.getRowModel().flatRows;
-      if (e.key === 'ArrowDown' && rowNumber < flatRows.length - 1) {
-        const nextIndex = cell.row.index + 1;
-        // const nextIndex = rowNumber + 1
-
-        const nextId = flatRows[nextIndex].id;
-        setFocusedCell?.({
-          colId: cell.column.id,
-          rowId: nextId
-        });
-        notifyArrowRowFocus(table.getRow(nextId).original, 'arrowDown', selectionSettings?.useArrow, rowFocus);
-        const rowQr = document.querySelector(`.ui-rc-grid-row[data-row-key="${nextId}"]`);
-        const cellFocus = rowQr?.querySelector('.ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
-        if (cellFocus) {
-          cellFocus.focus();
-        }
-      }
-      if (e.key === 'ArrowUp' && rowNumber > 0) {
-        const prevIndex = cell.row.index - 1;
-        const nextId = flatRows[prevIndex].id;
-        setFocusedCell?.({
-          colId: cell.column.id,
-          rowId: nextId
-        });
-        notifyArrowRowFocus(table.getRow(nextId).original, 'arrowUp', selectionSettings?.useArrow, rowFocus);
-        const rowQr = document.querySelector(`.ui-rc-grid-row[data-row-key="${nextId}"]`);
-        const cellFocus = rowQr?.querySelector('.ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
-        if (cellFocus) {
-          cellFocus.focus();
+      if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
+        const rows = table.getRowModel().rows;
+        const currentIndex = rows.findIndex(row => row.id === cell.row.id);
+        const nextIndex = currentIndex + (e.key === 'ArrowDown' ? 1 : -1);
+        const nextRow = currentIndex >= 0 ? rows[nextIndex] : undefined;
+        if (nextRow) {
+          setFocusedCell?.({
+            colId: cell.column.id,
+            rowId: nextRow.id
+          });
+          focusArrowRow(e, nextRow.id, cell.column.id, () => props.rowVirtualizer?.scrollToIndex(nextIndex, {
+            align: 'center'
+          }));
+          notifyArrowRowFocus(nextRow.original, e.key === 'ArrowDown' ? 'arrowDown' : 'arrowUp', selectionSettings?.useArrow, rowFocus);
         }
       }
       if (e.ctrlKey && e.code === 'Space' && cell.row.getCanSelect()) {

package/es/group-component/footer/TableFooter.d.ts

@@ -2,6 +2,7 @@
 import type { Table } from "@tanstack/react-table";
 interface TableFooterProps<T> {
     table: Table<T>;
+    footerDataSource?: any[];
 }
-declare const TableFooter: <RecordType extends object>({ table, }: TableFooterProps<RecordType>) => JSX.Element;
+declare const TableFooter: <RecordType extends object>({ table, footerDataSource, }: TableFooterProps<RecordType>) => JSX.Element;
 export default TableFooter;

package/es/group-component/footer/TableFooter.js

@@ -4,7 +4,8 @@ import { TableContext } from "../useContext";
 import React, { useContext } from "react";
 const TableFooter = ({
   // columnVirtualizer,
-  table
+  table,
+  footerDataSource
   // virtualPaddingLeft,
   // virtualPaddingRight,
   // ...rest
@@ -20,15 +21,11 @@ const TableFooter = ({
       bottom: 0,
       zIndex: 1
     }
-  }, /*#__PURE__*/React.createElement(TableFooterRow, {
-    table: table
-    // columnVirtualizer={columnVirtualizer}
-    ,
-    headerGroup: table.getHeaderGroups()[table.getHeaderGroups().length - 1]
-    // key={headerGroup.id}
-    // virtualPaddingLeft={virtualPaddingLeft}
-    // virtualPaddingRight={virtualPaddingRight}
-    // {...rest}
-  }));
+  }, (footerDataSource ?? [undefined]).map((footerRow, index) => /*#__PURE__*/React.createElement(TableFooterRow, {
+    key: index,
+    table: table,
+    headerGroup: table.getHeaderGroups()[table.getHeaderGroups().length - 1],
+    footerRow: footerRow
+  })));
 };
 export default TableFooter;

package/es/group-component/footer/TableFooterCell.d.ts

@@ -2,6 +2,7 @@
 import type { Column } from "@tanstack/react-table";
 interface TableFooterCellProps<T> {
     column: Column<T, any>;
+    footerRow?: Record<string, any>;
 }
-declare const TableFooterCell: <RecordType extends object>({ column }: TableFooterCellProps<RecordType>) => JSX.Element;
+declare const TableFooterCell: <RecordType extends object>({ column, footerRow }: TableFooterCellProps<RecordType>) => JSX.Element;
 export default TableFooterCell;

package/es/group-component/footer/TableFooterCell.js

@@ -5,7 +5,8 @@ import classNames from "classnames";
 import { sumByField } from "../../grid-component/hooks";
 import { numericFormatter } from "react-numeric-component";
 const TableFooterCell = ({
-  column
+  column,
+  footerRow
 }) => {
   const isPinned = column.getIsPinned();
   const isLastLeftPinnedColumn = isPinned === 'left' && column.getIsLastColumn('left');
@@ -16,7 +17,10 @@ const TableFooterCell = ({
     dataSource
   } = useContext(TableContext);
   const col = column.columnDef.meta ?? {};
-  const colFormat = typeof col.format === 'function' ? col.format({}) : col.format;
+  const isCustomFooter = footerRow !== undefined;
+  const field = col.field;
+  const hasFooterValue = isCustomFooter && Object.prototype.hasOwnProperty.call(footerRow, field) && footerRow[field] != null;
+  const colFormat = typeof col.format === 'function' ? col.format(footerRow ?? {}) : col.format;
   const cellFormat = getFormat(colFormat, format);
   const thousandSeparator = cellFormat?.thousandSeparator;
   const decimalSeparator = cellFormat?.decimalSeparator;
@@ -25,7 +29,7 @@ const TableFooterCell = ({
   const dec = cellFormat?.decimalScale;
 
   // const sumValue = col.type === 'number' ? sumDataByField(filterDataByColumns4(dataSource, filterStates) as any[], col?.key as string) : 0
-  const sumValue = col.type === 'number' ? sumByField(dataSource, col?.field) : 0;
+  const sumValue = col.type === 'number' ? isCustomFooter ? hasFooterValue ? Number(footerRow[field]) : 0 : sumByField(dataSource, field) : 0;
   const value = !isEmpty(sumValue) ? dec || dec === 0 ? parseFloat(Number(sumValue).toFixed(dec)).toString() : sumValue.toString() : '0';
   const cellValue = col.type === 'number' && col.isSummary !== false ? value : '';
   const numberValue = Number(value);
@@ -38,6 +42,7 @@ const TableFooterCell = ({
     decimalScale: dec,
     fixedDecimalScale: cellFormat?.fixedDecimalScale ?? false
   };
+  const content = isCustomFooter && (!hasFooterValue || col.isSummary === false) ? '' : col.summaryTemplate ? col.summaryTemplate(numberValue, field) : isCustomFooter && col.type !== 'number' ? footerRow[field] : numericFormatter(cellValue, numericFormatProps);
   return /*#__PURE__*/React.createElement("div", {
     // ref={el => {
     //   if (el) columnVirtualizer.measureElement(el)
@@ -61,6 +66,6 @@ const TableFooterCell = ({
       minWidth: column?.getSize()
       // backgroundColor: "#fafafa",
     }
-  }, column.id !== "id" && column.id !== "selection_column" ? /*#__PURE__*/React.createElement(React.Fragment, null, col.summaryTemplate ? col.summaryTemplate(numberValue, col.field) : numericFormatter(cellValue, numericFormatProps)) : '');
+  }, column.id !== "id" && column.id !== "selection_column" ? /*#__PURE__*/React.createElement(React.Fragment, null, content) : '');
 };
 export default TableFooterCell;

package/es/group-component/footer/TableFooterRow.d.ts

@@ -2,7 +2,8 @@
 import type { HeaderGroup, Table } from "@tanstack/react-table";
 interface TableFooterRowProps<T> {
     table: Table<T>;
+    footerRow?: Record<string, any>;
     headerGroup: HeaderGroup<T>;
 }
-declare const TableFooterRow: <RecordType extends object>({ table, headerGroup, }: TableFooterRowProps<RecordType>) => JSX.Element;
+declare const TableFooterRow: <RecordType extends object>({ table, headerGroup, footerRow, }: TableFooterRowProps<RecordType>) => JSX.Element;
 export default TableFooterRow;

package/es/group-component/footer/TableFooterRow.js

@@ -3,7 +3,8 @@ import React from "react";
 import { TableContext } from "../useContext";
 const TableFooterRow = ({
   table,
-  headerGroup
+  headerGroup,
+  footerRow
 }) => {
   const visibleColumns = table.getVisibleLeafColumns();
   const {
@@ -23,7 +24,8 @@ const TableFooterRow = ({
   }, visibleColumns.map(header => {
     return /*#__PURE__*/React.createElement(TableFooterCell, {
       key: header.id,
-      column: header
+      column: header,
+      footerRow: footerRow
     });
   }));
 };

package/es/group-component/hook/utils.d.ts

@@ -196,10 +196,10 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
         value: any;
         rowData: RecordType;
     }) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
-    onCellStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
-    onCellHeaderStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
+    onCellStyles?: Omit<CSSProperties, "position" | "display" | "width" | "minWidth" | "left" | "right"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "position" | "display" | "width" | "minWidth" | "left" | "right">);
+    onCellHeaderStyles?: Omit<CSSProperties, "position" | "display" | "width" | "minWidth" | "left" | "right"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "position" | "display" | "width" | "minWidth" | "left" | "right">);
     onCell?: (rowData: RecordType, index: number) => import("react").TdHTMLAttributes<HTMLTableCellElement>;
-    onCellFooterStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
+    onCellFooterStyles?: Omit<CSSProperties, "position" | "display" | "width" | "minWidth" | "left" | "right"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "position" | "display" | "width" | "minWidth" | "left" | "right">);
     getValue?: (row: any, rowIndex: number) => any;
     getCellProps?: (value: any, row: any, rowIndex: number) => import("./../../grid-component/type").CellProps;
     headerCellProps?: import("./../../grid-component/type").CellProps;

package/es/group-component/table/TableWrapper.d.ts

@@ -11,6 +11,7 @@ type Props<T> = {
     height: number;
     minHeight?: number;
     table: Table<T>;
+    footerDataSource?: any[];
     summary?: boolean;
     loading?: boolean;
     commandClick?: (args: Omit<CommandClick<T>, 'rows'>) => void;

package/es/group-component/table/TableWrapper.js

@@ -193,6 +193,7 @@ const TableWrapper = props => {
   }, /*#__PURE__*/React.createElement("div", {
     // id={id}
     ref: tableContainerRef,
+    "data-grid-scroll": true,
     style: {
       overflow: 'auto',
       //our scrollable table container
@@ -232,9 +233,10 @@ const TableWrapper = props => {
     virtualPaddingRight: virtualPaddingRight,
     fixedLeftColumns: fixedLeftColumns,
     fixedRightColumns: fixedRightColumns
-  }), summary && /*#__PURE__*/React.createElement(TableFooter
-  // columnVirtualizer={columnVirtualizer}
-  , {
+  }), summary && /*#__PURE__*/React.createElement(TableFooter, {
+    footerDataSource: props.footerDataSource
+    // columnVirtualizer={columnVirtualizer}
+    ,
     table: table
     // virtualPaddingLeft={virtualPaddingLeft}
     // virtualPaddingRight={virtualPaddingRight}

package/es/table-component/TableContainer.js

@@ -350,7 +350,9 @@ const TableContainer = props => {
       setIsExpandClick,
       maxDepth
     }
-  }, /*#__PURE__*/React.createElement(TableWrapper, _extends({}, rest, {
+  }, /*#__PURE__*/React.createElement(TableWrapper, _extends({
+    footerDataSource: props.footerDataSource
+  }, rest, {
     contextMenuItems: contextMenuItems,
     height: tableHeight,
     minHeight: minHeight,

package/es/table-component/TableContainerEdit.js

@@ -2277,7 +2277,9 @@ const TableContainerEdit = props => {
       setIsExpandClick,
       isAddAble
     }
-  }, /*#__PURE__*/React.createElement(TableWrapper, _extends({}, rest, {
+  }, /*#__PURE__*/React.createElement(TableWrapper, _extends({
+    footerDataSource: props.footerDataSource
+  }, rest, {
     contextMenuItems: contextMenuItems,
     height: tableHeight,
     minHeight: minHeight,