@adobe/helix-importer 1.6.0 → 1.7.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.7.0](https://github.com/adobe/helix-importer/compare/v1.6.0...v1.7.0) (2022-03-09)
+
+
+### Features
+
+* do not change span with an image ([db51e1c](https://github.com/adobe/helix-importer/commit/db51e1cb068d44571c97c83d6e25b38f8e27003e))
+
 # [1.6.0](https://github.com/adobe/helix-importer/compare/v1.5.0...v1.6.0) (2022-02-24)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-importer",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Helix Importer tool: create md / docx from html",
   "main": "src/index.js",
   "type": "module",

package/src/utils/DOMUtils.js

@@ -144,10 +144,13 @@ export default class DOMUtils {
   static removeSpans(document) {
     // remove spans
     document.querySelectorAll('span').forEach((span) => {
-      if (span.textContent === '') {
-        span.remove();
-      } else {
-        span.replaceWith(JSDOM.fragment(span.innerHTML));
+      if (!span.querySelector('img')) {
+        // do not touch spans with images
+        if (span.textContent === '') {
+          span.remove();
+        } else {
+          span.replaceWith(JSDOM.fragment(span.innerHTML));
+        }
       }
     });
   }

package/test/utils/DOMUtils.spec.js

@@ -188,6 +188,8 @@ describe('DOMUtils#removeSpans tests', () => {
     test('<p><span>Content should remain</span> the same</p>', '<p>Content should remain the same</p>');
     test('<p>Spacing<span> should</span> remain the same</p>', '<p>Spacing should remain the same</p>');
     test('<p>Spacing<span> should</span> remain the <span>same even</span> with<span> multiple spans</span></p>', '<p>Spacing should remain the same even with multiple spans</p>');
+    test('<span><div><img src="animage.jpg"></div></span>', '<span><div><img src="animage.jpg"></div></span>');
+    test('<span>Some image here: <div><img src="animage.jpg"></div></span>', '<span>Some image here: <div><img src="animage.jpg"></div></span>');
   });
 });