Merge branch 'MAGETWO-89880-slide-title' of github.com:magento-obsessive-owls/bluefoot into MAGETWO-89880-slide-title

Author: raith-hamzah

app/code/Magento/PageBuilder/Model/Config/ContentTypes/Converter.php

@@ -119,10 +119,10 @@ private function convertAppearancesData(\DOMElement $childNode): array
     private function convertAppearanceData(\DOMElement $appearanceNode): array
     {
         $appearanceData = [];
-        foreach ($appearanceNode->getElementsByTagName('data') as $dataNode) {
-            $dataName = $dataNode->attributes->getNamedItem('name')->nodeValue;
-            $appearanceData[$dataName] = $dataNode->nodeValue;
-        }
+        $appearanceData = array_merge(
+            $appearanceData,
+            $this->convertAppearanceProperties($appearanceNode)
+        );
         $previewTemplateNode = $appearanceNode->getElementsByTagName('preview_template')->item(0);
         if ($previewTemplateNode) {
             $appearanceData['preview_template'] = $previewTemplateNode->nodeValue;
@@ -135,23 +135,54 @@ private function convertAppearanceData(\DOMElement $appearanceNode): array
         if ($readerNode && $readerNode->nodeValue) {
             $appearanceData['readers'] = [$readerNode->nodeValue];
         } else {
-            $readersNode = $appearanceNode->getElementsByTagName('readers')->item(0);
-            $readers = [];
-            if ($readersNode) {
-                foreach ($readersNode->getElementsByTagName('reader') as $readerNode) {
-                    $readers[] = $this->getAttributeValue($readerNode, 'component');
-                }
-            }
-            $appearanceData['readers'] = $readers;
+            $appearanceData['readers'] = $this->convertAppearanceReaders($appearanceNode);
         }
         $dataMappingNode = $appearanceNode->getElementsByTagName('data_mapping')->item(0);
         if ($dataMappingNode) {
             $appearanceData['data_mapping'] = $this->convertDataMapping($dataMappingNode);
         }
         $appearanceData['default'] = $this->getAttributeValue($appearanceNode, 'default');
+        $formNode = $appearanceNode->getElementsByTagName('form')->item(0);
+        if ($formNode && $formNode->nodeValue) {
+            $appearanceData['form'] = $formNode->nodeValue;
+        }
         return $appearanceData;
     }
 
+    /**
+     * Convert appearance properties
+     *
+     * @param \DOMElement $elementNode
+     * @return array
+     */
+    private function convertAppearanceProperties(\DOMElement $elementNode): array
+    {
+        $data = [];
+        foreach ($elementNode->getElementsByTagName('data') as $dataNode) {
+            $dataName = $dataNode->attributes->getNamedItem('name')->nodeValue;
+            $data[$dataName] = $dataNode->nodeValue;
+        }
+        return $data;
+    }
+
+    /**
+     * Convert appearance readers
+     *
+     * @param \DOMElement $elementNode
+     * @return array
+     */
+    private function convertAppearanceReaders(\DOMElement $elementNode): array
+    {
+        $readersNode = $elementNode->getElementsByTagName('readers')->item(0);
+        $readers = [];
+        if ($readersNode) {
+            foreach ($readersNode->getElementsByTagName('reader') as $readerNode) {
+                $readers[] = $this->getAttributeValue($readerNode, 'component');
+            }
+        }
+        return $readers;
+    }
+
     /**
      * Validate that configuration appearances has default appearance
      *

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Accordion.php

@@ -59,6 +59,7 @@ public function render(array $itemData, array $additionalData = [])
 
         $rootElementAttributes = [
             'data-role' => 'accordion',
+            'data-appearance' => 'default',
             'data-mage-init' => $this->getMageInitValue($itemData),
             'class' => 'pagebuilder-accordion ' . ($eavData['css_classes'] ?? '')
         ];

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/AdvancedSlider.php

@@ -50,6 +50,7 @@ public function render(array $itemData, array $additionalData = [])
 
         $rootElementAttributes = [
             'data-role' => 'slider',
+            'data-appearance' => 'default',
             'data-autoplay' => isset($eavData['autoplay']) ? $eavData['autoplay'] : '',
             'data-autoplay-speed' => isset($eavData['autoplay_speed']) ? $eavData['autoplay_speed'] : '',
             'data-fade' => isset($eavData['fade']) ? $eavData['fade'] : '',

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/AdvancedSliderItem.php

@@ -47,6 +47,7 @@ public function render(array $itemData, array $additionalData = [])
 
         $rootElementAttributes = [
             'data-role' => 'slide',
+            'data-appearance' => 'poster',
             'class' => $eavData['css_classes'] ?? ''
         ];
 

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Anchor.php

@@ -44,6 +44,7 @@ public function render(array $itemData, array $additionalData = [])
 
         $rootElementAttributes = [
             'data-role' => 'anchor',
+            'data-appearance' => 'default',
             'class' => $eavData['css_classes'] ?? '',
             'id' => $eavData['anchor_id']
         ];

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Block.php

@@ -75,6 +75,7 @@ public function render(array $itemData, array $additionalData = [])
 
         $rootElementAttributes = [
             'data-role' => 'block',
+            'data-appearance' => 'default',
             'class' => $itemData['formData']['css_classes'] ?? '',
             'data-identifier' => $blockIdentifier
         ];

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/ButtonItem.php

@@ -46,6 +46,7 @@ public function render(array $itemData, array $additionalData = [])
 
         $rootElementAttributes = [
             'data-role' => 'button-item',
+            'data-appearance' => 'default',
             'style' => 'display: inline-block;',
             'class' => $cssClasses
         ];

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Buttons.php

@@ -44,6 +44,7 @@ public function render(array $itemData, array $additionalData = [])
 
         $rootElementAttributes = [
             'data-role' => 'buttons',
+            'data-appearance' => 'default',
             'class' => $eavData['css_classes'] ?? ''
         ];
 

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Code.php

@@ -52,7 +52,7 @@ public function render(array $itemData, array $additionalData = [])
             }
         }
 
-        $rootElementHtml = '<div data-role="html"><pre';
+        $rootElementHtml = '<div data-role="html" data-appearance="default"><pre';
         foreach ($preElementAttributes as $attributeName => $attributeValue) {
             $rootElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
         }

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Column.php

@@ -40,6 +40,7 @@ public function render(array $itemData, array $additionalData = [])
 
         $rootElementAttributes = [
             'data-role' => 'column',
+            'data-appearance' => 'full-height',
             'class' => $itemData['formData']['css_classes'] ?? '',
             'style' => '',
         ];