Merge pull request udecode#2594 from OliverWales/fix-delete-column

Fix column deletion early return
OliverWales · Sep 1, 2023 · af41503 · af41503
2 parents 0ffad8d + d681ba6
commit af41503
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/.changeset/nine-singers-change.md b/.changeset/nine-singers-change.md
@@ -0,0 +1,5 @@
+---
+"@udecode/plate-table": patch
+---
+
+Fix column deletion early return
diff --git a/packages/table/src/queries/isTableBorderHidden.spec.tsx b/packages/table/src/queries/isTableBorderHidden.spec.tsx
@@ -1,9 +1,9 @@
 /** @jsx jsx */
 
 import { createPlateEditor, PlateEditor } from '@udecode/plate-common';
-import { createTablePlugin } from '@udecode/plate-table';
 import { jsx } from '@udecode/plate-test-utils';
 
+import { createTablePlugin } from '../createTablePlugin';
 import { isTableBorderHidden } from './isTableBorderHidden';
 
 jsx;

diff --git a/packages/table/src/transforms/deleteColumn.spec.tsx b/packages/table/src/transforms/deleteColumn.spec.tsx
@@ -119,7 +119,7 @@ describe('deleteColumn', () => {
   });
 
   describe('when first row has 2 cells, second row has 1 cell, focus 11', () => {
-    it('should do nothing', () => {
+    it('should delete 11', () => {
       const input = (
         <editor>
           <htable>

diff --git a/packages/table/src/transforms/deleteColumn.ts b/packages/table/src/transforms/deleteColumn.ts
@@ -55,11 +55,17 @@ export const deleteColumn = <V extends Value>(editor: PlateEditor<V>) => {
       const replacePathPos = pathToDelete.length - 2;
 
       withoutNormalizing(editor, () => {
-        tableEntry[0].children.forEach((row, rowIdx) => {
+        tableNode.children.forEach((row, rowIdx) => {
           pathToDelete[replacePathPos] = rowIdx;
 
-          // for rows with different lengths
-          if ((row.children as TElement[]).length < replacePathPos + 1) return;
+          // for tables containing rows of different lengths
+          // - don't delete if only one cell in row
+          // - don't delete if row doesn't have this cell
+          if (
+            (row.children as TElement[]).length === 1 ||
+            colIndex > (row.children as TElement[]).length - 1
+          )
+            return;
 
           removeNodes(editor, {
             at: pathToDelete,