#558: Content Types Output Style Attribute Removal

- use Dom adapter
- replace all style

Author: omiroshnichenko

app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentInterface.php

@@ -29,6 +29,15 @@ public function __toString(): string;
      */
     public function createDocumentFragment(): DocumentFragmentInterface;
 
+    /**
+     * Create new document element
+     *
+     * @param string $name
+     * @param string $value [optional]
+     * @return ElementInterface
+     */
+    public function createElement(string $name, string $value = null);
+
     /**
      * Returns the first element matching the specified selector.
      *

app/code/Magento/PageBuilder/Model/Dom/Adapter/ElementInterface.php

@@ -7,11 +7,26 @@
 
 namespace Magento\PageBuilder\Model\Dom\Adapter;
 
+use Gt\Dom\Element as GtDomElement;
+
 /**
  * Interface for Element wrappers
  */
 interface ElementInterface
 {
+    /**
+     * Return original element.
+     * @return GtDomElement
+     */
+    public function getOriginalElement(): GtDomElement;
+
+    /**
+     * Adds new child at the end of the children
+     * @param ElementInterface $newnode
+     * @return  ElementInterface
+     */
+    public function appendChild(ElementInterface $element): ElementInterface;
+
     /**
      * Returns true if the element would be selected by the specified selector string; otherwise, returns false.
      *

app/code/Magento/PageBuilder/Model/Dom/Document.php

@@ -62,6 +62,17 @@ public function createDocumentFragment(): DocumentFragmentInterface
         );
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createElement(string $name, string $value = null): ElementInterface
+    {
+        return $this->objectManager->create(
+            ElementInterface::class,
+            [ 'element' => $this->document->createElement($name, $value) ]
+        );
+    }
+
     /**
      * @inheritDoc
      */

app/code/Magento/PageBuilder/Model/Dom/Element.php

@@ -41,6 +41,26 @@ public function __construct(
         $this->element = $element;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getOriginalElement(): GtDomElement
+    {
+        return $this->element;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function appendChild(ElementInterface $element): ElementInterface
+    {
+        return $this->objectManager->create(
+            ElementInterface::class,
+            [ 'element' => $this->element->appendChild($element->getOriginalElement()) ]
+        );
+    }
+
+
     /**
      * @inheritDoc
      */

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

@@ -8,10 +8,9 @@
 
 namespace Magento\PageBuilder\Setup\Converters;
 
-use DOMDocument;
-use DOMElement;
-use DOMXPath;
 use Magento\Framework\DB\DataConverter\DataConverterInterface;
+use Magento\PageBuilder\Model\Dom\Adapter\ElementInterface;
+use Magento\PageBuilder\Model\Dom\HtmlDocumentFactory;
 
 /**
  * Convert Inline Styles to Internal
@@ -20,23 +19,23 @@ class PageBuilderStripStyles implements DataConverterInterface
 {
     const BODY_ID = 'html-body';
     const DATA_ATTRIBUTE = 'data-pb-style';
-    const XPATH_SELECTOR = '//*[@data-content-type][@style]|//*[@data-content-type]/*[@style]';
+    const SELECTOR = '[style]';
 
     /**
-     * @var DOMDocument
+     * @var HtmlDocumentFactory
      */
-    private $domDocument;
+    private $htmlDocumentFactory;
 
     /**
-     * @param DOMDocument $domDocument
+     * @param HtmlDocumentFactory $htmlDocumentFactory
      */
-    public function __construct(DOMDocument $domDocument)
+    public function __construct(HtmlDocumentFactory $htmlDocumentFactory)
     {
-        $this->domDocument = $domDocument;
+        $this->htmlDocumentFactory = $htmlDocumentFactory;
     }
 
     /**
-     * Generates `mageUtils.uniqueid()` Naming Convention
+     * Selecting all elements that contains inline styles and convert them in style blocks
      *
      * @return string
      */
@@ -68,18 +67,13 @@ private function generateInternalStyles(array $styleMap): string
      */
     public function convert($value): string
     {
-        \libxml_use_internal_errors(true);
-        $document = new DOMDocument();
-        $document->loadHTML($value);
-        $xpath = new DOMXPath($document);
-        \libxml_clear_errors();
-
-        $body = $document->documentElement->lastChild;
-        $nodes = $xpath->query(self::XPATH_SELECTOR); // Query for Inline Styles
+        $document = $this->htmlDocumentFactory->create([ 'document' => $value ]);
+        $nodes = $document->querySelectorAll(self::SELECTOR);
+        $body = $document->querySelector('body');
         $styleMap = [];
 
         foreach ($nodes as $node) {
-            /* @var DOMElement $node */
+            /* @var ElementInterface $node */
             $styleAttr = $node->getAttribute('style');
 
             if ($styleAttr) {
@@ -90,20 +84,17 @@ public function convert($value): string
             }
         }
 
-        // Style Block Generation
-        $style = $document->createElement(
-            'style',
-            $this->generateInternalStyles($styleMap)
-        );
-        $body->appendChild($style);
-
-        // @todo: Refactor
-        \preg_match(
-            '/<html><body>(.+)<\/body><\/html>$/si',
-            $document->saveHTML(),
-            $matches
-        );
-
-        return $matches && $nodes->count() > 0 ? $matches[1] : $value;
+        if (count($styleMap) > 0) {
+            // Style Block Generation
+            $style = $document->createElement(
+                'style',
+                $this->generateInternalStyles($styleMap)
+            );
+            $body->appendChild($style);
+
+            return $document->stripHtmlWrapperTags();
+        } else {
+            return $value;
+        }
     }
 }