es-grid-template 1.8.71 → 1.8.73

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

@@ -0,0 +1,259 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _classnames = _interopRequireDefault(require("classnames"));
+var _TableHead = _interopRequireDefault(require("../header/TableHead"));
+var _TableBody = _interopRequireDefault(require("../body/TableBody"));
+var _TableFooter = _interopRequireDefault(require("../footer/TableFooter"));
+var _LoadingSpinner = _interopRequireDefault(require("../../grid-component/LoadingSpinner"));
+var _reactTooltip = require("react-tooltip");
+var _ContextMenu = _interopRequireDefault(require("../ContextMenu"));
+var _react = _interopRequireWildcard(require("react"));
+var _useContext = require("../useContext");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const TableWrapper = props => {
+  const {
+    id,
+    prefix,
+    tableContainerRef,
+    height,
+    minHeight,
+    summary,
+    table,
+    loading,
+    commandClick,
+    editAble,
+    contextMenuItems: propContextMenuItems,
+    contextMenuHidden,
+    showEmptyText,
+    contextMenuClick,
+    contextMenuOpen,
+    next,
+    dataSource,
+    pagination,
+    infiniteScroll,
+    columnVirtualizer,
+    fixedLeftColumns,
+    fixedRightColumns,
+    virtualPaddingLeft,
+    virtualPaddingRight
+  } = props;
+  const menuRef = _react.default.useRef(null);
+  const loadingRef = _react.default.useRef(false);
+  const hasMoreRef = _react.default.useRef(true);
+  const {
+    windowSize
+  } = (0, _react.useContext)(_useContext.TableContext);
+  const {
+    currentPage,
+    pageSize,
+    total
+  } = pagination ?? {};
+  const [menuVisible, setMenuVisible] = _react.default.useState(false);
+  const [selectedRowData, setSelectedRowData] = _react.default.useState(null);
+  const [position, setPosition] = _react.default.useState({
+    x: 0,
+    y: 0,
+    viewportWidth: windowSize.innerWidth,
+    viewportHeight: windowSize.innerHeight
+  });
+  const contextMenuItems = _react.default.useMemo(() => {
+    if (typeof contextMenuHidden === 'function' && propContextMenuItems && selectedRowData) {
+      const hiddenItems = contextMenuHidden({
+        rowInfo: {
+          rowData: selectedRowData
+        }
+      });
+      return propContextMenuItems.filter(item => !hiddenItems.includes(item?.key));
+    }
+    if (contextMenuHidden && typeof contextMenuHidden !== 'function' && propContextMenuItems) {
+      return propContextMenuItems.filter(item => !contextMenuHidden.includes(item?.key));
+    }
+    return propContextMenuItems;
+  }, [propContextMenuItems, contextMenuHidden, selectedRowData]);
+  const loadData = page => {
+    if (!hasMoreRef.current || loadingRef.current || loading) return;
+    loadingRef.current = true;
+    setTimeout(() => {
+      next?.();
+      if (page * pageSize >= total) {
+        hasMoreRef.current = false;
+      }
+      loadingRef.current = false;
+    }, 10);
+  };
+  const handleNext = () => {
+    loadData(currentPage + 1);
+  };
+  const handleScroll = e => {
+    if (infiniteScroll) {
+      if (loadingRef.current || loading || dataSource?.length === 0) {
+        e.stopPropagation();
+        e.preventDefault();
+        return;
+      }
+      const {
+        scrollHeight: tbScrollHeight,
+        scrollTop,
+        clientHeight
+      } = e.currentTarget;
+      const isEnd = scrollTop + clientHeight >= tbScrollHeight - 50;
+      if (isEnd && !loadingRef.current && hasMoreRef.current && dataSource?.length > 0) {
+        handleNext();
+      }
+    }
+    if (e.target.scrollLeft >= 0 && e.target.scrollLeft + e.target.clientWidth < e.target.scrollWidth) {
+      e.target.classList.add('ui-rc-table-ping-right');
+    } else {
+      e.target.classList.remove('ui-rc-table-ping-right');
+    }
+    if ((e.target.scrollLeft ?? 0) > 0) {
+      e.target.classList.add('ui-rc-table-ping-left');
+    } else {
+      e.target.classList.remove('ui-rc-table-ping-left');
+    }
+  };
+  const onContextMenu = data => event => {
+    event.preventDefault(); // Ngăn chặn menu mặc định của trình duyệt
+
+    setSelectedRowData(data);
+    contextMenuOpen?.({
+      rowInfo: {
+        rowData: data
+      },
+      event
+    });
+    setMenuVisible(true);
+
+    // Đợi DOM cập nhật và lấy kích thước menu
+    setTimeout(() => {
+      const menuElement = menuRef.current; // Lấy menu từ DOM
+      const menuWidth = menuElement?.offsetWidth || 200; // Mặc định 200px nếu chưa render
+      const menuHeight = menuElement?.offsetHeight; // Mặc định 450px nếu chưa render
+
+      // Điều chỉnh vị trí menu
+      let x = event.clientX;
+      let y = event.clientY;
+      if (x + menuWidth > windowSize.innerWidth) {
+        x = x - menuWidth - 10; // Cách cạnh phải 10px
+      }
+      if (y + menuHeight > windowSize.innerHeight) {
+        if (y < menuHeight) {
+          y = 10;
+        } else {
+          y = y - 10 - menuHeight; // Cách cạnh dưới 10px
+        }
+      }
+      setPosition(prevState => ({
+        ...prevState,
+        x,
+        y
+      }));
+    }, 100);
+    if (!menuVisible) {
+      document.addEventListener(`click`, function onClickOutside(e) {
+        const element = e.target;
+        const menuContainer = document.querySelector('.popup-context-menu');
+        const isInsideContainer = element.closest('.popup-context-menu') && menuContainer;
+        if (isInsideContainer) {
+          return;
+        }
+        setMenuVisible(false);
+        setPosition(prevState => ({
+          ...prevState,
+          x: undefined,
+          y: undefined
+        }));
+        document.removeEventListener(`click`, onClickOutside);
+      });
+    }
+  };
+  return /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      position: 'relative'
+    },
+    className: (0, _classnames.default)(`${prefix}-grid-container`, {
+      'ui-rc-table-ping-right': tableContainerRef && (tableContainerRef.current?.scrollLeft ?? 0) >= 0 && (tableContainerRef.current?.scrollLeft ?? 0) + (tableContainerRef.current?.clientWidth ?? 0) < (tableContainerRef.current?.scrollWidth ?? 0),
+      'ui-rc-table-ping-left': tableContainerRef && (tableContainerRef.current?.scrollLeft ?? 0) > 0
+    })
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    // id={id}
+    ref: tableContainerRef,
+    style: {
+      overflow: 'auto',
+      //our scrollable table container
+      position: 'relative',
+      //needed for sticky header
+      maxHeight: height,
+      //should be a fixed height
+      minHeight: minHeight ? height : undefined //should be a fixed height
+    }
+    // onScroll={infiniteScroll ? handleScroll : undefined}
+    ,
+    onScroll: handleScroll
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      display: 'grid',
+      minWidth: table.getTotalSize()
+    }
+  }, /*#__PURE__*/_react.default.createElement(_TableHead.default, {
+    tableContainerRef: tableContainerRef,
+    table: table,
+    columnVirtualizer: columnVirtualizer,
+    virtualPaddingLeft: virtualPaddingLeft,
+    virtualPaddingRight: virtualPaddingRight,
+    fixedLeftColumns: fixedLeftColumns,
+    fixedRightColumns: fixedRightColumns
+  }), /*#__PURE__*/_react.default.createElement(_TableBody.default, {
+    tableId: id,
+    table: table,
+    tableContainerRef: tableContainerRef,
+    commandClick: commandClick,
+    editAble: editAble,
+    contextMenuItems: contextMenuItems,
+    showEmptyText: showEmptyText,
+    onContextMenu: onContextMenu,
+    columnVirtualizer: columnVirtualizer,
+    virtualPaddingLeft: virtualPaddingLeft,
+    virtualPaddingRight: virtualPaddingRight,
+    fixedLeftColumns: fixedLeftColumns,
+    fixedRightColumns: fixedRightColumns
+  }), summary && /*#__PURE__*/_react.default.createElement(_TableFooter.default
+  // columnVirtualizer={columnVirtualizer}
+  , {
+    table: table
+    // virtualPaddingLeft={virtualPaddingLeft}
+    // virtualPaddingRight={virtualPaddingRight}
+    // fixedLeftColumns={fixedLeftColumns}
+    // fixedRightColumns={fixedRightColumns}
+  }))), loading && /*#__PURE__*/_react.default.createElement("div", {
+    className: "spinner-loading"
+  }, /*#__PURE__*/_react.default.createElement(_LoadingSpinner.default, null)), /*#__PURE__*/_react.default.createElement(_reactTooltip.Tooltip, {
+    id: `${id}-tooltip-content`,
+    style: {
+      zIndex: 1999,
+      maxWidth: 450
+    },
+    delayShow: 100
+  }), /*#__PURE__*/_react.default.createElement(_reactTooltip.Tooltip, {
+    id: `${id}-tooltip-error`,
+    style: {
+      zIndex: 1999,
+      maxWidth: 450
+    }
+  }), menuVisible && /*#__PURE__*/_react.default.createElement(_ContextMenu.default, {
+    open: menuVisible,
+    pos: position,
+    setOpen: setMenuVisible,
+    menuRef: menuRef,
+    contextMenuItems: contextMenuItems,
+    contextMenuClick: contextMenuClick,
+    rowData: selectedRowData
+  }));
+};
+var _default = exports.default = TableWrapper;

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

