Skip to content

Commit 036b7a9

Browse files
MC-3479: Remove Accordion
- remove frontend less files and update data migrations
1 parent 4d26f63 commit 036b7a9

File tree

8 files changed

+14
-44
lines changed

8 files changed

+14
-44
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,9 @@ public function render(array $itemData, array $additionalData = []) : string
6161

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

@@ -79,7 +78,9 @@ public function render(array $itemData, array $additionalData = []) : string
7978
foreach ($rootElementAttributes as $attributeName => $attributeValue) {
8079
$rootElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
8180
}
82-
$rootElementHtml .= '>' . (isset($additionalData['children']) ? $additionalData['children'] : '') . '</div>';
81+
$rootElementHtml .= '><div class="pagebuilder-accordion" data-mage-init="' . $this->getMageInitValue($itemData) . '">' .
82+
(isset($additionalData['children']) ? $additionalData['children'] : '') .
83+
'</div></div>';
8384

8485
return $rootElementHtml;
8586
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function render(array $itemData, array $additionalData = []) : string
4747
// data-role is not present on the accordion item as it's no longer it's own type
4848
$rootElementAttributes = [
4949
'data-collapsible' => 'true',
50-
'class' => 'accordion-collapsible',
50+
'class' => 'item title accordion-collapsible',
5151
'data-open-on-load' => $eavData['open_on_load'] ? "1" : "0"
5252
];
5353

@@ -62,8 +62,8 @@ public function render(array $itemData, array $additionalData = []) : string
6262
foreach ($rootElementAttributes as $attributeName => $attributeValue) {
6363
$rootElementHtml .= $attributeValue !== '' ? " $attributeName=\"$attributeValue\"" : '';
6464
}
65-
$rootElementHtml .= '><div data-role="trigger"><span>' . $eavData['title'] . '</span></div></div>'
66-
. '<div data-content="true" class="accordion-content">' . $eavData['textarea'] . '</div>';
65+
$rootElementHtml .= '><div class="switch" data-role="trigger"><span>' . $eavData['title'] . '</span></div></div>'
66+
. '<div data-content="true" class="item content accordion-content">' . $eavData['textarea'] . '</div>';
6767

6868
return $rootElementHtml;
6969
}

app/code/Magento/PageBuilder/view/frontend/web/css/source/_module.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
margin-bottom: 20px;
3838
}
3939

40+
.pagebuilder-accordion {
41+
.lib-data-accordion();
42+
}
43+
4044
//
4145
// Responsive Classes
4246
// _____________________________________________

app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/_import.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// _import imports all content types less files
88
// _____________________________________________
99

10-
@import 'accordion/_import.less';
1110
@import 'banner/_import.less';
1211
@import 'button-item/_import.less';
1312
@import 'column/_import.less';

app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/accordion/_default.less

Lines changed: 0 additions & 24 deletions
This file was deleted.

app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/accordion/_import.less

Lines changed: 0 additions & 10 deletions
This file was deleted.
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="accordion" data-appearance="default" 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="accordion-collapsible" data-open-on-load="0"><div data-role="trigger"><span>Accordion Title</span></div></div><div data-content="true" class="accordion-content"><p>Accordion Contents</p></div></div></div>
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>
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="accordion" data-appearance="default" 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="accordion-collapsible" data-open-on-load="0"><div data-role="trigger"><span>Title 1</span></div></div><div data-content="true" class="accordion-content"><p>Content 1</p></div><div data-collapsible="true" class="accordion-collapsible" data-open-on-load="1"><div data-role="trigger"><span>Title 2</span></div></div><div data-content="true" class="accordion-content"><p>Content 2</p></div></div></div>
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>

0 commit comments

Comments
 (0)