es-grid-template 1.4.3 → 1.4.5

package/es/grid-component/table/GridEdit.js

@@ -14,12 +14,17 @@ import dayjs from "dayjs";
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
 import TableGrid from "../TableGrid";
-import { addClassBorderPasteCell, addClassCellIndexSelected, addRows8, addRowsUp, checkChild, editAbleColumns, findAllChildrenKeys, findItemByKey, findItemPath, flattenArray, flattenData, getDefaultValue, getEditType, getFirstSelectCell, getLastSelectCell, getRowNumber, getRowsPasteIndex, hideDraggingPoint, isEditable, isEqualSet, isObjEmpty, newGuid, onAddBorderSelectedCell, onAddBgSelectedCell, onRemoveBorderSelectedCell, onRemoveBgSelectedCell, removeClassBorderPasteCell, removeClassCellIndexSelected, showDraggingPoint, sortedSetASC, totalFixedWidth, updateArrayByKey, getFormat } from "../hooks";
+import { addClassBorderPasteCell, addClassCellIndexSelected, addRows8, addRowsUp, checkChild, editAbleColumns, findAllChildrenKeys, findItemByKey, findItemPath, flattenArray, flattenData, getDefaultValue, getEditType, getFirstSelectCell, getLastSelectCell, getRowNumber, getRowsPasteIndex, hideDraggingPoint, isEditable, isEqualSet, isObjEmpty, newGuid, onAddBgSelectedCell,
+// onRemoveBorderSelectedCell,
+onRemoveBgSelectedCell, removeClassBorderPasteCell, removeClassCellIndexSelected, showDraggingPoint, sortedSetASC, totalFixedWidth, updateArrayByKey, getFormat,
+// isRangeCell,
+// isSelectedCell,
+onRemoveBgCellIndex, onAddBgCellIndex, onAddBorderSelectedCell, onRemoveBorderSelectedCell } from "../hooks";
 import Message from "../../Message/Message";
 import { Toolbar, ConfigProvider, InputNumber } from "rc-master-ui";
 import classnames from "classnames";
 import { Plus, Trash2 } from "becoxy-icons";