@@ -0,0 +1,100 @@
+import type { Dispatch, SetStateAction } from 'react';
+import type { ColumnTable, ExpandableConfig, IFormat, IWrapSettings, Locale, PaginationConfig, RangeState, RecordDoubleClickEventArgs, RowClassName, SelectionSettings, SourceFilter } from "./../grid-component/type";
+import type { SubmitHandler } from "react-hook-form";
+import type { ExpandedState, Row, Table } from '@tanstack/react-table';
+export type IPositionCell = {
+    rowId: string;
+    colId: string;
+} | undefined;
+export interface IContext<T> {
+    t?: any;
+    prefix: string;
+    id: string;
+    rowKey: string;
+    originData: any[];
+    dataSource: any[];
+    format?: IFormat;
+    expandable?: ExpandableConfig<T>;
+    wrapSettings?: IWrapSettings;
+    setExpanded: Dispatch<SetStateAction<ExpandedState>>;
+    expanded: ExpandedState;
+    recordDoubleClick?: (args: RecordDoubleClickEventArgs<T>) => void;
+    selectionSettings?: SelectionSettings;
+    isSelectionChange?: {
+        isChange: boolean;
+        type: string;
+        rowData: T;
+        rowsData: T[];
+    };
+    setIsSelectionChange: Dispatch<SetStateAction<{
+        isChange: boolean;
+        type: string;
+        rowData: T;
+        rowsData: T[];
+    }>>;
+    setSorterChange: Dispatch<SetStateAction<boolean>>;
+    setFilterChange: Dispatch<SetStateAction<boolean>>;
+    onContextMenu?: (data: T) => (event: any) => void;
+    locale?: Locale;
+    windowSize: {
+        innerHeight: number;
+        innerWidth: number;
+    };
+    control?: any;
+    errors?: any;
+    handleSubmit?: any;
+    onSubmit?: SubmitHandler<any>;
+    getValues?: any;
+    reset?: any;
+    setValue?: any;
+    handleCellChange?: (args: ContextCellChange) => void;
+    handleCellChangeAndAddRow?: (args: ContextCellChange) => void;
+    editingKey?: string;
+    setEditingKey?: Dispatch<SetStateAction<string>>;
+    rangeState?: RangeState;
+    setRangeState?: Dispatch<SetStateAction<RangeState | undefined>>;
+    rangePasteState?: RangeState;
+    setRangePasteState?: Dispatch<SetStateAction<RangeState | undefined>>;
+    startCell?: IPositionCell;
+    setStartCell?: Dispatch<SetStateAction<IPositionCell | undefined>>;
+    endCell?: IPositionCell;
+    setEndCell?: Dispatch<SetStateAction<IPositionCell | undefined>>;
+    startPasteCell?: IPositionCell;
+    setStartPasteCell?: Dispatch<SetStateAction<IPositionCell | undefined>>;
+    endPasteCell?: IPositionCell;
+    setEndPasteCell?: Dispatch<SetStateAction<IPositionCell | undefined>>;
+    isSelecting?: boolean;
+    setIsSelecting?: Dispatch<SetStateAction<boolean>>;
+    isPasting?: boolean;
+    setIsPasting?: Dispatch<SetStateAction<boolean>>;
+    focusedCell?: IPositionCell;
+    setFocusedCell?: Dispatch<SetStateAction<IPositionCell | undefined>>;
+    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[], copyRows: T[]) => void;
+    handleDeleteContent?: () => void;
+    handleAddMulti?: (item: any, n: number, id?: string) => void;
+    dataErrors?: any[];
+    isDataTree: boolean;
+    handleCellClick?: (rowNumber: number, record: T, column: ColumnTable, rowId: string, cellValue: any) => void;
+    pagination?: false | PaginationConfig;
+    rowClassName?: string | RowClassName<T>;
+    table?: Table<T>;
+    rowEditable?: (rowData: T) => boolean;
+    onRowStyles?: Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'> | ((data: T, row: Row<T>) => Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'>);
+    onRowHeaderStyles?: Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'> | (() => Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'>);
+    onRowFooterStyles?: Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'> | (() => Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'>);
+    dataSourceFilter?: SourceFilter[];
+    groupColumns?: string[];
+}
+export declare const TableContext: import("react").Context<IContext<any>>;
+export type ContextCellChange = {
+    key: string;
+    record: any;
+    field: string;
+    option: any;
+    indexRow: number;
+    indexCol: number;
+    newState?: any;
+    prevState?: any;
+    type: 'enter' | 'blur' | 'outClick';
+    addNewRow?: boolean;
+};

