es-grid-template 1.9.92 → 1.9.94

package/es/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/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/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/ali-table/pipeline/features/columnCustom.js

@@ -334,6 +334,9 @@ function columnCustom(opts) {
     //  Chức năng edit
 
     const handleEdit = (e, record, col, editType, isKeyDown, isHeader) => {
+      if (!isHeader && (!(0, _hooks.isEditable)(col, record) || rowEditable?.(record) === false)) {
+        return;
+      }
       reset?.();
       const cell = e.currentTarget;
       pipeline.setStateAtKey(_constants.stateKeyIsEditing, {
@@ -546,6 +549,9 @@ function columnCustom(opts) {
             // Không vượt quá số cột
             return;
           }
+          if (!(0, _hooks.isEditable)(leafColumns[targetCol], newData[targetRow])) {
+            return;
+          }
           const columnKey = leafColumns[targetCol].field;
           newData[targetRow] = {
             ...newData[targetRow],

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;
@@ -824,6 +828,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) {

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,
@@ -274,6 +276,7 @@ const TableBodyCellEdit = props => {
     return selectRowIds.includes(cell.row.id) && colIdss.includes(cell.column.id);
   }, [cell.column.id, cell.row.id, endCell, selectRowIds, startCell, table]);
   const editType = typeof columnMeta.editType === 'function' ? columnMeta.editType(record) : columnMeta.editType;
+  const isSelectCell = ['select', 'selectTable', 'asyncSelect', 'treeSelect'].includes(editType ?? 'text');
   const {
     rowRange,
     colRange,
@@ -832,6 +835,7 @@ const TableBodyCellEdit = props => {
           rowId: nextRowId,
           colId
         });
+        (0, _rowFocus.notifyArrowRowFocus)(table.getRow(nextRowId).original, 'arrowDown', selectionSettings?.useArrow, rowFocus);
         setStartCell?.({
           rowId: nextRowId,
           colId
@@ -870,6 +874,7 @@ const TableBodyCellEdit = props => {
           rowId: nextRowId,
           colId
         });
+        (0, _rowFocus.notifyArrowRowFocus)(table.getRow(nextRowId).original, 'arrowUp', selectionSettings?.useArrow, rowFocus);
         setStartCell?.({
           rowId: nextRowId,
           colId
@@ -1458,7 +1463,7 @@ const TableBodyCellEdit = props => {
     }, cellContent)))
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('ui-rc_cell-content', {
-      'select-cell': canEdit && ['select', 'selectTable', 'asyncSelect', 'treeSelect'].includes((0, _utils.getEditType)(columnMeta, record))
+      'select-cell': isSelectCell
     })
   }, cell.column.getIndex() === expandIconColumnIndex && isDataTree && /*#__PURE__*/_react.default.createElement("div", {
     className: "ui-rc-table-row-expand-trigger",
@@ -1496,14 +1501,14 @@ const TableBodyCellEdit = props => {
     className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-collapsed"
   })) : /*#__PURE__*/_react.default.createElement("span", {
     className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-spaced"
-  }))), cellContent, (editType === 'select' || editType === 'selectTable' || editType === 'asyncSelect' || editType === 'treeSelect') && canEdit && /*#__PURE__*/_react.default.createElement("span", {
+  }))), cellContent, isSelectCell && canEdit && /*#__PURE__*/_react.default.createElement("span", {
     className: 'caret-down',
     onClick: e => {
       handleEdit(e);
     }
   })))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('ui-rc_cell-content', {
-      'select-cell': canEdit && ['select', 'selectTable', 'asyncSelect', 'treeSelect'].includes((0, _utils.getEditType)(columnMeta, record))
+      'select-cell': isSelectCell
     })
   }, cell.column.getIndex() === expandIconColumnIndex && isDataTree && /*#__PURE__*/_react.default.createElement("div", {
     className: "ui-rc-table-row-expand-trigger",
@@ -1541,7 +1546,7 @@ const TableBodyCellEdit = props => {
     className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-collapsed"
   })) : /*#__PURE__*/_react.default.createElement("span", {
     className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-spaced"
-  }))), cellContent, (editType === 'select' || editType === 'selectTable' || editType === 'asyncSelect' || editType === 'treeSelect') && canEdit && /*#__PURE__*/_react.default.createElement("span", {
+  }))), cellContent, isSelectCell && canEdit && /*#__PURE__*/_react.default.createElement("span", {
     className: 'caret-down',
     onClick: e => {
       handleEdit(e);