Table unmerge (#4877)

packages/lexical-playground/__tests__/regression/4876-unmerge-cell.spec.mjs

@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+import {
+  click,
+  expect,
+  focusEditor,
+  initialize,
+  insertTable,
+  locate,
+  mergeTableCells,
+  selectCellsFromTableCords,
+  test,
+  unmergeTableCell,
+} from '../utils/index.mjs';
+
+test.describe('Regression test #4876', () => {
+  test.beforeEach(({isCollab, page}) => initialize({isCollab, page}));
+  test('unmerging cells should add cells to correct rows', async ({
+    page,
+    isPlainText,
+    isCollab,
+  }) => {
+    test.skip(isPlainText);
+
+    await focusEditor(page);
+
+    await insertTable(page, 4, 4);
+
+    await click(page, '.PlaygroundEditorTheme__tableCell');
+    await selectCellsFromTableCords(
+      page,
+      {x: 0, y: 1},
+      {x: 1, y: 3},
+      true,
+      false,
+    );
+
+    await mergeTableCells(page);
+
+    await unmergeTableCell(page);
+
+    const tableRow = await locate(page, 'tr');
+    expect(await tableRow.count()).toBe(4);
+    for (let i = 0; i < 4; i++) {
+      const tableCells = tableRow.nth(i).locator('th, td');
+      expect(await tableCells.count()).toBe(4);
+    }
+  });
+});

packages/lexical-playground/__tests__/utils/index.mjs

@@ -519,6 +519,14 @@ export async function waitForSelector(page, selector, options) {
   }
 }
 
+export async function locate(page, selector) {
+  let leftFrame = page;
+  if (IS_COLLAB) {
+    leftFrame = await page.frame('left');
+  }
+  return await leftFrame.locator(selector);
+}
+
 export async function selectorBoundingBox(page, selector) {
   let leftFrame = page;
   if (IS_COLLAB) {

packages/lexical-table/src/LexicalTableUtils.ts

@@ -621,7 +621,7 @@ export function $unmergeCell(): void {
     for (let i = 1; i < rowSpan; i++) {
       const currentRow = startRow + i;
       const currentRowMap = map[currentRow];
-      currentRowNode = row.getNextSibling();
+      currentRowNode = (currentRowNode || row).getNextSibling();
       invariant(
         DEPRECATED_$isGridRowNode(currentRowNode),
         'Expected row next sibling to be a row',