package/lib/group-component/useContext.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TableContext = void 0;
+var _react = require("react");
+const TableContext = exports.TableContext = /*#__PURE__*/(0, _react.createContext)({
+  prefix: 'ui-rc',
+  id: '',
+  isDataTree: false,
+  rowKey: 'rowId',
+  dataSource: [],
+  originData: [],
+  expanded: {},
+  windowSize: {
+    innerHeight: 0,
+    innerWidth: 0
+  },
+  // triggerFilter: () => { },
+
+  setIsSelectionChange: () => {},
+  setSorterChange: () => {},
+  setFilterChange: () => {},
+  setExpanded: () => {},
+  handleCellClick: () => {}
+});

package/lib/table-component/InternalTable.js

@@ -39,6 +39,7 @@ const InternalTable = props => {
     selectionSettings,
     expandable,
     onChooseColumns,
+    onExpandClick,
     // contextMenuClick,
     // contextMenuOpen,
     height,
@@ -77,6 +78,7 @@ const InternalTable = props => {
   const [sorterStates, setSorterStates] = _react.default.useState([]);
   const [isFullScreen, setIsFullScreen] = _react.default.useState(false);
   const [columns, setColumns] = _react.default.useState([]);
+  const [isExpandClick, setIsExpandClick] = _react.default.useState(false);
   _react.default.useEffect(() => {
     // setColumns(propsColumns as any)
 
@@ -114,6 +116,9 @@ const InternalTable = props => {
     value: undefined
   });
   _react.default.useEffect(() => {
+    if (onExpandClick || isExpandClick) {
+      return;
+    }
     if (defaultExpandAllRows) {
       const allKeys = (0, _utils.findAllChildrenKeys2)(convertData, rowKey, 'children');
       setExpanded((0, _utils.convertToObjTrue)(allKeys));
@@ -122,7 +127,7 @@ const InternalTable = props => {
         setExpanded((0, _utils.convertToObjTrue)(defaultExpandedRowKeys ?? []));
       }
     }
-  }, [defaultExpandAllRows, convertData, defaultExpandedRowKeys]);
+  }, [defaultExpandAllRows, convertData, defaultExpandedRowKeys, onExpandClick, isExpandClick]);
 
   // ========================= Keys =========================
 
@@ -190,7 +195,9 @@ const InternalTable = props => {
     selectionSettings: selectionSettings,
     mergedSelectedKeys: mergedSelectedKeys,
     expandable: expandable,
-    setColumns: setColumns
+    onExpandClick: onExpandClick,
+    setColumns: setColumns,
+    setIsExpandClick: setIsExpandClick
   })));
 };
 var _default = exports.default = InternalTable;

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

