es-grid-template 1.8.55 → 1.8.57

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

@@ -9,6 +9,7 @@ import type { FieldNames, FilterFunc } from "rc-select/es/Select";
 import type { ColorPickerProps } from "antd";
 import type { FixedType } from "rc-base-table/lib/interface";
 import type { TableLocale } from "rc-master-ui/lib/table/interface";
+import type { Cell, Header, Row } from '@tanstack/react-table';
 export type IColumnType = "number" | "time" | "date" | "week" | "month" | "file" | "quarter" | "year" | "datetime" | "string" | "boolean" | "checkbox" | "color" | null | undefined;
 export type AnyObject = Record<PropertyKey, any>;
 export type SelectMode = 'checkbox' | 'radio' | undefined;
@@ -135,6 +136,9 @@ export type ColumnTable<RecordType = AnyObject> = Omit<RcColumnType<RecordType>,
     editFromSettings?: IEditFromSettings;
     fixedType?: FixedType;
     headerTextWrap?: boolean;
+    onCellStyles?: Omit<React.CSSProperties, 'display' | 'width' | 'minWidth' | 'left' | 'right' | 'position'> | ((cellValue: any, cell: Cell<RecordType, unknown>) => Omit<React.CSSProperties, 'display' | 'width' | 'minWidth' | 'left' | 'right' | 'position'>);
+    onCellHeaderStyles?: Omit<React.CSSProperties, 'display' | 'width' | 'minWidth' | 'left' | 'right' | 'position'> | ((cell: Header<RecordType, unknown>) => Omit<React.CSSProperties, 'display' | 'width' | 'minWidth' | 'left' | 'right' | 'position'>);
+    onCellFooterStyles?: Omit<React.CSSProperties, 'display' | 'width' | 'minWidth' | 'left' | 'right' | 'position'> | ((cellValue: any, cell: Header<RecordType, unknown>) => Omit<React.CSSProperties, 'display' | 'width' | 'minWidth' | 'left' | 'right' | 'position'>);
 };
 export type IFormOpen = {
     value?: any;
@@ -193,6 +197,7 @@ export type Sort = {
 export interface TableProps<RecordType = AnyObject> extends Omit<RcTableProps<RecordType>, 'columns' | 'rowSelection' | 'loading' | 'dataSource' | 'summary' | 'pagination' | 'locale'> {
     editAble?: boolean;
     infiniteScroll?: boolean;
+    theme?: 'dark' | 'light';
     next?: () => void;
     locale?: Locale;
     groupAble?: boolean;
@@ -266,6 +271,9 @@ export interface TableProps<RecordType = AnyObject> extends Omit<RcTableProps<Re
     wrapSettings?: IWrapSettings;
     actionTemplate?: ReactNode | ReactElement | (() => ReactNode | ReactElement);
     fullScreen?: boolean;
+    onRowStyles?: Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'> | ((data: RecordType, row: Row<RecordType>) => 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'>);
 }
 export type PaginationConfig = TablePaginationConfig & {
     currentPage?: number;

package/es/table-component/TableContainer.js

@@ -76,6 +76,9 @@ const TableContainer = props => {
     columnSizing,
     columnSizingInfo,
     rowClassName,
+    onRowStyles,
+    onRowFooterStyles,
+    onRowHeaderStyles,
     title
   } = props;
   const tableContainerRef = React.useRef(null);
@@ -93,6 +96,15 @@ const TableContainer = props => {
       settableHeight(totalHeight - topHeight - bottomHeight);
     }
   }, [id, height, editAble, minHeight]);
