es-grid-template 1.9.93 → 1.9.95

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

@@ -167,7 +167,7 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
     haveSum?: boolean;
     isSummary?: boolean;
     sumGroup?: boolean;
-    summaryTemplate?: (data: number, key: string) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
+    summaryTemplate?: (data: number, key: string) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode;
     sorter?: boolean;
     allowFiltering?: boolean;
     allowSortering?: boolean;
@@ -179,27 +179,27 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
     showFilterSearch?: boolean;
     hidden?: boolean;
     visible?: boolean;
-    headerTooltip?: string | boolean | (() => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
+    headerTooltip?: string | boolean | (() => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
     columnGroupText?: string;
     headerTextAlign?: import("./../../grid-component/type").ITextAlign;
-    headerTemplate?: import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | ((column: ColumnTable<RecordType>) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
+    headerTemplate?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode | ((column: ColumnTable<RecordType>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
     fixedType?: import("./../../grid-component/type").FixedType;
     headerTextWrap?: boolean;
     ellipsis?: boolean;
     allowResizing?: boolean;
     align?: import("./../../grid-component/type").ITextAlign;
     textAlign?: import("./../../grid-component/type").ITextAlign;
-    template?: import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | ((args: import("./../../grid-component/type").ColumnTemplate<RecordType>) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
-    linkTemplate?: import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | ((args: import("./../../grid-component/type").ColumnTemplate<RecordType>) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
+    template?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode | ((args: import("./../../grid-component/type").ColumnTemplate<RecordType>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
+    linkTemplate?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode | ((args: import("./../../grid-component/type").ColumnTemplate<RecordType>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
     showTooltip?: boolean;
     tooltipDescription?: string | ((args: {
         value: any;
         rowData: RecordType;
-    }) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
-    onCellStyles?: Omit<CSSProperties, "left" | "right" | "display" | "minWidth" | "position" | "width"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "minWidth" | "position" | "width">);
-    onCellHeaderStyles?: Omit<CSSProperties, "left" | "right" | "display" | "minWidth" | "position" | "width"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "minWidth" | "position" | "width">);
+    }) => 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">);
     onCell?: (rowData: RecordType, index: number) => import("react").TdHTMLAttributes<HTMLTableCellElement>;
-    onCellFooterStyles?: Omit<CSSProperties, "left" | "right" | "display" | "minWidth" | "position" | "width"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "minWidth" | "position" | "width">);
+    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">);
     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/lib/group-component/useContext.d.ts

@@ -1,3 +1,4 @@
+import type { RowFocusEventArgs } from "../grid-component/type";
 import type { Dispatch, SetStateAction } from 'react';
 import type { ColumnTable, ExpandableConfig, IFormat, IGroupSetting, IWrapSettings, Locale, PaginationConfig, RangeState, RecordDoubleClickEventArgs, RowClassName, SelectionSettings, SourceFilter } from "./../grid-component/type";
 import type { SubmitHandler } from "react-hook-form";
@@ -19,6 +20,7 @@ export interface IContext<T> {
     setExpanded: Dispatch<SetStateAction<ExpandedState>>;
     expanded: ExpandedState;
     recordDoubleClick?: (args: RecordDoubleClickEventArgs<T>) => void;
+    rowFocus?: (args: RowFocusEventArgs<T>) => void;
     selectionSettings?: SelectionSettings;
     isSelectionChange?: {
         isChange: boolean;

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 export { default as Dropdown } from './dropdown';
 export type { DropdownProps as DropDownProps, DropdownProps, } from './dropdown';
 export { default as GridComponent } from './grid-component';
-export type { ColumnsTable, TableProps, ColumnTable, CommandItem, ToolbarItem, ContextMenuItem } from './grid-component';
+export type { ColumnsTable, TableProps, ColumnTable, CommandItem, ToolbarItem, ContextMenuItem, RowFocusEventArgs } from './grid-component';
 export { default as Tabs } from './tabs';
 export type { TabPaneProps, TabsProps } from './tabs';
 export { default as SelectTable } from './select-table';

package/lib/table-component/TableContainer.js

@@ -36,6 +36,7 @@ const TableContainer = props => {
     expandable,
     wrapSettings,
     recordDoubleClick,
+    rowFocus,
     // triggerFilter,
     selectionSettings,
     isSelectionChange,
@@ -332,6 +333,7 @@ const TableContainer = props => {
       // triggerFilter,
       wrapSettings,
       recordDoubleClick,
+      rowFocus,
       recordClick,
       selectionSettings,
       isSelectionChange,

package/lib/table-component/TableContainerEdit.js

@@ -83,6 +83,7 @@ const TableContainerEdit = props => {
     expandable,
     wrapSettings,
     recordDoubleClick,
+    rowFocus,
     selectionSettings,
     isSelectionChange,
     setIsSelectionChange,
@@ -2224,6 +2225,7 @@ const TableContainerEdit = props => {
       originData,
       wrapSettings,
       recordDoubleClick,
+      rowFocus,
       selectionSettings,
       isSelectionChange,
       setIsSelectionChange,

package/lib/table-component/body/TableBody.js

@@ -34,9 +34,13 @@ const TableBody = ({
     locale
   } = _react.default.useContext(_useContext.TableContext);
 
+  // Keep measured heights attached to records when expanding, sorting or filtering.
+  const getItemKey = _react.default.useCallback(index => rows[index].id, [rows]);
+
   //dynamic row height virtualization - alternatively you could use a simpler fixed row height strategy without the need for `measureElement`
   const rowVirtualizer = (0, _reactVirtual.useVirtualizer)({
     count: rows.length,
+    getItemKey,
     estimateSize: () => 32,
     //estimate row height for accurate scrollbar dragging
     getScrollElement: () => tableContainerRef.current,

package/lib/table-component/body/TableBodyCell.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _rowFocus = require("../../grid-component/hooks/rowFocus");
 var _space = _interopRequireDefault(require("rc-master-ui/es/space"));
 var _Command = _interopRequireDefault(require("../components/command/Command"));
 var _utils = require("../hook/utils");
@@ -170,6 +171,7 @@ const TableBodyCell = props => {
     id,
     prefix,
     focusedCell,
+    rowFocus,
     setFocusedCell,
     // endCell,
     // startCell,
@@ -450,6 +452,7 @@ const TableBodyCell = props => {
           colId: cell.column.id,
           rowId: nextId
         });
+        (0, _rowFocus.notifyArrowRowFocus)(table.getRow(nextId).original, 'arrowDown', selectionSettings?.useArrow, rowFocus);
 
         // if (rowNumber < flatRows.length - 5) {
         //   e.stopPropagation()
@@ -472,6 +475,7 @@ const TableBodyCell = props => {
           colId: cell.column.id,
           rowId: nextId
         });
+        (0, _rowFocus.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) {

package/lib/table-component/body/TableBodyCellEdit.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _rowFocus = require("../../grid-component/hooks/rowFocus");
 var _space = _interopRequireDefault(require("rc-master-ui/es/space"));
 var _Command = _interopRequireDefault(require("../components/command/Command"));
 var _utils = require("../hook/utils");
@@ -199,6 +200,7 @@ const TableBodyCellEdit = props => {
     editingKey,
     prefix,
     focusedCell,
+    rowFocus,
     rangeState,
     setFocusedCell,
     setEditingKey,
@@ -833,6 +835,7 @@ const TableBodyCellEdit = props => {
           rowId: nextRowId,
           colId
         });
+        (0, _rowFocus.notifyArrowRowFocus)(table.getRow(nextRowId).original, 'arrowDown', selectionSettings?.useArrow, rowFocus);
         setStartCell?.({
           rowId: nextRowId,
           colId
@@ -871,6 +874,7 @@ const TableBodyCellEdit = props => {
           rowId: nextRowId,
           colId
         });
+        (0, _rowFocus.notifyArrowRowFocus)(table.getRow(nextRowId).original, 'arrowUp', selectionSettings?.useArrow, rowFocus);
         setStartCell?.({
           rowId: nextRowId,
           colId

package/lib/table-component/body/TableBodyRow.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _rowFocus = require("../../grid-component/hooks/rowFocus");
 var _TableBodyCell = _interopRequireDefault(require("./TableBodyCell"));
 var _TableBodyCellEdit = _interopRequireDefault(require("./TableBodyCellEdit"));
 var _react = _interopRequireDefault(require("react"));
@@ -32,6 +33,7 @@ const TableBodyRow = ({
   const {
     prefix,
     recordDoubleClick,
+    rowFocus,
     focusedCell,
     rowClassName,
     rowEditable,
@@ -61,10 +63,15 @@ const TableBodyRow = ({
     isSelected: row.getIsSelected()
   }) : onRowStyles;
   const isRowEditable = rowEditable ? rowEditable(row.original) : true;
-  return /*#__PURE__*/_react.default.createElement("div", {
+
+  // A reused DOM row needs measuring again when its virtual index changes.
+  const measureRow = _react.default.useCallback(element => {
+    rowVirtualizer.measureElement(element);
+  }, [rowVirtualizer, virtualRow.index]);
+  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     "data-index": virtualRow.index //needed for dynamic row height measurement
     ,
-    ref: rowVirtualizer.measureElement //measure dynamic row height
+    ref: measureRow //measure dynamic row height
     ,
     key: row.id,
     "data-row-key": row.id,
@@ -87,7 +94,8 @@ const TableBodyRow = ({
       height: isEditing ? virtualRow.size : undefined,
       minHeight: isEditing ? undefined : virtualRow.size,
       ...rowStyles
-    },
+    }
+  }, (0, _rowFocus.getRowFocusHandlers)(row.original, rowFocus), {
     onDoubleClick: e => {
       recordDoubleClick?.({
         e,
@@ -106,7 +114,7 @@ const TableBodyRow = ({
       })(e);
       // }
     }
-  }, fixedLeftColumns.length > 0 ? fixedLeftColumns.map(column => {
+  }), fixedLeftColumns.length > 0 ? fixedLeftColumns.map(column => {
     const cell = row.getVisibleCells().find(c => c.column.id === column.id);
     if (editAble) {
       return /*#__PURE__*/_react.default.createElement(_TableBodyCellEdit.default, (0, _extends2.default)({}, rest, {

package/lib/table-component/useContext.d.ts

@@ -1,3 +1,4 @@
+import type { RowFocusEventArgs } from "../grid-component/type";
 import type { Dispatch, SetStateAction } from 'react';
 import type { ColumnTable, ExpandableConfig, FilterItem, IFormat, IWrapSettings, Locale, PaginationConfig, RangeState, RecordDoubleClickEventArgs, RowClassName, SelectionSettings, SourceFilter } from "./../grid-component/type";
 import type { SubmitHandler } from "react-hook-form";
@@ -20,6 +21,7 @@ export interface IContext<T> {
     setExpanded: Dispatch<SetStateAction<ExpandedState>>;
     expanded: ExpandedState;
     recordDoubleClick?: (args: RecordDoubleClickEventArgs<T>) => void;
+    rowFocus?: (args: RowFocusEventArgs<T>) => void;
     recordClick?: (args: RecordDoubleClickEventArgs<T>) => void;
     selectionSettings?: SelectionSettings;
     isSelectionChange?: {

package/lib/table-virtuoso/InternalTable.js

@@ -92,6 +92,7 @@ const InternalTable = props => {
   const [columnResizeMode] = _react.default.useState('onChange');
   const [columnResizeDirection] = _react.default.useState('ltr');
   const [rowSelection, setRowSelection] = _react.default.useState({});
+  const pruneSelection = selectionSettings?.pruneSelection === true;
 
   // const [grouping, setGrouping] = React.useState<GroupingState>([])
 
@@ -128,6 +129,9 @@ const InternalTable = props => {
     return (0, _utils.isTreeArray)(originData);
   }, [originData]);
   _react.default.useEffect(() => {
+    if (pruneSelection) {
+      return;
+    }
     if (groupColumns && groupColumns.length > 0 && groupSetting?.client !== false && isDataOriginTree === false) {
       const abc = (0, _utils.groupArrayByColumns)(originData, groupColumns);
       const rs = (0, _utils.filterDataByColumns)(abc, filterStates, sorterStates, []);
@@ -136,9 +140,48 @@ const InternalTable = props => {
       const rs = (0, _utils.filterDataByColumns)(originData, filterStates, sorterStates, []);
       setTableData(rs);
     }
-  }, [groupColumns, originData, filterStates, sorterStates, groupSetting?.client, isDataOriginTree]);
+  }, [groupColumns, originData, filterStates, sorterStates, groupSetting?.client, isDataOriginTree, pruneSelection]);
   // }, [groupColumns, originData, filterStates, sorterStates, groupSetting?.client])
 
+  // Resolve the opt-in view before paint, including inline grouping arrays.
+  const groupColumnsKey = JSON.stringify(groupColumns ?? []);
+  const viewData = _react.default.useMemo(() => {
+    if (!pruneSelection) {
+      return tableData;
+    }
+    const groups = JSON.parse(groupColumnsKey);
+    const grouped = groups.length && groupSetting?.client !== false && !isDataOriginTree ? (0, _utils.groupArrayByColumns)(originData, groups) : originData;
+    return (0, _utils.filterDataByColumns)(grouped, filterStates, sorterStates, []);
+  }, [pruneSelection, tableData, groupColumnsKey, originData, groupSetting?.client, isDataOriginTree, filterStates, sorterStates]);
+  const effectiveRowSelection = _react.default.useMemo(() => {
+    if (!pruneSelection || props.loading) {
+      return rowSelection;
+    }
+    const ids = new Set((0, _utils.flattenArray)(viewData).map(row => String(row.rowId)));
+    const next = Object.fromEntries(Object.entries(rowSelection).filter(([selectedId, checked]) => checked && ids.has(selectedId)));
+
+    // A group can stay checked only if its remaining real children are checked.
+    const checkGroups = rows => {
+      rows.forEach(row => {
+        if (row.isGroupRow && next[String(row.rowId)]) {
+          const children = (0, _utils.flattenData)('children', row.children ?? []).filter(child => !child.isGroupRow && !selectionSettings?.getCheckboxProps?.(child)?.disabled);
+          if (!children.length || children.some(child => !next[String(child.rowId)])) {
+            delete next[String(row.rowId)];
+          }
+        }
+        if (Array.isArray(row.children)) {
+          checkGroups(row.children);
+        }
+      });
+    };
+    checkGroups(viewData);
+    return Object.keys(next).length === Object.keys(rowSelection).length ? rowSelection : next;
+  }, [pruneSelection, props.loading, rowSelection, viewData, selectionSettings?.getCheckboxProps]);
+  _react.default.useEffect(() => {
+    if (effectiveRowSelection !== rowSelection) {
+      setRowSelection(prev => prev === rowSelection ? effectiveRowSelection : prev);
+    }
+  }, [effectiveRowSelection, rowSelection]);
   _react.default.useEffect(() => {
     // setColumns(updateWidthsByOther(propsColumns, columns))
     setColumns(propsColumns);
@@ -152,8 +195,8 @@ const InternalTable = props => {
     });
   }, [t, columns, format, editAble]);
   const isDataTree = _react.default.useMemo(() => {
-    return (0, _utils.isTreeArray)(tableData);
-  }, [tableData]);
+    return (0, _utils.isTreeArray)(viewData);
+  }, [viewData]);
   const columnPinning = _react.default.useMemo(() => {
     return {
       left: (0, _utils.getFixedFields)(columns, 'left'),
@@ -213,11 +256,11 @@ const InternalTable = props => {
   };
   const table = (0, _reactTable.useReactTable)({
     _features: [_operator.OperatorFeature],
-    data: tableData,
+    data: viewData,
     // data: mergedData,
     columns: mergedColumns,
     state: {
-      rowSelection,
+      rowSelection: effectiveRowSelection,
       expanded,
       columnPinning,
       columnVisibility: columnsHiddenKeys ? (0, _utils.convertToObj)(columnsHiddenKeys) : columnVisibility,
@@ -292,20 +335,20 @@ const InternalTable = props => {
   _react.default.useEffect(() => {
     if (expandable?.preserveExpandedOnDataChange) {
       // Chờ cây có dữ liệu mới khởi tạo; những lần thay đổi tableData sau đó không reset expanded.
-      if (initializedExpansionRef.current || tableData.length === 0) {
+      if (initializedExpansionRef.current || viewData.length === 0) {
         return;
       }
       initializedExpansionRef.current = true;
     }
     if (defaultExpandAllRows) {
-      const allKeys = (0, _utils.findAllChildrenKeys2)(tableData, rowKey, 'children');
+      const allKeys = (0, _utils.findAllChildrenKeys2)(viewData, rowKey, 'children');
       setExpanded((0, _utils.convertToObjTrue)(allKeys));
     } else {
       if (defaultExpandedRowKeys) {
         setExpanded((0, _utils.convertToObjTrue)(defaultExpandedRowKeys ?? []));
       }
     }
-  }, [defaultExpandAllRows, defaultExpandedRowKeys, tableData, expandable?.preserveExpandedOnDataChange]);
+  }, [defaultExpandAllRows, defaultExpandedRowKeys, viewData, expandable?.preserveExpandedOnDataChange]);
   const triggerGroupColumns = groupedColumns => {
     // const abc = updateColumnsByGroup(columns, groupedColumns)
 
@@ -392,7 +435,7 @@ const InternalTable = props => {
     originData: originData
     // dataSource={mergedData}
     ,
-    dataSource: tableData,
+    dataSource: viewData,
     locale: locale,
     format: format
     // columns={convertColumns(mergedColumns)}
@@ -427,7 +470,7 @@ const InternalTable = props => {
     columnSizing: columnSizing,
     columnSizingInfo: columnSizingInfo,
     setColumnSizing: setColumnSizing,
-    rowSelection: rowSelection,
+    rowSelection: effectiveRowSelection,
     pagination: pagination
   })))));
 };

package/lib/table-virtuoso/body/TableBodyCell.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _rowFocus = require("../../grid-component/hooks/rowFocus");
 var _space = _interopRequireDefault(require("rc-master-ui/es/space"));
 var _utils = require("../hook/utils");
 var _Checkbox = _interopRequireDefault(require("rc-master-ui/lib/checkbox/Checkbox"));
@@ -158,6 +159,7 @@ const TableBodyCell = props => {
     id,
     prefix,
     focusedCell,
+    rowFocus,
     setFocusedCell,
     // endCell,
     // startCell,
@@ -389,6 +391,7 @@ const TableBodyCell = props => {
           colId: cell.column.id,
           rowId: nextId
         });
+        (0, _rowFocus.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) {
@@ -402,6 +405,7 @@ const TableBodyCell = props => {
           colId: cell.column.id,
           rowId: nextId
         });
+        (0, _rowFocus.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) {

package/lib/table-virtuoso/body/TableBodyCellRowGroup.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _rowFocus = require("../../grid-component/hooks/rowFocus");
 var _utils = require("../hook/utils");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireDefault(require("react"));
@@ -23,6 +24,7 @@ const TableBodyCellRowGroup = props => {
     id,
     prefix,
     focusedCell,
+    rowFocus,
     setFocusedCell,
     expanded,
     setExpanded,
@@ -104,6 +106,7 @@ const TableBodyCellRowGroup = props => {
           colId: cell.column.id,
           rowId: nextId
         });
+        (0, _rowFocus.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) {
@@ -117,6 +120,7 @@ const TableBodyCellRowGroup = props => {
           colId: cell.column.id,
           rowId: nextId
         });
+        (0, _rowFocus.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) {

package/lib/table-virtuoso/body/TableBodyRow.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _rowFocus = require("../../grid-component/hooks/rowFocus");
 var _TableBodyCell = _interopRequireDefault(require("./TableBodyCell"));
 var _reactTable = require("@tanstack/react-table");
 var _react = _interopRequireDefault(require("react"));
@@ -33,6 +34,7 @@ const TableBodyRow = ({
   const {
     prefix,
     recordDoubleClick,
+    rowFocus,
     focusedCell,
     rowClassName,
     onRowStyles,
@@ -67,7 +69,8 @@ const TableBodyRow = ({
     style: {
       ...rowStyles,
       height: rowheight
-    },
+    }
+  }, (0, _rowFocus.getRowFocusHandlers)(row.original, rowFocus), {
     onDoubleClick: e => {
       recordDoubleClick?.({
         e,

package/lib/table-virtuoso/table/Grid.js

@@ -60,16 +60,46 @@ const Grid = props => {
     setColumnSizing,
     columnFilters,
     setColumnOrder,
-    rowSelection,
     className: tableClassNames,
     ...rest
   } = props;
+  const selectedRowState = table.getState().rowSelection;
   const [isSelectionChange, setIsSelectionChange] = _react.default.useState({
     isChange: false,
     type: '',
     rowData: {},
     rowsData: []
   });
+  const rowSelectedRef = _react.default.useRef(rowSelected);
+  _react.default.useEffect(() => {
+    rowSelectedRef.current = rowSelected;
+  }, [rowSelected]);
+  const pruneSelection = selectionSettings?.pruneSelection === true;
+  const selectedViewRows = _react.default.useMemo(() => {
+    if (!pruneSelection || props.loading) {
+      return [];
+    }
+    return table.getCoreRowModel().flatRows.filter(row => !row.original.isGroupRow && selectedRowState[row.id]).map(row => row.original);
+  }, [pruneSelection, props.loading, table, dataSource, selectedRowState]);
+  const selectedViewIds = JSON.stringify(selectedViewRows.map(row => String(row.rowId)).sort());
+  const lastNotifiedSelection = _react.default.useRef(null);
+
+  // Keep event handlers in sync with the view without another state/effect.
+  const selectionChange = pruneSelection && !props.loading ? {
+    ...isSelectionChange,
+    rowsData: selectedViewRows
+  } : isSelectionChange;
+  _react.default.useEffect(() => {
+    if (!pruneSelection || props.loading || lastNotifiedSelection.current === selectedViewIds) {
+      return;
+    }
+    lastNotifiedSelection.current = selectedViewIds;
+    rowSelected?.({
+      type: isSelectionChange.isChange ? isSelectionChange.type : 'selectionPruned',
+      rowData: isSelectionChange.rowData,
+      selected: selectedViewRows
+    });
+  }, [pruneSelection, props.loading, selectedViewIds, selectedViewRows, rowSelected, isSelectionChange.isChange, isSelectionChange.type, isSelectionChange.rowData]);
   const [sorterChange, setSorterChange] = _react.default.useState(false);
   const [filterChange, setFilterChange] = _react.default.useState(false);
   const [isFullScreen, setIsFullScreen] = _react.default.useState(false);
@@ -86,18 +116,17 @@ const Grid = props => {
   // }, [mergedSelectedKeys])
 
   _react.default.useEffect(() => {
-    if (isSelectionChange.isChange) {
-      const aa = table.getState().rowSelection;
-      const ids = Object.keys(aa);
+    if (!pruneSelection && isSelectionChange.isChange) {
+      const ids = Object.keys(selectedRowState);
       const ssss = (0, _utils.filterByIds)(ids, isSelectionChange.rowsData ?? []); // lấy rowsData của trang hiện tại
 
-      rowSelected?.({
+      rowSelectedRef.current?.({
         type: isSelectionChange.type,
         rowData: isSelectionChange.rowData,
         selected: ssss.filter(x => !x.isGroupRow)
       });
     }
-  }, [isSelectionChange, rowSelection, table.getState().rowSelection]);
+  }, [isSelectionChange, selectedRowState, pruneSelection]);
   _react.default.useEffect(() => {
     if (sorterChange) {
       const aa = table.getState().sorting;
@@ -188,7 +217,7 @@ const Grid = props => {
     originData: originData,
     prefix: prefix,
     selectionSettings: selectionSettings,
-    isSelectionChange: isSelectionChange,
+    isSelectionChange: selectionChange,
     setIsSelectionChange: setIsSelectionChange,
     setSorterChange: setSorterChange,
     setFilterChange: setFilterChange,
@@ -258,7 +287,7 @@ const Grid = props => {
     originData: originData,
     prefix: prefix,
     selectionSettings: selectionSettings,
-    isSelectionChange: isSelectionChange,
+    isSelectionChange: selectionChange,
     setIsSelectionChange: setIsSelectionChange,
     setSorterChange: setSorterChange,
     setFilterChange: setFilterChange,

package/lib/table-virtuoso/table/TableContainer.js

@@ -37,6 +37,7 @@ const TableContainer = props => {
     expandable,
     wrapSettings,
     recordDoubleClick,
+    rowFocus,
     // triggerFilter,
     selectionSettings,
     isSelectionChange,
@@ -281,6 +282,7 @@ const TableContainer = props => {
       originData,
       wrapSettings,
       recordDoubleClick,
+      rowFocus,
       selectionSettings,
       isSelectionChange,
       setIsSelectionChange,

package/lib/table-virtuoso/useContext.d.ts

@@ -1,3 +1,4 @@
+import type { RowFocusEventArgs } from "../grid-component/type";
 import type { Dispatch, SetStateAction } from 'react';
 import type { ColumnTable, ExpandableConfig, IFormat, IGroupSetting, IWrapSettings, Locale, PaginationConfig, RangeState, RecordDoubleClickEventArgs, RowClassName, SelectionSettings, SourceFilter } from "../grid-component/type";
 import type { SubmitHandler } from "react-hook-form";
@@ -19,6 +20,7 @@ export interface IContext<T> {
     setExpanded: Dispatch<SetStateAction<ExpandedState>>;
     expanded: ExpandedState;
     recordDoubleClick?: (args: RecordDoubleClickEventArgs<T>) => void;
+    rowFocus?: (args: RowFocusEventArgs<T>) => void;
     selectionSettings?: SelectionSettings;
     isSelectionChange?: {
         isChange: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.9.93",
+  "version": "1.9.95",
   "description": "es-grid-template",
   "keywords": [
     "react",
@@ -47,7 +47,7 @@
     "@hookform/resolvers": "5.0.1",
     "@popperjs/core": "2.11.8",
     "@rc-component/color-picker": "2.0.1",
-    "@rc-component/father-plugin": "^2.0.1",
+    "@rc-component/father-plugin": "2.0.1",
     "@rc-component/trigger": "2.0.0",
     "@rc-component/util": "1.0.1",
     "@tanstack/react-table": "8.21.3",