magento · omiroshnichenko · Sep 28, 2020 · Aug 27, 2020 · Aug 27, 2020 · Aug 27, 2020
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/ElementInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/ElementInterface.php
@@ -45,6 +45,14 @@ public function closest(string $selectors): ?ElementInterface;
      */
     public function getAttribute($name): ?string;
 
+    /**
+     * Removes the Specified Attribute
+     *
+     * @param string $name
+     * @return bool|null
+     */
+    public function removeAttribute($name): ?bool;
+
     /**
      * Sets the value of the specified attribute
      *

diff --git a/app/code/Magento/PageBuilder/Model/Dom/Element.php b/app/code/Magento/PageBuilder/Model/Dom/Element.php
@@ -79,6 +79,14 @@ public function getAttribute($name): ?string
         return $this->element->getAttribute($name);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function removeAttribute($name): ?bool
+    {
+        return $this->element->removeAttribute($name);
+    }
+
     /**
      * @inheritDoc
      */

diff --git a/app/code/Magento/PageBuilder/Setup/Converters/PageBuilderStripStyles.php b/app/code/Magento/PageBuilder/Setup/Converters/PageBuilderStripStyles.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types = 1);
+
+namespace Magento\PageBuilder\Setup\Converters;
+
+use DOMDocument;
+use DOMElement;
+use DOMXPath;
+use Magento\Framework\DB\DataConverter\DataConverterInterface;
+
+/**
+ * Convert Inline Styles to Internal
+ */
+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]';
+
+    /**
+     * @var DOMDocument
+     */
+    private $domDocument;
+
+    /**
+     * @param DOMDocument $domDocument
+     */
+    public function __construct(DOMDocument $domDocument)
+    {
+        $this->domDocument = $domDocument;
+    }
+
+    /**
+     * Generates `mageUtils.uniqueid()` Naming Convention
+     *
+     * @return string
+     */
+    private function generateDataAttribute(): string
+    {
+        return \strtoupper(\uniqid());
+    }
+
+    /**
+     * Converts Inline Styles to Internal Styles
+     *
+     * @param array $styleMap
+     * @return string
+     */
+    private function generateInternalStyles(array $styleMap): string
+    {
+        $output = '';
+
+        foreach ($styleMap as $selector => $styles) {
+            $output .= '#' . self::BODY_ID . ' [' . self::DATA_ATTRIBUTE . '="' . $selector . '"]';
+            $output .= '{' . $styles . '}';
+        }
+
+        return $output;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    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
+        $styleMap = [];
+
+        foreach ($nodes as $node) {
+            /* @var DOMElement $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');
+            }
+        }
+
+        // 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;
+    }
+}
diff --git a/app/code/Magento/PageBuilder/Setup/Patch/Data/UpgradePageBuilderStripStyles.php b/app/code/Magento/PageBuilder/Setup/Patch/Data/UpgradePageBuilderStripStyles.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types = 1);
+
+namespace Magento\PageBuilder\Setup\Patch\Data;
+
+use Magento\Framework\DB\FieldDataConversionException;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\PageBuilder\Setup\Converters\PageBuilderStripStyles;
+use Magento\PageBuilder\Setup\UpgradeContentHelper;
+
+/**
+ * Patch Upgrade Mechanism for Converting Inline Styles to Internal
+ */
+class UpgradePageBuilderStripStyles implements DataPatchInterface
+{
+    /**
+     * @var UpgradeContentHelper
+     */
+    private $helper;
+
+    /**
+     * @param UpgradeContentHelper $helper
+     */
+    public function __construct(UpgradeContentHelper $helper)
+    {
+        $this->helper = $helper;
+    }
+
+    /**
+     * Upgrade
+     *
+     * @return void
+     * @throws FieldDataConversionException
+     */
+    public function apply()
+    {
+        $this->helper->upgrade([
+            PageBuilderStripStyles::class
+        ]);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies(): array
+    {
+        return [];
+    }
+}