+  React.useEffect(() => {
+    const handleClickOutside = () => {
+      setFocusedCell(undefined);
+    };
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, []);
   const visibleColumns = table.getVisibleLeafColumns();
   const fixedLeftColumns = table.getState().columnPinning.left ? visibleColumns.filter(vc => table.getState().columnPinning.left?.includes(vc.id)) : [];
   const fixedRightColumns = table.getState().columnPinning.right ? visibleColumns.filter(vc => table.getState().columnPinning.right?.includes(vc.id)) : [];
@@ -261,6 +273,9 @@ const TableContainer = props => {
       focusedCell,
       setFocusedCell,
       rowClassName,
+      onRowStyles,
+      onRowFooterStyles,
+      onRowHeaderStyles,
       table,
       pagination
     }

package/es/table-component/TableContainerEdit.js

@@ -125,7 +125,8 @@ const TableContainerEdit = props => {
     setColumns,
     columnSizing,
     columnSizingInfo,
-    rowClassName
+    rowClassName,
+    onRowStyles
   } = props;
   const containerRef = React.useRef(null);
   const bottomToolbarRef = React.useRef(null);
@@ -1895,7 +1896,8 @@ const TableContainerEdit = props => {
       handleCellClick,
       pagination,
       rowClassName,
-      rowEditable
+      rowEditable,
+      onRowStyles
     }
   }, /*#__PURE__*/React.createElement(TableWrapper, {
     contextMenuItems: contextMenuItems,
@@ -1924,14 +1926,15 @@ const TableContainerEdit = props => {
   }))), /*#__PURE__*/React.createElement("div", {
     ref: bottomToolbarRef
   }, toolbarItemsBottom && toolbarItemsBottom.length > 0 && /*#__PURE__*/React.createElement("div", {
-    className: 'ui-rc-toolbar-bottom'
+    className: classNames('ui-rc-toolbar-bottom', {
+      'ui-rc-toolbar-bottom_border-bottom': !pagination || infiniteScroll
+    })
     // style={{ border: '0 1px 1px 1px solid #e0e0e0' }}
-    ,
-    style: {
-      borderBottom: '1px solid #e0e0e0',
-      borderRight: '1px solid #e0e0e0',
-      borderLeft: '1px solid #e0e0e0'
-    }
+    // style={{
+    //   borderBottom: '1px solid #e0e0e0',
+    //   borderRight: '1px solid #e0e0e0',
+    //   borderLeft: '1px solid #e0e0e0'
+    // }}
   }, /*#__PURE__*/React.createElement(Toolbar, {
     style: {
       width: '100%'
@@ -1941,9 +1944,7 @@ const TableContainerEdit = props => {
     onClick: ({}) => {
       setEditingKey('');
     }
-  })), pagination && !infiniteScroll && /*#__PURE__*/React.createElement(Pagination
-  // style={{padding: '0.75rem 1rem'}}
-  , _extends({}, pagination, {
+  })), pagination && !infiniteScroll && /*#__PURE__*/React.createElement(Pagination, _extends({}, pagination, {
     rootClassName: 'pagination-template',
     showSizeChanger: true,
     responsive: true,

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

@@ -168,6 +168,7 @@ const TableBodyCell = props => {
   const [isOpenTooltip, setIsOpenTooltip] = React.useState(false);
   const record = cell.row.original;
   const columnMeta = cell.column.columnDef.meta ?? {};
+  const cellStyles = typeof columnMeta.onCellStyles === 'function' ? columnMeta.onCellStyles(cell.getValue(), cell) : columnMeta.onCellStyles;
 
   // const tooltipContent = (isOpenTooltip === false || columnMeta.type === 'checkbox') ? '' : flexRender(cell.column.columnDef.cell, cell.getContext());
   const tooltipContent = isOpenTooltip === false ? '' : columnMeta?.tooltipDescription ? typeof columnMeta.tooltipDescription === 'function' ? columnMeta.tooltipDescription({
@@ -197,18 +198,13 @@ const TableBodyCell = props => {
         [`${prefix}-grid-cell-fix-right-first`]: isFirstRightPinnedColumn,
         [`${prefix}-grid-cell-text-center`]: columnMeta?.textAlign === 'center',
         [`${prefix}-grid-cell-text-right`]: columnMeta?.textAlign === 'right'
-        // [`${prefix}-grid-cell-index-selected`]: rowRange?.includes(cell.row.id),
-        // [`${prefix}-grid-cell-index-selected`]: selectRowIds?.includes(cell.row.id),
       }),
       style: {
+        ...cellStyles,
         display: 'flex',
-        // height: '36px',
         userSelect: 'none',
         width: cell.column.getSize(),
-        // flexBasis: cell.column.getSize(),
         minWidth: cell.column.getSize(),
-        // flex: 1,
-        // maxWidth: cell.column.getSize(),
         ...getCommonPinningStyles(cell.column)
       },
       onClick: e => {
@@ -272,12 +268,10 @@ const TableBodyCell = props => {
         [`${prefix}-grid-cell-text-right`]: columnMeta?.textAlign === 'right'
       }),
       style: {
+        ...cellStyles,
         display: 'flex',
-        // height: '36px',
         width: cell.column.getSize(),
         minWidth: cell.column.getSize(),
-        // flex: 1,
-        // maxWidth: cell.column.getSize(),
         ...getCommonPinningStyles(cell.column)
       }
     }, renderCommand({
@@ -298,51 +292,16 @@ const TableBodyCell = props => {
         [`${prefix}-grid-cell-text-right`]: columnMeta?.textAlign === 'right'
       }),
       style: {
+        ...cellStyles,
         display: 'flex',
-        // height: '36px',
         minHeight: 36,
         width: cell.column.getSize(),
         minWidth: cell.column.getSize(),
-        // flex: 1,
-        // maxWidth: cell.column.getSize(),
         ...getCommonPinningStyles(cell.column)
       }
     }, /*#__PURE__*/React.createElement("div", {
       className: classNames('ui-rc_cell-content', {})
-    }, cell.column.getIndex() === expandIconColumnIndex && isDataTree && /*#__PURE__*/React.createElement("div", {
-      className: "ui-rc-table-row-expand-trigger",
-      style: {
-        paddingLeft: `${cell.row.depth * 25}px`
-      }
-    }, /*#__PURE__*/React.createElement("div", null, cell.row.getCanExpand() ? /*#__PURE__*/React.createElement("button", {
-      // onClick: row.getToggleExpandedHandler(),
-      onClick: () => {
-        const keys = Object.keys(expanded);
-        // @ts-ignore
-        const tmp = {
-          ...expanded
-        };
-        if (keys.includes(cell.row.id)) {
-          delete tmp[cell.row.id];
-          setExpanded(tmp);
-        } else {
-          setExpanded(old => ({
-            ...old,
-            [cell.row.id]: true
-          }));
-        }
-      },
-      style: {
-        cursor: "pointer"
-      },
-      className: "ui-rc-table-row-expand"
-    }, cell.row.getIsExpanded() ? /*#__PURE__*/React.createElement("span", {
-      className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-expanded"
-    }) : /*#__PURE__*/React.createElement("span", {
-      className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-collapsed"
-    })) : /*#__PURE__*/React.createElement("span", {
-      className: "ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-spaced"
-    }))), cell.column.id === "selection_column" && renderSelection({
+    }, cell.column.id === "selection_column" && renderSelection({
       cell,
       table,
       selectionSettings,
@@ -385,13 +344,11 @@ const TableBodyCell = props => {
       [`${prefix}-grid-cell-text-right`]: columnMeta?.textAlign === 'right' || columnMeta.type === 'number'
     }),
     style: {
+      ...cellStyles,
       display: 'flex',
       width: cell.column.getSize(),
       minWidth: cell.column.getSize(),
       minHeight: 36,
-      // flex: 1,
-      // maxWidth: cell.column.getSize(),
-      // height: '36px',
       ...getCommonPinningStyles(cell.column)
     },
     onMouseEnter: e => {
@@ -466,24 +423,29 @@ const TableBodyCell = props => {
         //   })
         // }
       }
-    }
+    },
+    onKeyUp: () => {}
 
     // onDoubleClick={() => { }}
     ,
 
     onClick: e => {
-      if (!selectionSettings || selectionSettings.checkboxOnly !== true) {
-        toggleRowSelection({
-          e,
-          cell,
-          setIsSelectionChange,
-          isSelectionChange,
-          selectionSettings
-        });
-        setFocusedCell?.({
-          colId: cell.column.id,
-          rowId: cell.row.id
-        });
+      const selection = window.getSelection();
+      const text = selection ? selection.toString() : "";
+      if (text.length > 0) {} else {
+        if (!selectionSettings || selectionSettings.checkboxOnly !== true) {
+          toggleRowSelection({
+            e,
+            cell,
+            setIsSelectionChange,
+            isSelectionChange,
+            selectionSettings
+          });
+          setFocusedCell?.({
+            colId: cell.column.id,
+            rowId: cell.row.id
+          });
+        }
       }
     }
   }, /*#__PURE__*/React.createElement("div", {

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

@@ -242,12 +242,18 @@ const TableBodyCellEdit = props => {
   const expandIconColumnIndex = expandable?.expandIconColumnIndex;
   const record = cell.row.original;
   const columnMeta = cell.column.columnDef.meta ?? {};
-  const cellContent = columnMeta.type === 'checkbox' ? '' : flexRender(cell.column.columnDef.cell, cell.getContext());
+  const [isOpenTooltip, setIsOpenTooltip] = React.useState(false);
+
+  // const cellContent = columnMeta.type === 'checkbox' ? '' : flexRender(cell.column.columnDef.cell, cell.getContext());
   // const html = ReactDOMServer.renderToStaticMarkup(<>{cellContent}</>);
   // const hasValue = html.trim().length > 0;
 
   const rowError = dataErrors ? dataErrors.find(it => it.id === cell.row.id) : undefined;
   const message = rowError && rowError[cell.column.id]?.field === cell.column.id ? rowError[cell.column.id].message : undefined;
+  const tooltipContent = isOpenTooltip === false ? '' : columnMeta?.tooltipDescription ? typeof columnMeta.tooltipDescription === 'function' ? columnMeta.tooltipDescription({
+    value: cell.getValue(),
+    record
+  }) : columnMeta.tooltipDescription : columnMeta.template && typeof columnMeta.template !== 'function' ? columnMeta.template : cell.getValue();
   const canEdit = isEditable(cell.column.columnDef.meta, record) && isRowEditable !== false;
 
   // const allRows = table.getRowModel().rows;
@@ -429,7 +435,10 @@ const TableBodyCellEdit = props => {
     const rs = unFlattenData(rsFilterData);
     triggerPaste?.(pastedRows, colPasteds, rs, copyRows);
   };
-  function handleMouseEnter(rowId, colId) {
+  function handleMouseEnter(e, rowId, colId) {
+    if (e.target.firstChild?.clientWidth < e.target.firstChild?.scrollWidth) {
+      setIsOpenTooltip(true);
+    }
     if (isSelecting) {
       setEndCell?.({
         rowId,
@@ -1044,12 +1053,8 @@ const TableBodyCellEdit = props => {
     "data-col-key": cell.column.id,
     "data-row-key": cell.row.id,
     "data-tooltip-id": `${id}-tooltip-content`,
-    "data-tooltip-delay-show": 500
-    // data-tooltip-html={!isEditing && !hasValue && !message ? undefined : ReactDOMServer.renderToStaticMarkup(<>{rowError && rowError[cell.column.id]?.field === cell.column.id ? rowError[cell.column.id].message : cellContent}</>)}
-    // data-tooltip-content={!isEditing && !message ? undefined : rowError && rowError[cell.column.id]?.field === cell.column.id ? rowError[cell.column.id].message : record[columnMeta.field ?? '']}
-    // data-tooltip-content={isEditing && message ? message : rowError && rowError[cell.column.id]?.field === cell.column.id ? rowError[cell.column.id].message : record[columnMeta.field ?? '']}
-    ,
-    "data-tooltip-html": isEditing && message ? message : rowError && rowError[cell.column.id]?.field === cell.column.id ? rowError[cell.column.id].message : ReactDOMServer.renderToStaticMarkup( /*#__PURE__*/React.createElement(React.Fragment, null, cellContent)),
+    "data-tooltip-delay-show": 500,
+    "data-tooltip-html": isEditing && message ? message : rowError && rowError[cell.column.id]?.field === cell.column.id ? rowError[cell.column.id].message : ReactDOMServer.renderToStaticMarkup( /*#__PURE__*/React.createElement(React.Fragment, null, tooltipContent)),
     className: classNames(`${prefix}-grid-cell cell-editable editable `, {
       [`${prefix}-grid-cell-ellipsis`]: true,
       'cell-editing': isEditing,
@@ -1099,7 +1104,7 @@ const TableBodyCellEdit = props => {
         }
       }
     },
-    onMouseEnter: () => handleMouseEnter(cell.row.id, cell.column.id),
+    onMouseEnter: e => handleMouseEnter(e, cell.row.id, cell.column.id),
     onMouseUp: e => handleMouseUp(e),
     onKeyDown: e => {
       if (!isEditing) {

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

@@ -27,7 +27,8 @@ const TableBodyRow = ({
     recordDoubleClick,
     focusedCell,
     rowClassName,
-    rowEditable
+    rowEditable,
+    onRowStyles
   } = React.useContext(TableContext);
   const visibleCells = row.getVisibleCells();
   const virtualColumns = columnVirtualizer.getVirtualItems();
@@ -39,23 +40,18 @@ const TableBodyRow = ({
   const virtualRight = virtualPaddingRight ? [virtualPaddingRight] : [];
   const templateColumns = [...leftTemplate, ...virtualLeft, ...centerTemplate, ...virtualRight, ...rightTemplate];
   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.createElement("div", {
     "data-index": virtualRow.index //needed for dynamic row height measurement
     ,
     ref: node => rowVirtualizer.measureElement(node) //measure dynamic row height
     ,
-    key: row.id
-    // data-row-key={cell.row.id}
-    ,
-    "data-row-key": row.id
-
-    // className={} ui-rc-table-row-selected
-    ,
+    key: row.id,
+    "data-row-key": row.id,
     className: classNames(`${prefix}-grid-row ${rowClass ?? ''}`, {
       [`${prefix}-grid-row-selected`]: row.getIsSelected(),
       [`${prefix}-grid-row-focus`]: row.id === focusedCell?.rowId && !editAble
-      // [`${prefix}-grid-row-focus`]: true,
     }),
     style: {
       // display: 'flex',
@@ -63,12 +59,11 @@ const TableBodyRow = ({
       // position: 'absolute',
       transform: `translateY(${virtualRow.start}px)`,
       //this should always be a `style` as it changes on scroll
-      // width: '100%',
       // height: isEditing ? '36px' : undefined,
       gridTemplateColumns: `${templateColumns.map(n => `${n}fr`).join(" ")}`,
-      // gridTemplateColumns: `repeat(${centerCOlumns.length + fixedLeftColumns.length + fixedRightColumns.length}, minmax(0, 1fr))`,
       height: isEditing ? virtualRow.size : undefined,
-      minHeight: isEditing ? undefined : virtualRow.size
+      minHeight: isEditing ? undefined : virtualRow.size,
+      ...rowStyles
     },
     onDoubleClick: e => {
       recordDoubleClick?.({

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

@@ -62,8 +62,8 @@ const TableFooterCell = ({
       display: 'flex',
       ...getCommonPinningStyles(column),
       // width: column?.getSize() ?? column.getSize(),
-      minWidth: column?.getSize(),
-      backgroundColor: "#fafafa"
+      minWidth: column?.getSize()
+      // backgroundColor: "#fafafa",
     }
   }, column.id !== "id" && column.id !== "selection_column" ? /*#__PURE__*/React.createElement(React.Fragment, null, col.summaryTemplate ? col.summaryTemplate(numberValue, col.field) : numericFormatter(cellValue, numericFormatProps)) : '');
 };

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

@@ -2,6 +2,7 @@
 // import type { Person } from "../makeData";
 import TableFooterCell from "./TableFooterCell";
 import React from "react";
+import { TableContext } from "../useContext";
 // import type { Person } from "../../tanstack-table/makeData";
 // import TableHeadCell from "./TableHeadCell";
 
@@ -20,20 +21,23 @@ const TableFooterRow = ({
 
   // const a  =  table.getVisibleFlatColumns()
   const visibleColumns = table.getVisibleLeafColumns();
+  const {
+    onRowFooterStyles
+  } = React.useContext(TableContext);
+  const rowStyles = typeof onRowFooterStyles === 'function' ? onRowFooterStyles() : onRowFooterStyles;
 
   // const 
 
   return /*#__PURE__*/React.createElement("div", {
-    // data-index={headerGroup.id}
     key: headerGroup.id,
     style: {
+      ...rowStyles,
       display: "grid",
       width: "100%",
-      borderBottom: "1px solid #e0e0e0",
-      borderTop: "1px solid #e0e0e0",
       height: 37,
       gridTemplateColumns: `${table.getVisibleLeafColumns().map(n => `${n.getSize()}fr`).join(" ")}`
-    }
+    },
+    className: "ui-rc-grid-footer-row"
   }, visibleColumns.map(header => {
     return /*#__PURE__*/React.createElement(TableFooterCell, {
       key: header.id

package/es/table-component/header/TableHead.js

@@ -24,15 +24,18 @@ const TableHead = ({
   // fixedRightColumns
 }) => {
   const {
-    prefix
+    prefix,
+    onRowHeaderStyles
   } = useContext(TableContext);
   const headerGroups = table.getFlatHeaders();
   const leafColumns = table.getVisibleFlatColumns();
   // const leafColumns11 = table.getIsAllColumnsVisible();
   const headerDepth = table.getHeaderGroups().length;
+  const rowStyles = typeof onRowHeaderStyles === 'function' ? onRowHeaderStyles() : onRowHeaderStyles;
   return /*#__PURE__*/React.createElement("div", {
     className: `${prefix}-grid-thead`,
     style: {
+      ...rowStyles,
       display: 'grid',
       position: 'sticky',
       top: 0,

package/es/table-component/header/TableHeadCell2.js

@@ -1,9 +1,5 @@
-// import { useSortable } from "@dnd-kit/sortable"
-
 import { flexRender } from '@tanstack/react-table';
 import React, { useContext } from 'react';
-// import { CSS } from '@dnd-kit/utilities'
-// import type { Virtualizer } from '@tanstack/react-virtual'
 import { Button, Space } from 'antd';
 import { ArrowDown, ArrowUp, FilterFill, SortCancel } from 'becoxy-icons';
 import classNames from 'classnames';
@@ -13,11 +9,6 @@ import { excludeItems, extendsObject, getCommonPinningStyles, getDefaultOperator
 import { TableContext } from "../useContext";
 import { renderFilter } from "./renderFilter";
 import ReactDOMServer from 'react-dom/server';
-
-// import { ColumnTable } from "../type";
-
-// import { Tooltip } from 'react-tooltip'
-
 const TableHeadCell2 = props => {
   const {
     column,
@@ -25,9 +16,6 @@ const TableHeadCell2 = props => {
     getPopupContainer,
     table,
     depth,
-    // t,
-    // columnVirtualizer,
-    // rowHeaderVirtualizer,
     colSpan,
     rowSpan
   } = props;
@@ -52,33 +40,16 @@ const TableHeadCell2 = props => {
   const {
     filterIcon
   } = column.columnDef.meta ?? {};
-
-  // const column = (column.columnDef ?? {}) as ColumnTable
-  // const column = column.columnDef
-
   const originalColumn = column.columnDef.meta ?? {};
+  const cellStyles = typeof originalColumn.onCellHeaderStyles === 'function' ? originalColumn.onCellHeaderStyles(header) : originalColumn.onCellHeaderStyles;
   const filtered = (column.getFilterValue() ?? []).length > 0;
   const cellContent = flexRender(column.columnDef.header, header.getContext());
-  // const cellContent = 'aaaa'
-
   const html = ReactDOMServer.renderToStaticMarkup( /*#__PURE__*/React.createElement(React.Fragment, null, cellContent));
   const hasValue = html.trim().length > 0;
-
-  // const filtered = column.getIsFiltered()
-
-  // const { attributes, isDragging, listeners, setNodeRef, transform } =
-  //   useSortable({
-  //     id: column.id,
-  //   })
-
   const style = {
-    // opacity: isDragging ? 0.8 : 1,
-    // position: 'relative',
-    // transform: CSS.Translate.toString(transform), // translate instead of transform to avoid squishing
     transition: 'width transform 0.2s ease-in-out',
-    whiteSpace: 'nowrap'
-    // width: column.getSize(),
-    // zIndex: isDragging ? 1 : 0,
+    whiteSpace: 'nowrap',
+    ...cellStyles
   };
   const getDropdownTrigger = () => {
     let iconFilter;
@@ -232,25 +203,15 @@ const TableHeadCell2 = props => {
       [`${prefix}-grid-cell-fix-right-first`]: isFirstRightPinnedColumn,
       [`${prefix}-grid-cell-text-center`]: (originalColumn?.headerTextAlign ?? originalColumn?.textAlign) === 'center',
       [`${prefix}-grid-cell-text-right`]: (originalColumn?.headerTextAlign ?? originalColumn.textAlign) === 'right'
-    })
-    // colSpan={colSpan}
-    // rowSpan={rowSpan}
-    ,
-
+    }),
     key: column.id,
     style: {
-      // display: 'flex',
-      // width: column.getSize(),
+      ...style,
       minWidth: column.getSize(),
-      // flex: 1,
-      // flexGrow: column.getSize(),
-
       gridRow: `${depth + 1} / span ${rowSpan}`,
       gridColumn: `span ${colSpan}`,
-      // maxWidth: header.getSize(),
       ...getCommonPinningStyles(column),
-      width: 'auto',
-      ...style
+      width: 'auto'
     },
     "data-tooltip-id": `${id}-tooltip-content`,
     "data-tooltip-delay-show": 500,
@@ -261,9 +222,7 @@ const TableHeadCell2 = props => {
       [`${prefix}-grid-selection-column`]: column.id === 'selection_column'
     })
   }, column.id === 'selection_column' && selectionSettings && selectionSettings.hideSelectAll !== true && selectionSettings.type !== 'single' && selectionSettings.mode !== 'radio' && /*#__PURE__*/React.createElement(Checkbox, {
-    checked: table.getIsAllRowsSelected()
-    // indeterminate={table.getIsSomeRowsSelected()}
-    ,
+    checked: table.getIsAllRowsSelected(),
     indeterminate: table.getIsSomePageRowsSelected(),
     onChange: e => {
       table.getToggleAllRowsSelectedHandler()(e);