refactor methor of checking for picture that must be wrapped

adobe · Mar 1, 2024 · 2523dd3 · 2523dd3
1 parent 8c166b2
commit 2523dd3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/dist/aem.js b/dist/aem.js
@@ -404,14 +404,11 @@ function wrapTextNodes(block) {
         && validWrappers.some((tagName) => blockColumn.firstElementChild.tagName === tagName);
       if (!hasWrapper) {
         wrap(blockColumn);
-      } else if (blockColumn.firstElementChild.tagName === 'PICTURE') {
-        const nonEmptySiblings = [...blockColumn.childNodes].some((n) => {
-          if (n.nodeType === Node.TEXT_NODE) return !!n.textContent.trim();
-          return n !== blockColumn.firstElementChild;
-        });
-        if (nonEmptySiblings) {
-          wrap(blockColumn);
-        }
+      } else if (
+        blockColumn.firstElementChild.tagName === 'PICTURE'
+        && (blockColumn.children.length > 1 || !!blockColumn.textContent.trim())
+      ) {
+        wrap(blockColumn);
       }
     }
   });

diff --git a/src/dom-utils.js b/src/dom-utils.js
@@ -151,14 +151,9 @@ export function wrapTextNodes(block) {
         && validWrappers.some((tagName) => blockColumn.firstElementChild.tagName === tagName);
       if (!hasWrapper) {
         wrap(blockColumn);
-      } else if (blockColumn.firstElementChild.tagName === 'PICTURE') {
-        const nonEmptySiblings = [...blockColumn.childNodes].some((n) => {
-          if (n.nodeType === Node.TEXT_NODE) return !!n.textContent.trim();
-          return n !== blockColumn.firstElementChild;
-        });
-        if (nonEmptySiblings) {
-          wrap(blockColumn);
-        }
+      } else if (blockColumn.firstElementChild.tagName === 'PICTURE'
+        && (blockColumn.children.length > 1 || !!blockColumn.textContent.trim())) {
+        wrap(blockColumn);
       }
     }
   });