es-grid-template 1.9.93 → 1.9.95

package/es/table-virtuoso/InternalTable.js

@@ -8,7 +8,7 @@ import 'dayjs/locale/vi';
 import { faker } from '@faker-js/faker';
 import useMergedState from "rc-util/es/hooks/useMergedState";
 import { getCoreRowModel, getExpandedRowModel, getGroupedRowModel, getPaginationRowModel, useReactTable } from '@tanstack/react-table';
-import { addRowIdArray, convertFlatColumn1, convertToObj, convertToObjTrue, filterDataByColumns, findAllChildrenKeys2, flatColumns2, getAllRowKey, getDiffent2Array, getFixedFields, getInvisibleColumns, groupArrayByColumns, isTreeArray, removeKeys } from "./hook/utils";
+import { addRowIdArray, convertFlatColumn1, convertToObj, convertToObjTrue, filterDataByColumns, findAllChildrenKeys2, flattenArray, flattenData, flatColumns2, getAllRowKey, getDiffent2Array, getFixedFields, getInvisibleColumns, groupArrayByColumns, isTreeArray, removeKeys } from "./hook/utils";
 // import { convertToTanStackColumns } from './hook/useColumns'
 import { removeInvisibleColumns } from "../grid-component/hooks";
 import Grid from "./table/Grid";
