Skip to content

Commit 27985a5

Browse files
author
Michael Yu
committed
Merge remote-tracking branch 'origin/MC-518-simlify-mapping-of-content-type-elements' into cms-team-2-sprint-12
2 parents 0954b2e + d8635b0 commit 27985a5

File tree

130 files changed

+716
-512
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+716
-512
lines changed

‎app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,7 @@ private function convertDataMapping(\DOMElement $childNode): array
203203
$elementData = [];
204204
foreach ($childNode->getElementsByTagName('element') as $elementNode) {
205205
$elementName = $elementNode->attributes->getNamedItem('name')->nodeValue;
206-
$elementPath = ($elementNode->attributes->getNamedItem('path')
207-
? $elementNode->attributes->getNamedItem('path')->nodeValue : '');
208206
$elementData[$elementName] = [
209-
'path' => $elementPath,
210207
'style' => $this->convertProperties($elementNode),
211208
'attributes' => $this->convertAttributes($elementNode),
212209
'html' => $this->convertHtml($elementNode),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public function render(array $itemData, array $additionalData = []) : string
6060
$eavData = $this->eavAttributeLoader->load($itemData['entityId']);
6161

6262
$rootElementAttributes = [
63+
'data-element' => 'main',
6364
'data-role' => 'accordion',
6465
'data-appearance' => 'default',
6566
'data-mage-init' => $this->getMageInitValue($itemData),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public function render(array $itemData, array $additionalData = []) : string
5151
$cssClasses .= isset($eavData['css_classes']) ? ' pagebuilder-slider' : 'pagebuilder-slider';
5252

5353
$rootElementAttributes = [
54+
'data-element' => 'main',
5455
'data-role' => 'slider',
5556
'data-appearance' => 'default',
5657
'data-autoplay' => isset($eavData['autoplay']) ? $eavData['autoplay'] : '',

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public function render(array $itemData, array $additionalData = []) : string
4848
$eavData = $this->eavAttributeLoader->load($itemData['entityId']);
4949

5050
$rootElementAttributes = [
51+
'data-element' => 'main',
5152
'data-role' => 'slide',
5253
'data-appearance' => 'poster',
5354
'class' => $eavData['css_classes'] ?? ''
@@ -67,16 +68,17 @@ public function render(array $itemData, array $additionalData = []) : string
6768
}
6869

6970
$wrapperDivElementAttributes = [
71+
'data-element' => 'mobile_image',
7072
'class' => 'pagebuilder-slide-wrapper pagebuilder-mobile-only'
7173
];
7274
$style = $this->styleExtractor->extractStyle($formData);
7375
if ($style) {
7476
$wrapperDivElementAttributes['style'] = $style;
7577
}
7678

79+
$overlayDivElementAttributes['data-element'] = 'overlay';
7780
$overlayDivElementAttributes['class'] = 'pagebuilder-overlay pagebuilder-poster-overlay';
7881
$style = $this->styleExtractor->extractStyle($formData, ['padding']);
79-
8082
$overlayColor = 'transparent';
8183
if (isset($eavData['has_overlay']) && $eavData['has_overlay'] == 1) {
8284
$overlayColor = 'rgba(0,0,0,0.5)';
@@ -93,40 +95,42 @@ public function render(array $itemData, array $additionalData = []) : string
9395
$buttonElementHtml = '';
9496
// Advanced slider item only requires link text, slider item requires both
9597
if (isset($eavData['link_text']) || (isset($eavData['link_url']) && isset($eavData['title_tag']))) {
96-
$buttonElementHtml = '<button type="button" class="pagebuilder-slide-button pagebuilder-button-primary" ';
98+
$buttonElementHtml = '<button data-element="button" ';
99+
$buttonElementHtml .= 'type="button" class="pagebuilder-slide-button pagebuilder-button-primary" ';
97100
$buttonElementHtml .= 'style="opacity: 1; visibility: visible;">';
98101
$buttonElementHtml .= ($eavData['link_text'] ?? $eavData['title_tag'] ?? '');
99102
$buttonElementHtml .= '</button>';
100103
}
101104

102105
// mobile wrapper div
103-
$rootElementHtml = '<div' . $this->printAttributes($rootElementAttributes);
104-
$rootElementHtml .= '><a';
106+
$rootElementHtml = '<div' . $this->printAttributes($rootElementAttributes) . '><a data-element="link"';
105107
$rootElementHtml .= isset($eavData['link_url']) ? ' href="' . $eavData['link_url'] . '">' : '>';
106108
$rootElementHtml .= '<div'
107109
. $this->printAttributes($wrapperDivElementAttributes)
108110
. '><div'
109111
. $this->printAttributes($overlayDivElementAttributes)
110112
. '><div class="pagebuilder-poster-content">'
113+
. '<div data-element="content">'
111114
. '<h3>'
112115
. ($eavData['title'] ?? $eavData['title_tag'] ?? '')
113116
. '</h3>'
114-
. '<div>' . ($eavData['textarea'] ?? '') . '</div>'
117+
. '<div>' . ($eavData['textarea'] ?? '') . '</div></div>'
115118
. $buttonElementHtml
116119
. '</div></div></div>';
117120

118121
// non-mobile wrapper div
122+
$wrapperDivElementAttributes['data-element'] = 'desktop_image';
119123
$wrapperDivElementAttributes['class'] = 'pagebuilder-slide-wrapper ' .
120124
'pagebuilder-mobile-hidden';
121125
$rootElementHtml .= '<div'
122126
. $this->printAttributes($wrapperDivElementAttributes)
123127
. '><div'
124128
. $this->printAttributes($overlayDivElementAttributes)
125129
. '><div class="pagebuilder-poster-content">'
126-
. '<h3>'
130+
. '<div data-element="content"><h3>'
127131
. ($eavData['title'] ?? $eavData['title_tag'] ?? '')
128132
. '</h3>'
129-
. '<div>' . ($eavData['textarea'] ?? '') . '</div>'
133+
. '<div>' . ($eavData['textarea'] ?? '') . '</div></div>'
130134
. $buttonElementHtml
131135
. '</div></div></div>';
132136

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public function render(array $itemData, array $additionalData = []) : string
4545
$eavData = $this->eavAttributeLoader->load($itemData['entityId']);
4646

4747
$rootElementAttributes = [
48+
'data-element' => 'main',
4849
'data-role' => 'anchor',
4950
'data-appearance' => 'default',
5051
'class' => $eavData['css_classes'] ?? '',

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public function render(array $itemData, array $additionalData = []) : string
7676
}
7777

7878
$rootElementAttributes = [
79+
'data-element' => 'main',
7980
'data-role' => 'block',
8081
'data-appearance' => 'default',
8182
'class' => $itemData['formData']['css_classes'] ?? ''

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public function render(array $itemData, array $additionalData = []) : string
4747
$cssClasses = $eavData['css_classes'] ?? '';
4848

4949
$rootElementAttributes = [
50+
'data-element' => 'main',
5051
'data-role' => 'button-item',
5152
'data-appearance' => 'default',
5253
'style' => 'display: inline-block;',
@@ -66,10 +67,10 @@ public function render(array $itemData, array $additionalData = []) : string
6667
$rootElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
6768
}
6869

69-
$rootElementHtml .= '><a href="'
70+
$rootElementHtml .= '><a data-element="link" href="'
7071
. ($eavData['link_url'] ?? '') . '"'
7172
. $buttonStyleAttribute
72-
. ' class="pagebuilder-button-primary"><span>'
73+
. ' class="pagebuilder-button-primary"><span data-element="link_text">'
7374
. ($eavData['link_text'] ?? '')
7475
. '</span></a></div>';
7576

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public function render(array $itemData, array $additionalData = []) : string
4545
$eavData = $this->eavAttributeLoader->load($itemData['entityId']);
4646

4747
$rootElementAttributes = [
48+
'data-element' => 'main',
4849
'data-role' => 'buttons',
4950
'data-appearance' => 'inline',
5051
'class' => $eavData['css_classes'] ?? '',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function render(array $itemData, array $additionalData = []) : string
5454
}
5555
}
5656

57-
$rootElementHtml = '<div data-role="html" data-appearance="default"><pre';
57+
$rootElementHtml = '<div data-element="main" data-role="html" data-appearance="default"><pre';
5858
foreach ($preElementAttributes as $attributeName => $attributeValue) {
5959
$rootElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
6060
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public function render(array $itemData, array $additionalData = []) : string
4747
}
4848

4949
$rootElementAttributes = [
50+
'data-element' => 'main',
5051
'data-role' => 'column',
5152
'data-appearance' => 'full-height',
5253
'class' => $itemData['formData']['css_classes'] ?? '',

0 commit comments

Comments
 (0)