🐛 make add new row span new column

Author: anaisberg

src/frontend/apps/impress/src/features/docs/doc-editor/components/custom-blocks/DatabaseBlock/DatabaseGrid.tsx

@@ -1,4 +1,4 @@
-import { ColDef, ICellRendererParams } from 'ag-grid-community';
+import { ColDef, ColSpanParams, ICellRendererParams } from 'ag-grid-community';
 import { AgGridReact } from 'ag-grid-react';
 import { useEffect } from 'react';
 
@@ -60,7 +60,8 @@ export const DatabaseGrid = ({
 
     const columns: ColDef[] = columnNames.map((key) => ({
       field: key,
-      colSpan: newRowColSpan,
+      colSpan: (params: ColSpanParams<Record<string, string>, unknown>) =>
+        newRowColSpan(params, columnNames.length + 1),
       cellRendererSelector: (
         params: ICellRendererParams<Record<string, string>>,
       ) => addRowCellRenderer(params, columnNames, setRowData),
@@ -97,20 +98,15 @@ export const DatabaseGrid = ({
     const columnNames = getColumnNames(colDefs);
     const newColDef: ColDef = {
       field: columnName,
-      colSpan: newRowColSpan,
+      colSpan: (params: ColSpanParams<Record<string, string>, unknown>) =>
+        newRowColSpan(params, columnNames.length + 1),
       cellRendererSelector: (
         params: ICellRendererParams<Record<string, string>>,
       ) => addRowCellRenderer(params, columnNames, setRowData),
     };
 
     setColDefs((prev) => {
-      const addColumn = prev?.pop();
-
-      return [
-        ...(prev ?? []),
-        newColDef,
-        ...(addColumn !== undefined ? [addColumn] : []),
-      ];
+      return [...(prev ?? []), newColDef];
     });
 
     void createColumns(documentId, tableId, [

src/frontend/apps/impress/src/features/docs/doc-editor/components/custom-blocks/DatabaseBlock/utils.ts

@@ -52,11 +52,12 @@ export const addRowCellRenderer = (
 
 export const newRowColSpan = (
   params: ColSpanParams<Record<string, string>>,
+  columnNumber: number,
 ) => {
   const colsValues = params.data ?? {};
   const isNewRow = Object.values(colsValues)[0] === ADD_NEW_ROW;
   if (isNewRow) {
-    return Object.keys(colsValues).length;
+    return columnNumber;
   }
 
   return 1;