#558: Content Types Output Style Attribute Removal

- Merge from `558_1_content-type-style-attribute-removal-proposed`
- Code Review Feedback/Amends

Author: bluemwhitew

app/code/Magento/PageBuilder/Setup/Converters/PageBuilderStripStyles.php

@@ -17,9 +17,9 @@
  */
 class PageBuilderStripStyles implements DataConverterInterface
 {
-    const BODY_ID = 'html-body';
-    const DATA_ATTRIBUTE = 'data-pb-style';
-    const SELECTOR = '[style]';
+    private const BODY_ID = 'html-body';
+    private const DATA_ATTRIBUTE = 'data-pb-style';
+    private const SELECTOR = '[style]';
 
     /**
      * @var HtmlDocumentFactory
@@ -35,7 +35,7 @@ public function __construct(HtmlDocumentFactory $htmlDocumentFactory)
     }
 
     /**
-     * Selecting all elements that contains inline styles and convert them in style blocks
+     * Generates `mageUtils.uniqueid()` Naming Convention
      *
      * @return string
      */
@@ -68,33 +68,38 @@ private function generateInternalStyles(array $styleMap): string
     public function convert($value): string
     {
         $document = $this->htmlDocumentFactory->create([ 'document' => $value ]);
-        $nodes = $document->querySelectorAll(self::SELECTOR);
         $body = $document->querySelector('body');
-        $styleMap = [];
+        $nodes = $document->querySelectorAll(self::SELECTOR);
 
-        foreach ($nodes as $node) {
-            /* @var ElementInterface $node */
-            $styleAttr = $node->getAttribute('style');
+        if ($nodes->count() > 0) {
+            $styleMap = [];
 
-            if ($styleAttr) {
-                $generatedDataAttribute = $this->generateDataAttribute();
-                $node->setAttribute(self::DATA_ATTRIBUTE, $generatedDataAttribute);
-                $styleMap[$generatedDataAttribute] = $styleAttr; // Amend Array for Internal Style Generation
-                $node->removeAttribute('style');
+            foreach ($nodes as $node) {
+                /* @var ElementInterface $node */
+                $styleAttr = $node->getAttribute('style');
+
+                if ($styleAttr) {
+                    $generatedDataAttribute = $this->generateDataAttribute();
+                    $node->setAttribute(self::DATA_ATTRIBUTE, $generatedDataAttribute);
+                    $styleMap[$generatedDataAttribute] = $styleAttr; // Amend Array for Internal Style Generation
+                    $node->removeAttribute('style');
+                }
             }
-        }
 
-        if (count($styleMap) > 0) {
-            // Style Block Generation
-            $style = $document->createElement(
-                'style',
-                $this->generateInternalStyles($styleMap)
-            );
-            $body->appendChild($style);
-
-            return $document->stripHtmlWrapperTags();
-        } else {
-            return $value;
+            if (count($styleMap) > 0) {
+                // Style Block Generation
+                $style = $document->createElement(
+                    'style',
+                    $this->generateInternalStyles($styleMap)
+                );
+                $body->appendChild($style);
+
+                return $document->stripHtmlWrapperTags();
+            } else {
+                return $value;
+            }
         }
+
+        return $value;
     }
 }

dev/tests/integration/testsuite/Magento/PageBuilder/Setup/Converters/PageBuilderStripStylesTest.php

@@ -17,6 +17,8 @@
 
 class PageBuilderStripStylesTest extends TestCase
 {
+    private const XPATH_SELECTOR = '//*[@data-content-type][@style]|//*[@data-content-type]/*[@style]';
+
     /**
      * @var ObjectManagerInterface
      */
@@ -53,7 +55,7 @@ public function testConvert(string $htmlString, int $expectedStyleTags)
         \libxml_clear_errors();
 
         $getInternalStyles = false;
-        $nodesBefore = $xpathBefore->query(PageBuilderStripStyles::XPATH_SELECTOR);
+        $nodesBefore = $xpathBefore->query(self::XPATH_SELECTOR);
         $styleRules = [];
 
         foreach ($nodesBefore as $node) {
@@ -67,7 +69,7 @@ public function testConvert(string $htmlString, int $expectedStyleTags)
         }
 
         // Assert Inline Styles Were Removed
-        $this->assertEquals(0, \count($xpathAfter->query(PageBuilderStripStyles::XPATH_SELECTOR)));
+        $this->assertEquals(0, \count($xpathAfter->query(self::XPATH_SELECTOR)));
 
         // Assert Expected Internal Styles
         $this->assertEquals($expectedStyleTags, \count($xpathAfter->query('//style')));