fix: Additional cases related to #21

plone · Mar 6, 2023 · 6e137f9 · 6e137f9
1 parent aca1fba
commit 6e137f9
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/src/converters/fromHtml.js b/src/converters/fromHtml.js
@@ -127,7 +127,15 @@ const convertFromHTML = (input, defaultTextBlock) => {
         el.removeChild(child);
         result.push(blockFromElement(child, defaultTextBlock));
       } else {
-        keepWrapper = true;
+        keepWrapper = shouldKeepWrapper(child);
+      }
+      // Check for grandchild nodes containing elementsWithConverters
+      const gchildren = child.childNodes;
+      for (const gchild of gchildren) {
+        if (elementsWithConverters.includes(gchild.tagName)) {
+          child.removeChild(gchild);
+          result.push(blockFromElement(gchild, defaultTextBlock));
+        }
       }
     }
     if (keepWrapper) {

diff --git a/src/converters/fromHtml.test.js b/src/converters/fromHtml.test.js
@@ -419,4 +419,34 @@ describe('convertFromHTML parsing image', () => {
       },
     ]);
   });
+
+  describe('inside a nested span element containing valid text', () => {
+    const html = '<p><span><img src="image.jpeg" />text</span></p>';
+
+    const result = convertFromHTML(html, 'slate');
+    expect(result).toHaveLength(2);
+    expect(result[0]).toEqual({
+      '@type': 'image',
+      align: 'center',
+      alt: '',
+      size: 'l',
+      title: '',
+      url: 'image.jpeg',
+    });
+  });
+});
+
+describe('inside a nested span element, with a sibling containing valid text', () => {
+  const html = '<p><span><img src="image.jpeg" /></span><span>text</span></p>';
+
+  const result = convertFromHTML(html, 'slate');
+  expect(result).toHaveLength(2);
+  expect(result[0]).toEqual({
+    '@type': 'image',
+    align: 'center',
+    alt: '',
+    size: 'l',
+    title: '',
+    url: 'image.jpeg',
+  });
 });