Skip to content

Commit 1c45409

Browse files
MC-3479: Remove Accordion
- add classes and styles to accordion and not html wrapper
1 parent fadc684 commit 1c45409

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

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

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

6262
$rootElementAttributes = [
63-
'data-element' => 'main',
64-
'data-role' => 'html',
65-
'data-appearance' => 'default',
66-
'class' => $eavData['css_classes'] ?? ''
63+
'data-mage-init' => $this->getMageInitValue($itemData),
64+
'class' => 'pagebuilder-accordion ' . ($eavData['css_classes'] ?? '')
6765
];
66+
6867
$rootElementAttributes['class'] = rtrim($rootElementAttributes['class']);
6968

7069
if (isset($itemData['formData'])) {
@@ -74,13 +73,15 @@ public function render(array $itemData, array $additionalData = []) : string
7473
}
7574
}
7675

77-
$rootElementHtml = '<div';
76+
$accordionElementHtml = '<div';
7877
foreach ($rootElementAttributes as $attributeName => $attributeValue) {
79-
$rootElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
78+
$accordionElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
8079
}
81-
$rootElementHtml .= '><div class="pagebuilder-accordion" data-mage-init="' . $this->getMageInitValue($itemData) . '">' .
82-
(isset($additionalData['children']) ? $additionalData['children'] : '') .
83-
'</div></div>';
80+
$accordionElementHtml .= '>' . (isset($additionalData['children']) ? $additionalData['children'] : '') .
81+
'</div>';
82+
83+
$rootElementHtml = '<div data-element="main" data-role="html" data-appearance="default">';
84+
$rootElementHtml .= $accordionElementHtml . '</div>';
8485

8586
return $rootElementHtml;
8687
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="html" data-appearance="default" class="one two"><div class="pagebuilder-accordion" data-mage-init="{&quot;accordion&quot;:{&quot;active&quot;:[0],&quot;collapsibleElement&quot;:&quot;[data-collapsible=true]&quot;,&quot;content&quot;:&quot;[data-content=true]&quot;}}"><div data-collapsible="true" class="item title accordion-collapsible" data-open-on-load="0"><div class="switch" data-role="trigger"><span>Accordion Title</span></div></div><div data-content="true" class="item content accordion-content"><p>Accordion Contents</p></div></div></div></div>
1+
<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="html" data-appearance="default"><div data-mage-init="{&quot;accordion&quot;:{&quot;active&quot;:[0],&quot;collapsibleElement&quot;:&quot;[data-collapsible=true]&quot;,&quot;content&quot;:&quot;[data-content=true]&quot;}}" class="pagebuilder-accordion one two"><div data-collapsible="true" class="item title accordion-collapsible" data-open-on-load="0"><div class="switch" data-role="trigger"><span>Accordion Title</span></div></div><div data-content="true" class="item content accordion-content"><p>Accordion Contents</p></div></div></div></div>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="html" data-appearance="default" class="one two"><div class="pagebuilder-accordion" data-mage-init="{&quot;accordion&quot;:{&quot;active&quot;:[1],&quot;collapsibleElement&quot;:&quot;[data-collapsible=true]&quot;,&quot;content&quot;:&quot;[data-content=true]&quot;}}"><div data-collapsible="true" class="item title accordion-collapsible" data-open-on-load="0"><div class="switch" data-role="trigger"><span>Title 1</span></div></div><div data-content="true" class="item content accordion-content"><p>Content 1</p></div><div data-collapsible="true" class="item title accordion-collapsible" data-open-on-load="1"><div class="switch" data-role="trigger"><span>Title 2</span></div></div><div data-content="true" class="item content accordion-content"><p>Content 2</p></div></div></div></div>
1+
<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="html" data-appearance="default"><div data-mage-init="{&quot;accordion&quot;:{&quot;active&quot;:[1],&quot;collapsibleElement&quot;:&quot;[data-collapsible=true]&quot;,&quot;content&quot;:&quot;[data-content=true]&quot;}}" class="pagebuilder-accordion one two"><div data-collapsible="true" class="item title accordion-collapsible" data-open-on-load="0"><div class="switch" data-role="trigger"><span>Title 1</span></div></div><div data-content="true" class="item content accordion-content"><p>Content 1</p></div><div data-collapsible="true" class="item title accordion-collapsible" data-open-on-load="1"><div class="switch" data-role="trigger"><span>Title 2</span></div></div><div data-content="true" class="item content accordion-content"><p>Content 2</p></div></div></div></div>

0 commit comments

Comments
 (0)