feat: Copy a range of cells and paste it into another range, extendin…

…g the target range if it is too small - Unable to paste all. silevis#280
qiufeihong2018 · Dec 19, 2023 · bd62435 · bd62435
1 parent c6e5212
commit bd62435
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/src/lib/Functions/expandGridIfNeeded.ts b/src/lib/Functions/expandGridIfNeeded.ts
@@ -20,22 +20,6 @@ export const expandGridIfNeeded = (
   const currentRowCount = cellMatrix.rows.length;
   const currentColumnCount = cellMatrix.columns.length;
 
-  // Add new rows if needed
-  if (endRow >= currentRowCount) {
-    const rowsToAdd = endRow - currentRowCount + 1;
-    const prefix = cellMatrix.rows[currentRowCount - 1];
-    for (let i = 0; i < rowsToAdd; i++) {
-      cellMatrix.rows.push({
-        ...prefix,
-        idx: currentRowCount + i,
-        rowId: `row-${currentRowCount + i}`,
-        top: prefix.bottom,
-        bottom: prefix.bottom + prefix.height || CellMatrix.DEFAULT_ROW_HEIGHT,
-      });
-    }
-    updated = true;
-  }
-
   // Add new columns if needed
   if (endColumn >= currentColumnCount) {
     const columnsToAdd = endColumn - currentColumnCount + 1;
@@ -59,6 +43,22 @@ export const expandGridIfNeeded = (
     updated = true;
   }
 
+  // Add new rows if needed
+  if (endRow >= currentRowCount) {
+    const rowsToAdd = endRow - currentRowCount + 1;
+    const prefix = cellMatrix.rows[currentRowCount - 1];
+    for (let i = 0; i < rowsToAdd; i++) {
+      cellMatrix.rows.push({
+        ...prefix,
+        idx: currentRowCount + i,
+        rowId: `row-${currentRowCount + i}`,
+        top: prefix.bottom,
+        bottom: prefix.bottom + prefix.height || CellMatrix.DEFAULT_ROW_HEIGHT,
+      });
+    }
+    updated = true;
+  }
+
   // If needed, add a new status column that returns only when the grid is actually updated
   return updated ? { ...state, cellMatrix } : state;
 };
diff --git a/src/test/TestGrid.tsx b/src/test/TestGrid.tsx
@@ -320,6 +320,7 @@ export const TestGrid: React.FC<TestGridProps> = (props) => {
   // eslint-disable-next-line
   rows[0].cells.find((cell) => cell.type === "text" && cell.text);
 
+
   const handleChanges = (changes: CellChange<TestGridCells>[]) => {
     setRows((prevRows) => {
       const currentRows = [...prevRows];
@@ -329,13 +330,16 @@ export const TestGrid: React.FC<TestGridProps> = (props) => {
         );
         // Extension column
         if (changeColumnIdx === -1) {
-          setColumns([
+          const newColumn = [
             ...columns,
             {
               columnId: change.columnId,
             } as Column,
-          ]);
-          changeColumnIdx = columns.length - 1;
+          ] as Column[];
+          setColumns(newColumn);
+          changeColumnIdx = newColumn.findIndex(
+            (el) => el.columnId === change.columnId
+          );
         }
         let changeRowIdx = currentRows.findIndex(
           (el) => el.rowId === change.rowId
@@ -373,7 +377,6 @@ export const TestGrid: React.FC<TestGridProps> = (props) => {
     });
   };
 
-
   const reorderArray = <T extends unknown>(
     arr: T[],
     idxs: number[],

diff --git a/src/test/testEnvConfig.ts b/src/test/testEnvConfig.ts
@@ -25,8 +25,8 @@ export const config: TestConfig = {
     minCellWidth: 40,
     fillHandleWidth: 18,
 
-    columns: 10,
-    rows: 10,
+    columns: 5,
+    rows: 5,
 
     lineWidth: 1,