@@ -41,6 +41,7 @@ type TableContainerProps<T> = Omit<TableProps<T>, 'columns'> & {
     isDataTree: boolean;
     setColumnSizing: Dispatch<SetStateAction<any>>;
     setColumns: Dispatch<SetStateAction<any>>;
+    setIsExpandClick: Dispatch<SetStateAction<boolean>>;
     columnSizingInfo: ColumnSizingInfoState;
     columnSizing: ColumnSizingState;
 };

package/lib/table-component/TableContainer.js

@@ -76,7 +76,9 @@ const TableContainer = props => {
     onRowFooterStyles,
     onRowHeaderStyles,
     title,
-    dataSourceFilter
+    dataSourceFilter,
+    onExpandClick,
+    setIsExpandClick
   } = props;
   const tableContainerRef = _react.default.useRef(null);
   const containerRef = _react.default.useRef(null);
@@ -279,7 +281,9 @@ const TableContainer = props => {
       onRowHeaderStyles,
       table,
       pagination,
-      dataSourceFilter
+      dataSourceFilter,
+      onExpandClick,
+      setIsExpandClick
     }
   }, /*#__PURE__*/_react.default.createElement(_TableWrapper.default, {
     contextMenuItems: contextMenuItems,

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

@@ -42,6 +42,7 @@ type TableContainerProps<T> = Omit<TableProps<T>, 'columns'> & {
     setColumns: Dispatch<SetStateAction<any>>;
     columnSizingInfo: ColumnSizingInfoState;
     columnSizing: ColumnSizingState;
+    setIsExpandClick: Dispatch<SetStateAction<boolean>>;
 };
 declare const TableContainerEdit: <RecordType extends object>(props: TableContainerProps<RecordType>) => React.JSX.Element;
 export default TableContainerEdit;

package/lib/table-component/TableContainerEdit.js

@@ -133,7 +133,8 @@ const TableContainerEdit = props => {
     columnSizingInfo,
     rowClassName,
     onRowStyles,
-    dataSourceFilter
+    dataSourceFilter,
+    setIsExpandClick
   } = props;
   const containerRef = _react.default.useRef(null);
   const bottomToolbarRef = _react.default.useRef(null);
@@ -1910,7 +1911,8 @@ const TableContainerEdit = props => {
       rowClassName,
       rowEditable,
       onRowStyles,
-      dataSourceFilter
+      dataSourceFilter,
+      setIsExpandClick
     }
   }, /*#__PURE__*/_react.default.createElement(_TableWrapper.default, {
     contextMenuItems: contextMenuItems,

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

@@ -85,7 +85,8 @@ const renderSelection = args => {
     expandIconColumnIndex,
     isDataTree,
     expanded,
-    setExpanded
+    setExpanded,
+    onExpandClick
   } = args;
   const {
     selectionSettings,
@@ -103,20 +104,33 @@ const renderSelection = args => {
     }
   }, /*#__PURE__*/_react.default.createElement("div", null, cell.row.getCanExpand() ? /*#__PURE__*/_react.default.createElement("button", {
     // onClick: row.getToggleExpandedHandler(),
-    onClick: () => {
+    onClick: e => {
+      e.stopPropagation();
       const keys = Object.keys(expanded);
       // @ts-ignore
       const tmp = {
         ...expanded
       };
+
+      // collapse
       if (keys.includes(cell.row.id)) {
         delete tmp[cell.row.id];
         setExpanded(tmp);
       } else {
+        // collapse
         setExpanded(old => ({
           ...old,
           [cell.row.id]: true
         }));
+        const expandedKeys = {
+          ...tmp,
+          [cell.row.id]: true
+        };
+        onExpandClick?.({
+          expandedKeys: Object.keys(expandedKeys),
+          key: cell.row.id,
+          rowData: cell.row.original
+        });
       }
     },
     style: {
@@ -168,7 +182,8 @@ const TableBodyCell = props => {
     isSelectionChange,
     selectionSettings,
     wrapSettings,
-    pagination
+    pagination,
+    onExpandClick
     // dataSource
   } = _react.default.useContext(_useContext.TableContext);
   const expandIconColumnIndex = expandable?.expandIconColumnIndex ?? 0;
@@ -233,20 +248,33 @@ const TableBodyCell = props => {
       }
     }, /*#__PURE__*/_react.default.createElement("div", null, cell.row.getCanExpand() ? /*#__PURE__*/_react.default.createElement("button", {
       // onClick: row.getToggleExpandedHandler(),
-      onClick: () => {
+      onClick: e => {
+        e.stopPropagation();
         const keys = Object.keys(expanded);
         // @ts-ignore
         const tmp = {
           ...expanded
         };
+
+        // collapse
         if (keys.includes(cell.row.id)) {
           delete tmp[cell.row.id];
           setExpanded(tmp);
         } else {
+          // expand
           setExpanded(old => ({
             ...old,
             [cell.row.id]: true
           }));
+          const expandedKeys = {
+            ...tmp,
+            [cell.row.id]: true
+          };
+          onExpandClick?.({
+            expandedKeys: Object.keys(expandedKeys),
+            key: cell.row.id,
+            rowData: record
+          });
         }
       },
       style: {
@@ -318,7 +346,8 @@ const TableBodyCell = props => {
       isDataTree,
       setExpanded,
       expandIconColumnIndex,
-      isSelectionChange
+      isSelectionChange,
+      onExpandClick
     })));
   }
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -403,41 +432,8 @@ const TableBodyCell = props => {
           selectionSettings
         });
         cell.row.getToggleSelectedHandler()(e);
-
-        // if (cell.row.getIsSelected()) { // nếu đã chọn
-
-        //   const aaa = isSelectionChange?.rowsData.filter((it) => it.id !== cell.row.id)
-
-        //   setIsSelectionChange({
-        //     isChange: true,
-        //     type: 'rowSelected',
-        //     rowData: cell.row.original,
-        //     rowsData: aaa ?? []
-        //   })
-
-        // } else {
-
-        //   const { rowsData } = isSelectionChange ?? {}
-
-        //   const abc = rowsData && rowsData.length > 0 ? [...rowsData] : []
-
-        //   abc.push(cell.row)
-
-        //   setIsSelectionChange({
-        //     isChange: true,
-        //     type: 'rowSelected',
-        //     rowData: cell.row.original,
-        //     rowsData: abc
-        //   })
-        // }
       }
-    }
-
-    // onKeyUp={() => {
-
-    // }}
-    ,
-
+    },
     onClick: e => {
       const selection = window.getSelection();
       const text = selection ? selection.toString() : "";
@@ -466,20 +462,33 @@ const TableBodyCell = props => {
     }
   }, /*#__PURE__*/_react.default.createElement("div", null, cell.row.getCanExpand() ? /*#__PURE__*/_react.default.createElement("button", {
     // onClick: row.getToggleExpandedHandler(),
-    onClick: () => {
+    onClick: e => {
+      e.stopPropagation();
       const keys = Object.keys(expanded);
       // @ts-ignore
       const tmp = {
         ...expanded
       };
+
+      // collapse
       if (keys.includes(cell.row.id)) {
         delete tmp[cell.row.id];
         setExpanded(tmp);
       } else {
+        // expand
         setExpanded(old => ({
           ...old,
           [cell.row.id]: true
         }));
+        const expandedKeys = {
+          ...tmp,
+          [cell.row.id]: true
+        };
+        onExpandClick?.({
+          expandedKeys: Object.keys(expandedKeys),
+          key: cell.row.id,
+          rowData: record
+        });
       }
     },
     style: {