MWPW-160360 - Decorate standalone text with body default styles

libs/utils/decorate.js

@@ -65,6 +65,13 @@ export function decorateIconArea(el) {
   });
 }
 
+function elContainsText(el) {
+  return [...el.childNodes].some(({ nodeType, innerText, textContent }) => (
+    (nodeType === Node.ELEMENT_NODE && innerText.trim() !== '')
+    || (nodeType === Node.TEXT_NODE && textContent.trim() !== '')
+  ));
+}
+
 export function decorateBlockText(el, config = ['m', 's', 'm'], type = null) {
   let headings = el.querySelectorAll('h1, h2, h3, h4, h5, h6');
   if (!el.classList.contains('default')) {
@@ -77,13 +84,12 @@ export function decorateBlockText(el, config = ['m', 's', 'm'], type = null) {
         decorateIconArea(el);
       }
     }
-    const emptyEls = el.querySelectorAll('p:not([class]), ul:not([class]), ol:not([class])');
+    const bodyStyle = `body-${config[1]}`;
+    const emptyEls = el.querySelectorAll(':is(p, ul, ol, div):not([class])');
     if (emptyEls.length) {
-      emptyEls.forEach((p) => p.classList.add(`body-${config[1]}`));
-    } else {
-      [...el.querySelectorAll('div:not([class])')]
-        .filter((emptyDivs) => emptyDivs.textContent.trim() !== '')
-        .forEach((text) => text.classList.add(`body-${config[1]}`));
+      [...emptyEls].filter(elContainsText).forEach((e) => e.classList.add(bodyStyle));
+    } else if (!el.classList.length && elContainsText(el)) {
+      el.classList.add(bodyStyle);
     }
   }
   const buttonSize = config.length > 3 ? `button-${config[3]}` : '';