@@ -82,6 +82,7 @@ const InternalTable = props => {
   const [columnResizeMode] = React.useState('onChange');
   const [columnResizeDirection] = React.useState('ltr');
   const [rowSelection, setRowSelection] = React.useState({});
+  const pruneSelection = selectionSettings?.pruneSelection === true;
 
   // const [grouping, setGrouping] = React.useState<GroupingState>([])
 
@@ -118,6 +119,9 @@ const InternalTable = props => {
     return isTreeArray(originData);
   }, [originData]);
   React.useEffect(() => {
+    if (pruneSelection) {
+      return;
+    }
     if (groupColumns && groupColumns.length > 0 && groupSetting?.client !== false && isDataOriginTree === false) {
       const abc = groupArrayByColumns(originData, groupColumns);
       const rs = filterDataByColumns(abc, filterStates, sorterStates, []);
@@ -126,9 +130,48 @@ const InternalTable = props => {
       const rs = 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.useMemo(() => {
+    if (!pruneSelection) {
+      return tableData;
+    }
+    const groups = JSON.parse(groupColumnsKey);
+    const grouped = groups.length && groupSetting?.client !== false && !isDataOriginTree ? groupArrayByColumns(originData, groups) : originData;
+    return filterDataByColumns(grouped, filterStates, sorterStates, []);
+  }, [pruneSelection, tableData, groupColumnsKey, originData, groupSetting?.client, isDataOriginTree, filterStates, sorterStates]);
+  const effectiveRowSelection = React.useMemo(() => {
+    if (!pruneSelection || props.loading) {
+      return rowSelection;
+    }
+    const ids = new Set(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 = 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.useEffect(() => {
+    if (effectiveRowSelection !== rowSelection) {
+      setRowSelection(prev => prev === rowSelection ? effectiveRowSelection : prev);
+    }
+  }, [effectiveRowSelection, rowSelection]);
   React.useEffect(() => {
     // setColumns(updateWidthsByOther(propsColumns, columns))
     setColumns(propsColumns);
@@ -142,8 +185,8 @@ const InternalTable = props => {
     });
   }, [t, columns, format, editAble]);
   const isDataTree = React.useMemo(() => {
-    return isTreeArray(tableData);
-  }, [tableData]);
+    return isTreeArray(viewData);
+  }, [viewData]);
   const columnPinning = React.useMemo(() => {
     return {
       left: getFixedFields(columns, 'left'),
@@ -203,11 +246,11 @@ const InternalTable = props => {
   };
   const table = useReactTable({
     _features: [OperatorFeature],
-    data: tableData,
+    data: viewData,
     // data: mergedData,
     columns: mergedColumns,
     state: {
-      rowSelection,
+      rowSelection: effectiveRowSelection,
       expanded,
       columnPinning,
       columnVisibility: columnsHiddenKeys ? convertToObj(columnsHiddenKeys) : columnVisibility,
@@ -282,20 +325,20 @@ const InternalTable = props => {
   React.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 = findAllChildrenKeys2(tableData, rowKey, 'children');
+      const allKeys = findAllChildrenKeys2(viewData, rowKey, 'children');
       setExpanded(convertToObjTrue(allKeys));
     } else {
       if (defaultExpandedRowKeys) {
         setExpanded(convertToObjTrue(defaultExpandedRowKeys ?? []));
       }
     }
-  }, [defaultExpandAllRows, defaultExpandedRowKeys, tableData, expandable?.preserveExpandedOnDataChange]);
+  }, [defaultExpandAllRows, defaultExpandedRowKeys, viewData, expandable?.preserveExpandedOnDataChange]);
   const triggerGroupColumns = groupedColumns => {
     // const abc = updateColumnsByGroup(columns, groupedColumns)
 
@@ -382,7 +425,7 @@ const InternalTable = props => {
     originData: originData
     // dataSource={mergedData}
     ,
-    dataSource: tableData,
+    dataSource: viewData,
     locale: locale,
     format: format
     // columns={convertColumns(mergedColumns)}
@@ -417,7 +460,7 @@ const InternalTable = props => {
     columnSizing: columnSizing,
     columnSizingInfo: columnSizingInfo,
     setColumnSizing: setColumnSizing,
-    rowSelection: rowSelection,
+    rowSelection: effectiveRowSelection,
     pagination: pagination
   })))));
 };

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

@@ -1,3 +1,4 @@
+import { notifyArrowRowFocus } from "../../grid-component/hooks/rowFocus";
 import Space from "rc-master-ui/es/space";
 import { getCommonPinningStyles, getFormat } from "../hook/utils";
 import Checkbox from "rc-master-ui/es/checkbox/Checkbox";
@@ -151,6 +152,7 @@ const TableBodyCell = props => {
     id,
     prefix,
     focusedCell,
+    rowFocus,
     setFocusedCell,
     // endCell,
     // startCell,
@@ -382,6 +384,7 @@ const TableBodyCell = props => {
           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) {
@@ -395,6 +398,7 @@ const TableBodyCell = props => {
           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) {

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

@@ -1,3 +1,4 @@
+import { notifyArrowRowFocus } from "../../grid-component/hooks/rowFocus";
 import { getCommonPinningStyles } from "../hook/utils";
 import classNames from "classnames";
 import React from "react";
@@ -16,6 +17,7 @@ const TableBodyCellRowGroup = props => {
     id,
     prefix,
     focusedCell,
+    rowFocus,
     setFocusedCell,
     expanded,
     setExpanded,
@@ -97,6 +99,7 @@ const TableBodyCellRowGroup = props => {
           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) {
@@ -110,6 +113,7 @@ const TableBodyCellRowGroup = props => {
           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) {

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

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import { getRowFocusHandlers } from "../../grid-component/hooks/rowFocus";
 import TableBodyCell from "./TableBodyCell";
 import { flexRender } from "@tanstack/react-table";
 import React from "react";
@@ -26,6 +27,7 @@ const TableBodyRow = ({
   const {
     prefix,
     recordDoubleClick,
+    rowFocus,
     focusedCell,
     rowClassName,
     onRowStyles,
@@ -60,7 +62,8 @@ const TableBodyRow = ({
     style: {
       ...rowStyles,
       height: rowheight
-    },
+    }
+  }, getRowFocusHandlers(row.original, rowFocus), {
     onDoubleClick: e => {
       recordDoubleClick?.({
         e,

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

@@ -51,16 +51,46 @@ const Grid = props => {
     setColumnSizing,
     columnFilters,
     setColumnOrder,
-    rowSelection,
     className: tableClassNames,
     ...rest
   } = props;
+  const selectedRowState = table.getState().rowSelection;
   const [isSelectionChange, setIsSelectionChange] = React.useState({
     isChange: false,
     type: '',
     rowData: {},
     rowsData: []
   });
+  const rowSelectedRef = React.useRef(rowSelected);
+  React.useEffect(() => {
+    rowSelectedRef.current = rowSelected;
+  }, [rowSelected]);
+  const pruneSelection = selectionSettings?.pruneSelection === true;
+  const selectedViewRows = React.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.useRef(null);
+
+  // Keep event handlers in sync with the view without another state/effect.
+  const selectionChange = pruneSelection && !props.loading ? {
+    ...isSelectionChange,
+    rowsData: selectedViewRows
+  } : isSelectionChange;
+  React.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.useState(false);
   const [filterChange, setFilterChange] = React.useState(false);
   const [isFullScreen, setIsFullScreen] = React.useState(false);
@@ -77,18 +107,17 @@ const Grid = props => {
   // }, [mergedSelectedKeys])
 
   React.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 = 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.useEffect(() => {
     if (sorterChange) {
       const aa = table.getState().sorting;
@@ -179,7 +208,7 @@ const Grid = props => {
     originData: originData,
     prefix: prefix,
     selectionSettings: selectionSettings,
-    isSelectionChange: isSelectionChange,
+    isSelectionChange: selectionChange,
     setIsSelectionChange: setIsSelectionChange,
     setSorterChange: setSorterChange,
     setFilterChange: setFilterChange,
@@ -249,7 +278,7 @@ const Grid = props => {
     originData: originData,
     prefix: prefix,
     selectionSettings: selectionSettings,
-    isSelectionChange: isSelectionChange,
+    isSelectionChange: selectionChange,
     setIsSelectionChange: setIsSelectionChange,
     setSorterChange: setSorterChange,
     setFilterChange: setFilterChange,

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

@@ -29,6 +29,7 @@ const TableContainer = props => {
     expandable,
     wrapSettings,
     recordDoubleClick,
+    rowFocus,
     // triggerFilter,
     selectionSettings,
     isSelectionChange,
@@ -273,6 +274,7 @@ const TableContainer = props => {
       originData,
       wrapSettings,
       recordDoubleClick,
+      rowFocus,
       selectionSettings,
       isSelectionChange,
       setIsSelectionChange,

package/es/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/lib/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/lib/grid-component/hooks/rowFocus.d.ts

@@ -0,0 +1,11 @@
+import type { 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. */
+export declare function getRowFocusHandlers<T>(rowData: T, rowFocus?: RowFocus<T>): {
+    onClickCapture: (event: MouseEvent<HTMLElement>) => void;
+    onContextMenuCapture: (event: MouseEvent<HTMLElement>) => void;
+};
+/** 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 {};

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

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getRowFocusHandlers = getRowFocusHandlers;
+exports.notifyArrowRowFocus = notifyArrowRowFocus;
+/** Capture clicks even when a cell handles the event itself. */
+function getRowFocusHandlers(rowData, rowFocus) {
+  return {
+    onClickCapture: event => {
+      if (event.button === 0) rowFocus?.({
+        rowData,
+        method: 'mouseLeftClick'
+      });
+    },
+    onContextMenuCapture: event => {
+      if (event.button === 2) rowFocus?.({
+        rowData,
+        method: 'mouseRightClick'
+      });
+    }
+  };
+}
+
+/** Notify arrow focus without changing the existing navigation or selection. */
+function notifyArrowRowFocus(rowData, method, useArrow, rowFocus) {
+  if (useArrow === true) rowFocus?.({
+    rowData,
+    method
+  });
+}

package/lib/grid-component/index.d.ts

@@ -1,5 +1,5 @@
 import TempTable from './TempTable';
-import type { ColumnsTable, TableProps, ColumnTable, CommandItem, ContextMenuItem } from './type';
+import type { ColumnsTable, TableProps, ColumnTable, CommandItem, ContextMenuItem, RowFocusEventArgs } from './type';
 import type { ToolbarItem } from "rc-master-ui/es/toolbar";
-export type { ColumnsTable, TableProps, ColumnTable, ToolbarItem, CommandItem, ContextMenuItem };
+export type { ColumnsTable, TableProps, ColumnTable, ToolbarItem, CommandItem, ContextMenuItem, RowFocusEventArgs };
 export default TempTable;

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

@@ -451,6 +451,8 @@ export type TableProps<RecordType = AnyObject> = {
     recordDoubleClick?: (args: RecordDoubleClickEventArgs<RecordType>) => void;
     /** Click vào row */
     recordClick?: (args: RecordDoubleClickEventArgs<RecordType>) => void;
+    /** Notify mouse clicks or enabled arrow-key navigation independently of row selection. */
+    rowFocus?: (args: RowFocusEventArgs<RecordType>) => void;
     /** Filter */
     /** Hiển thị filter nâng cao */
     showAdvanceFilter?: boolean;
@@ -789,6 +791,8 @@ export type IWrapSettings = {
     wrapMode?: IWrapMode;
 };
 export type SelectionSettings<T = AnyObject> = {
+    /** Invoke rowFocus on ArrowUp/ArrowDown. Defaults to false. */
+    useArrow?: boolean;
     mode?: 'checkbox' | 'radio';
     type?: 'single' | 'multiple';
     checkboxOnly?: boolean;
@@ -796,6 +800,8 @@ export type SelectionSettings<T = AnyObject> = {
     checkedStrategy?: 'all' | 'parent' | 'child';
     columnWidth?: number;
     hideSelectAll?: boolean;
+    /** When true, keep selection only for records in the current filtered data view. Default: false. */
+    pruneSelection?: boolean;
     selectedRowKeys?: Key[];
     defaultSelectedRowKeys?: Key[];
     getCheckboxProps?: (record: T) => Partial<Omit<CheckboxProps, 'checked' | 'defaultChecked'>>;
@@ -824,6 +830,10 @@ export type RowSelection<T> = {
     checkboxOnly?: boolean;
     arrowKey?: boolean;
 };
+export type RowFocusEventArgs<RecordType> = {
+    rowData: RecordType;
+    method: 'mouseLeftClick' | 'mouseRightClick' | 'arrowUp' | 'arrowDown';
+};
 export type RecordDoubleClickEventArgs<RecordType> = {
     rowData: RecordType;
     rowIndex: number | undefined;

package/lib/group-component/TableContainer.js

@@ -38,6 +38,7 @@ const TableContainer = props => {
     expandable,
     wrapSettings,
     recordDoubleClick,
+    rowFocus,
     // triggerFilter,
     selectionSettings,
     isSelectionChange,
@@ -325,6 +326,7 @@ const TableContainer = props => {
       // triggerFilter,
       wrapSettings,
       recordDoubleClick,
+      rowFocus,
       selectionSettings,
       isSelectionChange,
       setIsSelectionChange,

package/lib/group-component/TableContainerEdit.js

@@ -86,6 +86,7 @@ const TableContainerEdit = props => {
     expandable,
     wrapSettings,
     recordDoubleClick,
+    rowFocus,
     // triggerFilter,
     selectionSettings,
     isSelectionChange,
@@ -2213,6 +2214,7 @@ const TableContainerEdit = props => {
       originData,
       wrapSettings,
       recordDoubleClick,
+      rowFocus,
       selectionSettings: {
         ...selectionSettings,
         checkboxOnly: true

package/lib/group-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");
@@ -164,6 +165,7 @@ const TableBodyCell = props => {
     id,
     prefix,
     focusedCell,
+    rowFocus,
     setFocusedCell,
     // endCell,
     // startCell,
@@ -462,6 +464,7 @@ const TableBodyCell = props => {
           colId: cell.column.id,
           rowId: nextId
         });
+        (0, _rowFocus.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) {
@@ -475,6 +478,7 @@ const TableBodyCell = props => {
           colId: cell.column.id,
           rowId: nextId
         });
+        (0, _rowFocus.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) {

package/lib/group-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");
@@ -202,6 +203,7 @@ const TableBodyCellEdit = props => {
     editingKey,
     prefix,
     focusedCell,
+    rowFocus,
     rangeState,
     setFocusedCell,
     setEditingKey,
@@ -810,6 +812,7 @@ const TableBodyCellEdit = props => {
           rowId: nextRowId,
           colId
         });
+        (0, _rowFocus.notifyArrowRowFocus)(table.getRow(nextRowId).original, 'arrowDown', selectionSettings?.useArrow, rowFocus);
         setStartCell?.({
           rowId: nextRowId,
           colId
@@ -857,6 +860,7 @@ const TableBodyCellEdit = props => {
           rowId: nextRowId,
           colId
         });
+        (0, _rowFocus.notifyArrowRowFocus)(table.getRow(nextRowId).original, 'arrowUp', selectionSettings?.useArrow, rowFocus);
         setStartCell?.({
           rowId: nextRowId,
           colId

package/lib/group-component/body/TableBodyCellEmpty.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"));
@@ -22,6 +23,7 @@ const TableBodyCellEmpty = props => {
     id,
     prefix,
     focusedCell,
+    rowFocus,
     setFocusedCell,
     setIsSelectionChange,
     isSelectionChange,
@@ -107,6 +109,7 @@ const TableBodyCellEmpty = 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) {
@@ -120,6 +123,7 @@ const TableBodyCellEmpty = 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/group-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"));
@@ -35,6 +36,7 @@ const TableBodyRow = ({
   const {
     prefix,
     recordDoubleClick,
+    rowFocus,
     focusedCell,
     rowClassName,
     rowEditable,
@@ -60,7 +62,7 @@ const TableBodyRow = ({
   const rowClass = typeof rowClassName === 'function' ? rowClassName(row.original, row.index, row.depth) : rowClassName;
   const rowStyles = typeof onRowStyles === 'function' ? onRowStyles(row.original, row) : onRowStyles;
   const isRowEditable = rowEditable ? rowEditable(row.original) : true;
-  return /*#__PURE__*/_react.default.createElement("div", {
+  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
@@ -86,7 +88,8 @@ const TableBodyRow = ({
       height: isEditing ? virtualRow.size : undefined,
       minHeight: isEditing ? undefined : virtualRow.size,
       ...rowStyles
-    },
+    }
+  }, (0, _rowFocus.getRowFocusHandlers)(row.original, rowFocus), {
     onDoubleClick: e => {
       recordDoubleClick?.({
         e,
@@ -110,7 +113,7 @@ const TableBodyRow = ({
         field: colKey
       })(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 (row.subRows && row.subRows.length === 0 && groupColumns?.includes(cell.column.id)) {
       return /*#__PURE__*/_react.default.createElement(_TableBodyCellEmpty.default, (0, _extends2.default)({}, rest, {

package/lib/group-component/body/TableBodyRowGroupCell.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");
@@ -164,6 +165,7 @@ const TableBodyCell = props => {
     id,
     prefix,
     focusedCell,
+    rowFocus,
     setFocusedCell,
     // endCell,
     // startCell,
@@ -442,6 +444,7 @@ const TableBodyCell = props => {
           colId: cell.column.id,
           rowId: nextId
         });
+        (0, _rowFocus.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) {
@@ -455,6 +458,7 @@ const TableBodyCell = props => {
           colId: cell.column.id,
           rowId: nextId
         });
+        (0, _rowFocus.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) {