fix: Fix broken result when there is a div inside a table cell

plone · Dec 4, 2022 · 5aba8ce · 5aba8ce
1 parent 34c602a
commit 5aba8ce
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 36 deletions.
diff --git a/src/converters/slate.js b/src/converters/slate.js
@@ -263,9 +263,7 @@ const slateTableBlock = (elem) => {
         const cells = [];
         for (const cell of tchild.children) {
           const cellType = cell.tagName === 'TD' ? 'data' : 'header';
-          const cellValue = Array.from(cell.childNodes)
-            .map(deserialize)
-            .filter((x) => x);
+          const cellValue = deserializeChildren(cell).filter((x) => x);
           cells.push(createCell(cellType, cellValue));
         }
         rows.push({ key: getId(), cells });

diff --git a/src/converters/slate.test.js b/src/converters/slate.test.js
@@ -492,6 +492,27 @@ describe('slateTextBlock processing a link', () => {
   });
 });
 
+describe('slateTextBlock processing a hr tag', () => {
+  const elem = elementFromString('<hr>');
+
+  test('will have @type as slate', () => {
+    const result = slateTextBlock(elem);
+    expect(result['@type']).toBe('slate');
+  });
+
+  test('will have an empty string for plaintext', () => {
+    const result = slateTextBlock(elem);
+    expect(result.plaintext).toBe('');
+  });
+
+  test('will have a nested structure in the value', () => {
+    const result = slateTextBlock(elem);
+    const valueElement = result.value[0];
+    expect(valueElement['type']).toBe('p');
+    expect(valueElement['children'][0]['text']).toBe('');
+  });
+});
+
 describe('slateTableBlock processing a simple table', () => {
   const elem = elementFromString('<table><tr><td>A value</td></tr></table>');
 
@@ -598,43 +619,36 @@ describe('slateTableBlock processing a table with a link', () => {
     expect(value['data']['url']).toBe('https://plone.org');
     expect(value['children'][0]['text']).toBe('site');
   });
+});
 
-  describe('slateTextBlock processing a hr tag', () => {
-    const elem = elementFromString('<hr>');
-
-    test('will have @type as slate', () => {
-      const result = slateTextBlock(elem);
-      expect(result['@type']).toBe('slate');
-    });
-
-    test('will have an empty string for plaintext', () => {
-      const result = slateTextBlock(elem);
-      expect(result.plaintext).toBe('');
-    });
+describe('slateTableBlock processing a table with text + sup', () => {
+  const elem = elementFromString(
+    '<table><tr><td>10<sup>2</sup></td></tr></table>',
+  );
 
-    test('will have a nested structure in the value', () => {
-      const result = slateTextBlock(elem);
-      const valueElement = result.value[0];
-      expect(valueElement['type']).toBe('p');
-      expect(valueElement['children'][0]['text']).toBe('');
-    });
+  test('will keep sup inline', () => {
+    const result = slateTableBlock(elem);
+    const cell = result.table.rows[0].cells[0];
+    expect(cell.value).toEqual([
+      { text: '10' },
+      {
+        type: 'sup',
+        children: [{ text: '2' }],
+      },
+    ]);
   });
+});
 
-  describe('slateTableBlock processing a table with text + sup', () => {
-    const elem = elementFromString(
-      '<table><tr><td>10<sup>2</sup></td></tr></table>',
-    );
+describe('slateTableBlock processing a table with a div', () => {
+  const elem = elementFromString(
+    '<table><tr><td><div><strong>text</strong></div></td></tr></table>',
+  );
 
-    test('will keep sup inline', () => {
-      const result = slateTableBlock(elem);
-      const cell = result.table.rows[0].cells[0];
-      expect(cell.value).toEqual([
-        { text: '10' },
-        {
-          type: 'sup',
-          children: [{ text: '2' }],
-        },
-      ]);
-    });
+  test('will remove the div', () => {
+    const result = slateTableBlock(elem);
+    const cell = result.table.rows[0].cells[0];
+    expect(cell.value).toEqual([
+      { type: 'strong', children: [{ text: 'text' }] },
+    ]);
   });
 });