-import { faker } from "@faker-js/faker";
+// import {faker} from "@faker-js/faker";
 import { SELECTION_COLUMN } from "../InternalTable";
 const {
   Paragraph,
@@ -173,7 +178,7 @@ const validateData = async (data, formSchema) => {
 };
 const GridEdit = props => {
   const {
-    id: tableId,
+    id,
     tableRef,
     t,
     columns,
@@ -183,6 +188,7 @@ const GridEdit = props => {
     rowKey = 'id',
     selectionSettings,
     height,
+    scrollHeight,
     format,
     triggerChangeData,
     triggerChangeColumns,
@@ -224,20 +230,143 @@ const GridEdit = props => {
   const visibleCols = React.useMemo(() => {
     return flatColumns2(columns.filter(it => it.visible !== false));
   }, [columns]);
-  const id = React.useMemo(() => {
-    return tableId ?? faker.string.alpha(20);
-    // return tableId ?? newGuid()
-  }, [tableId]);
-  const itemsAdd = [{
-    key: '10',
-    label: '10 rows'
-  }, {
-    key: '50',
-    label: '50 rows'
-  }, {
-    key: '100',
-    label: '100 rows'
-  }];
+
+  //   const id  = React.useMemo(() => {
+  //
+  //   return tableId ?? faker.string.alpha(20)
+  //   // return tableId ?? newGuid()
+  //
+  // }, [tableId])
+
+  const itemsAdd = React.useMemo(() => {
+    return [{
+      key: '10',
+      label: `10 ${t ? t('rows') : 'rows'}`
+    }, {
+      key: '50',
+      label: `50 ${t ? t('rows') : 'rows'}`
+    }, {
+      key: '100',
+      label: `100 ${t ? t('rows') : 'rows'}`
+    }];
+  }, [t]);
+
+  // const defaultContext = React.useMemo(() => {
+  //   return  [
+  //     {
+  //       key: 'INSERT_BEFORE',
+  //       label: 'Thêm dòng bên trên',
+  //       icon: <Plus fontSize={14} />,
+  //       children: [
+  //         {
+  //           parentKey: 'INSERT_BEFORE',
+  //           key: 'INSERT_BEFORE_1',
+  //           label: 'Thêm 1 dòng',
+  //           row: 1
+  //         },
+  //         {
+  //           parentKey: 'INSERT_BEFORE',
+  //           key: 'INSERT_BEFORE_10',
+  //           label: 'Thêm 10 dòng',
+  //           row: 10
+  //         },
+  //         {
+  //           parentKey: 'INSERT_BEFORE',
+  //           key: 'INSERT_BEFORE_50',
+  //           label: 'Thêm 50 dòng',
+  //           row: 50
+  //         },
+  //         {
+  //           parentKey: 'INSERT_BEFORE',
+  //           key: 'INSERT_BEFORE_100',
+  //           label: 'Thêm 100 dòng',
+  //           row: 100
+  //         },
+  //         {
+  //           parentKey: 'INSERT_BEFORE',
+  //           key: 'INSERT_BEFORE_ADV',
+  //           label: 'Tùy chỉnh'
+  //         }
+  //       ]
+  //     },
+  //     {
+  //       key: 'INSERT_AFTER',
+  //       label: 'Thêm dòng bên dưới',
+  //       icon: <Plus fontSize={14} />,
+  //       children: [
+  //         {
+  //           parentKey: 'INSERT_AFTER',
+  //           key: 'INSERT_AFTER_1',
+  //           label: 'Thêm 1 dòng',
+  //           row: 1
+  //         },
+  //         {
+  //           parentKey: 'INSERT_AFTER',
+  //           key: 'INSERT_AFTER_10',
+  //           label: 'Thêm 10 dòng',
+  //           row: 10
+  //         },
+  //         {
+  //           parentKey: 'INSERT_AFTER',
+  //           key: 'INSERT_AFTER_50',
+  //           label: 'Thêm 50 dòng',
+  //           row: 50
+  //         },
+  //         {
+  //           parentKey: 'INSERT_AFTER',
+  //           key: 'INSERT_AFTER_100',
+  //           label: 'Thêm 100 dòng',
+  //           row: 100
+  //         },
+  //         {
+  //           parentKey: 'INSERT_AFTER',
+  //           key: 'INSERT_AFTER_ADV',
+  //           label: 'Tùy chỉnh'
+  //         }
+  //       ]
+  //     },
+  //     {
+  //       key: 'INSERT_CHILDREN',
+  //       // label: 'Insert item children',
+  //       label: 'Thêm cấp con',
+  //       icon: <Plus fontSize={14} />
+  //       // children: [
+  //       //   {
+  //       //     parentKey: 'INSERT_AFTER',
+  //       //     key: 'INSERT_AFTER_1',
+  //       //     label: 'Thêm 1 dòng',
+  //       //     row: 1
+  //       //   },
+  //       //   {
+  //       //     parentKey: 'INSERT_AFTER',
+  //       //     key: 'INSERT_AFTER_10',
+  //       //     label: 'Thêm 10 dòng',
+  //       //     row: 10
+  //       //   },
+  //       //   {
+  //       //     parentKey: 'INSERT_AFTER',
+  //       //     key: 'INSERT_AFTER_50',
+  //       //     label: 'Thêm 50 dòng',
+  //       //     row: 50
+  //       //   },
+  //       //   {
+  //       //     parentKey: 'INSERT_AFTER',
+  //       //     key: 'INSERT_AFTER_100',
+  //       //     label: 'Thêm 100 dòng',
+  //       //     row: 100
+  //       //   },
+  //       //   {
+  //       //     parentKey: 'INSERT_AFTER',
+  //       //     key: 'INSERT_AFTER_ADV',
+  //       //     label: 'Tùy chỉnh'
+  //       //   }
+  //       // ]
+  //     },
+  //     { key: 'DELETE_CONTENT', label: 'Xóa nội dung', icon: <Trash2 fontSize={14} /> },
+  //     { key: 'DELETE_ROWS', label: 'Xóa dòng', icon: <Trash2 fontSize={14} /> }
+  //   ]
+  // }, [])
+
   const [form] = Form.useForm();
   const [editingKey, setEditingKey] = useState('');
   const [dataErrors, setDataErrors] = useState([]);
@@ -357,13 +486,13 @@ const GridEdit = props => {
   // thêm n dòng bên trên
   const handleInsertBefore = React.useCallback((item, n) => {
     //
-    onRemoveBgSelectedCell(selectedCells.current, id);
-    onRemoveBorderSelectedCell(selectedCells.current, id);
+    // onRemoveBgSelectedCell(selectedCells.current, id)
+    // onRemoveBorderSelectedCell(selectedCells.current, id)
     //
 
     setTimeout(() => {
-      onAddBgSelectedCell(selectedCells.current, id);
-      onAddBorderSelectedCell(selectedCells.current, id);
+      // onAddBgSelectedCell(selectedCells.current, id)
+      // onAddBorderSelectedCell(selectedCells.current, id)
     }, 10);
     const defaultRowValue = getDefaultValue(defaultValue);
     // const rowId = defaultRowValue && defaultRowValue.id ? defaultRowValue.id : newGuid()
@@ -434,7 +563,7 @@ const GridEdit = props => {
         triggerChangeData?.(newDataSource, 'INSERT_BEFORE');
       }
     }
-  }, [dataSource, defaultValue, id, isFilter, rowKey, rowsFocus, triggerChangeData]);
+  }, [dataSource, defaultValue, isFilter, rowKey, rowsFocus, triggerChangeData]);
 
   //thêm 1 dòng bên dưới
   const handleInsertAfter = React.useCallback((item, n) => {
@@ -519,7 +648,7 @@ const GridEdit = props => {
       });
     } else {
       const newData = [...dataSource];
-      let newElement = {};
+      let newElement;
       if (!record.children || record.children.length === 0) {
         newElement = {
           ...record,
@@ -553,8 +682,8 @@ const GridEdit = props => {
   }, [dataSource, defaultValue, getRowKey, mergedExpandedKeys, rowKey, rowsFocus, triggerChangeData]);
   const handleDeleteRows = React.useCallback(item => {
     setTimeout(() => {
-      onAddBgSelectedCell(selectedCells.current, id);
-      onAddBorderSelectedCell(selectedCells.current, id);
+      // onAddBgSelectedCell(selectedCells.current, id)
+      // onAddBorderSelectedCell(selectedCells.current, id)
     });
     if (item.onClick) {
       item.onClick({
@@ -570,7 +699,7 @@ const GridEdit = props => {
       });
       triggerChangeData?.([...newData], 'DELETE_ROWS');
     }
-  }, [dataSource, id, rowsFocus, triggerChangeData]);
+  }, [dataSource, rowsFocus, triggerChangeData]);
   const handleDeleteAll = React.useCallback(() => {
     triggerChangeData?.([], 'INSERT_BEFORE');
   }, [triggerChangeData]);
@@ -816,7 +945,7 @@ const GridEdit = props => {
     }
   } = useForm({
     mode: 'onChange',
-    resolver: yupResolver(validate)
+    resolver: validate ? yupResolver(validate) : undefined
   });
   const isEditing = React.useCallback(record => {
     return record[rowKey] === editingKey;
@@ -866,77 +995,6 @@ const GridEdit = props => {
       document.removeEventListener("click", handleClickOutside);
     };
   }, [id]);
-  const handleMouseDown = (record, row, col, e) => {
-    if (editingKey && editingKey === record[rowKey]) {
-      return;
-    }
-    if (e.button === 2) {
-      e.stopPropagation();
-      return;
-    }
-
-    // isDragMouse.current = true
-    isMouseDown.current = true;
-    if (e.ctrlKey) {
-      isSelecting.current = true;
-      startCell.current = {
-        row,
-        col
-      };
-
-      // const cell: any  = new Set([`${row}-${col}`])
-
-      // setCurrentCtrlCells(cell)
-    } else {
-      isSelecting.current = true;
-      startCell.current = {
-        row,
-        col
-      };
-      const target = e.target;
-      if (target.closest('.dragging-point')) {
-        e.stopPropagation();
-        e.preventDefault();
-        return; // Không xử lý gì cả
-      } else {
-        // setStartSelectedCell({row, col})
-
-        startSelectedCells.current = {
-          row,
-          col
-        };
-
-        // setSelectedCells(new Set([`${row}-${col}`]));
-
-        const cells = new Set([`${row}-${col}`]);
-        if (selectedCells.current && selectedCells.current.size > 0) {
-          if (!isEqualSet(cells, rangeCells)) {
-            onRemoveBgSelectedCell(rangeCells, id);
-            onRemoveBorderSelectedCell(rangeCells, id);
-            hideDraggingPoint(rangeCells, id);
-          }
-        }
-        if (rowsSelected.current && rowsSelected.current.size > 0) {
-          removeClassCellIndexSelected(rowsSelected.current, id);
-        }
-        if (!isEqualSet(cells, selectedCells.current)) {
-          selectedCells.current = cells;
-          if (editingKey) {
-            setTimeout(() => {
-              onAddBgSelectedCell(cells, id);
-              onAddBorderSelectedCell(cells, id);
-            }, 200);
-          } else {
-            onAddBgSelectedCell(cells, id);
-            onAddBorderSelectedCell(cells, id);
-          }
-        }
-
-        // setRowsSelected(new Set())
-        rowsSelected.current = new Set();
-      }
-    }
-  };
   const triggerDragPaste = pastesArray => {
     const mergedSet = new Set([...selectedCells.current, ...pastesArray]);
     const tmpCols = {
@@ -957,35 +1015,6 @@ const GridEdit = props => {
       // return { row, col, value: '' };
     });
 
-    // let selectedArray = []
-    //
-    // if (rowPasteLast > rowSelectedFirst) {
-    //   // kéo xuóng
-    //    selectedArray = Array.from(selectedCells).map((key: any) => {
-    //
-    //     const [row, col] = key.split("-").map(Number);
-    //     // @ts-ignore
-    //     const columnKey = columns[col].field;
-    //
-    //     // @ts-ignore
-    //     return { row, col, value: flattenData(childrenColumnName as any,dataSource)[row][columnKey] };
-    //     // return { row, col, value: '' };
-    //   });
-    // } else {
-    //   // kéo lên
-    //
-    //    selectedArray = Array.from(sortedSetDSC(selectedCells)).map((key: any) => {
-    //
-    //     const [row, col] = key.split("-").map(Number);
-    //     // @ts-ignore
-    //     const columnKey = columns[col].field;
-    //
-    //     // @ts-ignore
-    //     return { row, col, value: flattenData(childrenColumnName as any,dataSource)[row][columnKey] };
-    //     // return { row, col, value: '' };
-    //   });
-    // }
-
     // Xác định min/max row và col để sắp xếp dữ liệu
     const minRow = Math.min(...selectedArray.map(cell => cell.row));
     const maxRow = Math.max(...selectedArray.map(cell => cell.row));
@@ -1005,10 +1034,7 @@ const GridEdit = props => {
     }) => {
       table[row - minRow][col - minCol] = value;
     });
-    let newRange = {
-      combined: [],
-      addedRows: []
-    };
+    let newRange;
     if (rowPasteLast > rowSelectedFirst) {
       // kéo xuóng
       newRange = addRows8(table, getRowsPasteIndex(pastesArray).length);
@@ -1065,18 +1091,20 @@ const GridEdit = props => {
 
     /// cập nhật cell class
     if (selectedCells.current && selectedCells.current.size > 0) {
-      onRemoveBgSelectedCell(rangeCells, id);
-      onRemoveBorderSelectedCell(rangeCells, id);
+      // onRemoveBgSelectedCell(rangeCells, id)
+      // onRemoveBorderSelectedCell(rangeCells, id)
     }
 
     // selectedCells.current = sortedSetASC(mergedSet)
     hideDraggingPoint(selectedCells.current, id);
-    selectedCells.current = sortedSetASC(mergedSet);
-    setRangeCells(sortedSetASC(mergedSet));
+    const newCells = sortedSetASC(mergedSet);
+    selectedCells.current = newCells;
+    onAddBgCellIndex(newCells, id);
+    setRangeCells(newCells);
+    onAddBgSelectedCell(newCells, id);
+    onAddBorderSelectedCell(newCells, id);
     setTimeout(() => {
-      onAddBgSelectedCell(sortedSetASC(mergedSet), id);
-      onAddBorderSelectedCell(sortedSetASC(mergedSet), id);
-      showDraggingPoint(sortedSetASC(mergedSet), id);
+      showDraggingPoint(newCells, id);
     }, 50);
 
     // setPasteCells(new Set())
@@ -1101,6 +1129,80 @@ const GridEdit = props => {
     hideDraggingPoint(selectedCells.current, id);
     triggerDragPaste(newPasteCells);
   };
+  const handleMouseDown = (record, row, col, e) => {
+    if (e.button === 2) {
+      e.stopPropagation();
+      return;
+    }
+    if (editingKey && editingKey === record[rowKey]) {
+      return;
+    }
+    if (record[rowKey] !== editingKey && editingKey !== '') {
+      setEditingKey('');
+    }
+
+    // isDragMouse.current = true
+    isMouseDown.current = true;
+    if (e.ctrlKey) {
+      isSelecting.current = true;
+      startCell.current = {
+        row,
+        col
+      };
+
+      // const cell: any  = new Set([`${row}-${col}`])
+
+      // setCurrentCtrlCells(cell)
+    } else {
+      isSelecting.current = true;
+      startCell.current = {
+        row,
+        col
+      };
+      const target = e.target;
+      if (target.closest('.dragging-point')) {
+        e.stopPropagation();
+        e.preventDefault();
+        return; // Không xử lý gì cả
+      } else {
+        // setStartSelectedCell({row, col})
+
+        startSelectedCells.current = {
+          row,
+          col
+        };
+
+        // setSelectedCells(new Set([`${row}-${col}`]));
+
+        const cells = new Set([`${row}-${col}`]);
+        if (selectedCells.current && selectedCells.current.size > 0) {
+          if (!isEqualSet(cells, rangeCells)) {
+            // onRemoveBgSelectedCell(rangeCells, id)
+            // onRemoveBorderSelectedCell(rangeCells, id)
+            hideDraggingPoint(rangeCells, id);
+            onRemoveBgCellIndex(selectedCells.current, id);
+          }
+        }
+        if (rowsSelected.current && rowsSelected.current.size > 0) {
+          removeClassCellIndexSelected(rowsSelected.current, id);
+        }
+        if (!isEqualSet(cells, selectedCells.current)) {
+          onRemoveBgSelectedCell(selectedCells.current, id);
+          hideDraggingPoint(selectedCells.current, id);
+          selectedCells.current = cells;
+          // setRangeCells(cells)
+
+          onAddBgCellIndex(cells, id);
+          onAddBorderSelectedCell(cells, id);
+          onAddBgSelectedCell(selectedCells.current, id, false);
+          showDraggingPoint(selectedCells.current, id);
+        }
+
+        // setRowsSelected(new Set())
+        rowsSelected.current = new Set();
+      }
+    }
+  };
   const handleMouseUp = e => {
     isSelecting.current = false;
     startCell.current = null;
@@ -1109,12 +1211,6 @@ const GridEdit = props => {
     isDragMouse.current = false;
     isMouseDown.current = false;
     setIsPasteDragging(false);
-
-    // isPasteDragging.current = false
-    // setSelectIsDragging(false);
-
-    // setCurrentCtrlCells(new Set())
-
     if (e.ctrlKey) {
 
       // setCtrlCells([...ctrlCells, currentCtrlCells])
@@ -1126,18 +1222,20 @@ const GridEdit = props => {
       triggerDragPaste(pasteCells.current);
     } else {
       setRangeCells(selectedCells.current);
-      onRemoveBorderSelectedCell(rangeCells, id);
-      onAddBorderSelectedCell(selectedCells.current, id);
       const target = e.target;
       if (target.closest('.dragging-point')) {
         e.stopPropagation();
         e.preventDefault();
         return; // Không xử lý gì cả
       }
-      if (selectedCells.current && selectedCells.current.size > 0) {
+      if (selectedCells.current && selectedCells.current.size > 1) {
         hideDraggingPoint(selectedCells.current, id);
+        onAddBorderSelectedCell(selectedCells.current, id);
+
+        // showDraggingPoint(selectedCells.current, id)
       }
       showDraggingPoint(selectedCells.current, id);
+      // onAddBorderSelectedCell(selectedCells.current, id)
     }
   };
   const handleMouseEnter = (row, col, e) => {
@@ -1256,15 +1354,17 @@ const GridEdit = props => {
     // setSelectedCells(new Set(newSelectedCells));
 
     if (selectedCells.current && selectedCells.current.size > 0) {
-      onRemoveBgSelectedCell(selectedCells.current, id);
-      onRemoveBorderSelectedCell(selectedCells.current, id);
+      // onRemoveBgSelectedCell(selectedCells.current, id)
+      // onRemoveBorderSelectedCell(selectedCells.current, id)
     }
     if (rowsSelected.current && rowsSelected.current.size > 0) {
       removeClassCellIndexSelected(rowsSelected.current, id);
     }
     selectedCells.current = newSelectedCells;
-    onAddBgSelectedCell(newSelectedCells, id);
-    onAddBorderSelectedCell(newSelectedCells, id);
+
+    // onAddBgSelectedCell(newSelectedCells, id)
+    // onAddBorderSelectedCell(newSelectedCells, id)
+
     hideDraggingPoint(selectedCells.current, id);
     showDraggingPoint(newSelectedCells, id);
   };
@@ -1273,6 +1373,9 @@ const GridEdit = props => {
       e.stopPropagation();
       return;
     }
+    if (editingKey) {
+      setEditingKey('');
+    }
     isSelectingRow.current = true;
     rowStart.current = {
       row,
@@ -1285,13 +1388,11 @@ const GridEdit = props => {
         newSelectedCells.add(`${r}-${c}`);
       }
     }
-
-    // setSelectedCells(newSelectedCells)
-    // setRowsSelected(new Set([`${row}-${col}`]));
-
     if (selectedCells.current && selectedCells.current.size > 0) {
+      onRemoveBgCellIndex(selectedCells.current, id);
       onRemoveBgSelectedCell(selectedCells.current, id);
       onRemoveBorderSelectedCell(selectedCells.current, id);
+      // onRemoveBorderSelectedCell(selectedCells.current, id)
     }
     if (rowsSelected.current && rowsSelected.current.size > 0) {
       removeClassCellIndexSelected(rowsSelected.current, id);
@@ -1300,7 +1401,9 @@ const GridEdit = props => {
     selectedCells.current = newSelectedCells;
     rowsSelected.current = new Set([`${row}-${col}`]);
     onAddBgSelectedCell(newSelectedCells, id, false);
-    onAddBorderSelectedCell(newSelectedCells, id);
+    setTimeout(() => {
+      onAddBgSelectedCell(newSelectedCells, id, false);
+    }, 10);
     addClassCellIndexSelected(new Set([`${row}-${col}`]), id);
   };
   const handleMouseEnterRowHeader = (row, col, e) => {
@@ -1330,13 +1433,11 @@ const GridEdit = props => {
     if (selectedCells.current && selectedCells.current.size > 0) {
       onRemoveBgSelectedCell(selectedCells.current, id);
     }
-    // setSelectedCells(newSelectedCells)
     selectedCells.current = newSelectedCells;
     onAddBgSelectedCell(newSelectedCells, id);
     if (rowsSelected.current && rowsSelected.current.size > 0) {
       removeClassCellIndexSelected(rowsSelected.current, id);
     }
-    // setRowsSelected(newSelectedRows)
     rowsSelected.current = newSelectedRows;
     addClassCellIndexSelected(newSelectedRows, id);
   };
@@ -1755,6 +1856,7 @@ const GridEdit = props => {
     }
   };
   const handleEdit = (record, col, editType, e) => {
+    onRemoveBorderSelectedCell(selectedCells.current, id);
     setTooltipContent('');
     // @ts-ignore
     setEditingKey(record[rowKey]);
@@ -1854,10 +1956,16 @@ const GridEdit = props => {
       hideDraggingPoint(selectedCells.current, id);
       selectedCells.current = cells;
       setRangeCells(cells);
-      setTimeout(() => {
-        onAddBgSelectedCell(selectedCells.current, id);
-        onAddBorderSelectedCell(selectedCells.current, id);
-      }, 50);
+
+      // setTimeout(() => {
+      //
+      //   // onAddBgSelectedCell(selectedCells.current, id)
+      //   // onAddBorderSelectedCell(selectedCells.current, id)
+      //
+      // }, 50)
+
+      onAddBgSelectedCell(selectedCells.current, id);
+      onAddBorderSelectedCell(selectedCells.current, id);
       showDraggingPoint(cells, id);
     };
     const focusNextCell = (editingCell, cellEditable) => {
@@ -1866,6 +1974,7 @@ const GridEdit = props => {
           updateSelection();
           if (e?.key !== 'Tab') {
             editingCell.focus();
+            // editingCell.click()
           }
         }
         if (scrollType === 'horizontal' && editingCell) {
@@ -1877,6 +1986,8 @@ const GridEdit = props => {
           scrollToCell(rowIndex, colIndex, cellEdit, 'vertical');
           if (e?.key !== 'Tab') {
             cellEditable.focus();
+            onAddBorderSelectedCell(selectedCells.current, id);
+            // editingCell.click()
           }
         }
       } else {
@@ -1884,6 +1995,7 @@ const GridEdit = props => {
           updateSelection();
           if (e?.key !== 'Tab') {
             cellEditable.focus();
+            onAddBorderSelectedCell(selectedCells.current, id);
           }
         }
         if (cellEditable) {
@@ -1929,11 +2041,11 @@ const GridEdit = props => {
                 e.preventDefault();
               }
             },
-            onClick: () => {
-              if (record[rowKey] !== editingKey && editingKey !== '') {
-                setEditingKey('');
-              }
-            },
+            // onClick: () => {
+            //   if (record[rowKey] !== editingKey && (editingKey !== '')) {
+            //     setEditingKey('')
+            //   }
+            // },
             tabIndex: (rowIndex ?? 0) * visibleCols.length + colIndex
           };
         },
@@ -1943,7 +2055,7 @@ const GridEdit = props => {
             className: classNames('ui-rc_cell-content ui-rc_cell-content--index', {}),
             onMouseDown: event => handleMouseDownRowHeader(rowNumber, colIndex, column, event),
             onMouseEnter: event => handleMouseEnterRowHeader(rowNumber, colIndex, event),
-            onMouseUp: handleMouseUp
+            onMouseUp: event => handleMouseUp(event)
           }, /*#__PURE__*/React.createElement("div", {
             className: 'ui-rc_content'
           }, findItemPath(dataSource, record, rowKey)));
@@ -1970,9 +2082,12 @@ const GridEdit = props => {
                   event.preventDefault();
                   event.stopPropagation();
                   handleEdit(record, column, column.editType, event);
-                  onRemoveBgSelectedCell(selectedCells.current, id);
-                  onRemoveBorderSelectedCell(selectedCells.current, id);
-                  selectedCells.current = new Set();
+
+                  // onRemoveBgSelectedCell(selectedCells.current, id)
+                  // onRemoveBorderSelectedCell(selectedCells.current, id)
+
+                  // selectedCells.current = new Set()
+
                   handleCellClick(rowNumber, record, column);
                   const hasKey = mergedExpandedKeys.has(key);
                   if (hasKey) {
@@ -2062,8 +2177,9 @@ const GridEdit = props => {
           onDoubleClick: event => {
             if (!isEditing(record) && record[rowKey] !== editingKey && isEditable(column, record)) {
               handleEdit(record, column, getEditType(column, record), event);
-              onRemoveBgSelectedCell(selectedCells.current, id);
-              onRemoveBorderSelectedCell(selectedCells.current, id);
+
+              // onRemoveBgSelectedCell(selectedCells.current, id)
+              // onRemoveBorderSelectedCell(selectedCells.current, id)
               handleCellClick(rowNumber, record, column);
             }
           },
@@ -2085,14 +2201,27 @@ const GridEdit = props => {
           },
           onClick: () => {
             if (record[rowKey] !== editingKey && editingKey !== '') {
-              setEditingKey('');
+              // setEditingKey('')
             } else {
+              if (record[rowKey] !== editingKey) {
+                onAddBorderSelectedCell(selectedCells.current, id);
+              }
               if (editingKey) {
                 handleCellClick(rowNumber, record, column);
               }
             }
           },
-          className: isEditing(record) ? `rc-ui-cell-editable cell-editing ${!isEditable(column, record) ? 'disable' : ''}` : `rc-ui-cell-editable cell-editable ${!isEditable(column, record) ? 'disable' : ''}`,
+          // className: isEditing(record) ? `rc-ui-cell-editable cell-editing ${!isEditable(column as any, record) ? 'disable' : ''}` : `rc-ui-cell-editable cell-editable ${!isEditable(column as any, record) ? 'disable' : ''}`,
+          className: classNames('rc-ui-cell-editable', {
+            'cell-editing': isEditing(record),
+            'cell-editable': !isEditing(record),
+            // selected: isSelectedCell(rangeCells,rowIndex, colIndex),
+            // 'cell-border-bottom': isRangeCell(rangeCells, 'bottom',rowIndex, colIndex),
+            // 'cell-border-right': isRangeCell(rangeCells, 'right',rowIndex, colIndex),
+            // 'cell-border-top': isRangeCell(rangeCells, 'top',rowIndex, colIndex),
+            // 'cell-border-left': isRangeCell(rangeCells, 'left',rowIndex, colIndex),
+            disable: !isEditable(column, record)
+          }),
           record,
           column: column,
           editType: getEditType(column, record),
@@ -2103,9 +2232,6 @@ const GridEdit = props => {
           'data-col-index': colIndex,
           'data-row-index': rowNumber,
           'data-tooltip-id': "tooltip-cell-content",
-          // 'data-tooltip-content': 'tooltip-cell-content',
-          // 'data-tooltip-delay-show': 1000,
-          // 'data-tooltip-content': getValueCell(column, record[column.field as any], format),
           editing: isEditing(record) && rowEditable?.(record) !== false && isEditable(column, record),
           cellEditing,
           t,
@@ -2195,6 +2321,40 @@ const GridEdit = props => {
       }
     };
   });
+  //   [
+  //   cellEditing,
+  //   columns,
+  //   dataErrors,
+  //   dataSource,
+  //   editingKey,
+  //   format,
+  //   getRowKey,
+  //   handleAddSingle,
+  //   handleCellClick,
+  //   handleClickColHeader,
+  //   handleCopy,
+  //   handleDeleteContent,
+  //   handleEdit,
+  //   handleFocusCell,
+  //   handleMouseDown,
+  //   handleMouseDownRowHeader,
+  //   handleMouseEnter,
+  //   handleMouseEnterRowHeader,
+  //   handleMouseUp,
+  //   handlePaste,
+  //   handlePointDoubleClick,
+  //   id,
+  //   isEditing,
+  //   isPasteDragging,
+  //   mergedExpandedKeys,
+  //   onTriggerExpand,
+  //   rowEditable,
+  //   rowKey,
+  //   setTooltipContent,
+  //   t,
+  //   visibleCols.length
+  // ])
+
   const transformColumns = React.useCallback(cols => {
     // @ts-ignore
     return cols.map(column => {
@@ -2202,6 +2362,14 @@ const GridEdit = props => {
       if (column === SELECTION_COLUMN) {
         return SELECTION_COLUMN;
       }
+
+      // Xử lý đệ quy cho children
+      if (column.children?.length) {
+        return {
+          ...column,
+          children: transformColumns(column.children)
+        };
+      }
       if (find) {
         return {
           ...find
@@ -2212,14 +2380,6 @@ const GridEdit = props => {
           ...column
         };
       }
-
-      // Xử lý đệ quy cho children
-      if (column.children?.length) {
-        return {
-          ...column,
-          children: transformColumns(column.children)
-        };
-      }
     });
   }, [convertColumns]);
   const mergedColumns = React.useMemo(() => transformColumns(columns ?? []), [transformColumns, columns]);
@@ -2302,10 +2462,12 @@ const GridEdit = props => {
   };
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(GridStyle, {
     $heightTable: height,
+    $heightScroll: scrollHeight,
     style: {
       position: 'relative'
     },
-    ref: ref
+    ref: ref,
+    id: id
   }, /*#__PURE__*/React.createElement(TableContext.Provider, {
     value: {
       rowKey,