Skip to content

Commit dd53778

Browse files
committed
MC-5474: Anchor tag name is used on banner/slide/image wrapper when no link is specified by admin
Update data converter and its tests
1 parent 6bcfe12 commit dd53778

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,10 @@ public function render(array $itemData, array $additionalData = []) : string
121121

122122
// mobile wrapper div
123123
$linkNodeName = isset($eavData['link_url']) ? 'a' : 'div';
124+
$linkDataElementName = isset($eavData['link_url']) ? 'link' : 'empty_link';
124125

125126
$rootElementHtml = '<div' . $this->printAttributes($rootElementAttributes) . '>';
126-
$rootElementHtml .= '<' . $linkNodeName . ' data-element="link"';
127+
$rootElementHtml .= '<' . $linkNodeName . ' data-element="' . $linkDataElementName . '"';
127128
$rootElementHtml .= isset($eavData['link_url']) ? ' href="' . $eavData['link_url'] . '">' : '>';
128129
$rootElementHtml .= '<div'
129130
. $this->printAttributes($wrapperDivElementAttributes)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@ public function render(array $itemData, array $additionalData = []) : string
6868
}
6969

7070
$linkNodeName = isset($eavData['link_url']) ? 'a' : 'div';
71+
$linkDataElementName = isset($eavData['link_url']) ? 'link' : 'empty_link';
7172

72-
$rootElementHtml .= '><' . $linkNodeName . ' data-element="link"'
73+
$rootElementHtml .= '><' . $linkNodeName . ' data-element="' . $linkDataElementName . '"'
7374
. (isset($eavData['link_url']) ? ' href="' . $eavData['link_url'] . '"' : '')
7475
. $buttonStyleAttribute
7576
. ' class="pagebuilder-button-primary"><span data-element="link_text">'

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,17 @@ public function render(array $itemData, array $additionalData = []) : string
8585
}
8686
$rootElementAttributes['style'] .= $margin;
8787

88-
$linkAttributes = [
89-
'data-element' => 'link',
90-
];
91-
9288
// if link_url is present, add href and target attribute
9389
if (isset($eavData['link_url'])) {
94-
$linkAttributes = array_merge($linkAttributes, [
90+
$linkAttributes = [
91+
'data-element' => 'link',
9592
'href' => $eavData['link_url'],
9693
'target' => isset($eavData['target_blank']) && $eavData['target_blank'] ? '_blank' : '',
97-
]);
94+
];
95+
} else {
96+
$linkAttributes = [
97+
'data-element' => 'empty_link',
98+
];
9899
}
99100

100101
$imageAttributes = [
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="contained"><div data-element="inner"><div data-element="main" data-role="buttons" data-appearance="inline" style="display: inline-block; text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"><div data-element="main" data-role="button-item" data-appearance="default" style="display: inline-block;"><div data-element="link" style="text-align: right; margin: 0px 2px 0px 1px; padding: 3px 0px 4px 0px;" class="pagebuilder-button-primary"><span data-element="link_text">Domain.com</span></div></div></div></div></div>
1+
<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="buttons" data-appearance="inline" style="display: inline-block; text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"><div data-element="main" data-role="button-item" data-appearance="default" style="display: inline-block;"><div data-element="empty_link" style="text-align: right; margin: 0px 2px 0px 1px; padding: 3px 0px 4px 0px;" class="pagebuilder-button-primary"><span data-element="link_text">Domain.com</span></div></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="contained"><div data-element="inner"><div data-element="main" data-role="slider" data-appearance="default" data-autoplay="0" data-autoplay-speed="0" data-fade="0" data-is-infinite="0" data-show-arrows="0" data-show-dots="0" class="pagebuilder-slider"><div data-element="main" data-role="slide" data-appearance="poster"><div data-element="link"><div data-element="wrapper" data-background-images="{\&quot;desktop_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento.png}}\&quot;,\&quot;mobile_image\&quot;:\&quot;{}\&quot;}" class="pagebuilder-slide-wrapper"><div data-element="overlay" class="pagebuilder-overlay pagebuilder-poster-overlay" data-overlay-color="transparent"><div class="pagebuilder-poster-content"><div data-element="content"><h3>Title</h3><div></div></div></div></div></div></div></div></div></div></div>
1+
<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="slider" data-appearance="default" data-autoplay="0" data-autoplay-speed="0" data-fade="0" data-is-infinite="0" data-show-arrows="0" data-show-dots="0" class="pagebuilder-slider"><div data-element="main" data-role="slide" data-appearance="poster"><div data-element="empty_link"><div data-element="wrapper" data-background-images="{\&quot;desktop_image\&quot;:\&quot;{{media url=wysiwyg/m/a/magento.png}}\&quot;,\&quot;mobile_image\&quot;:\&quot;{}\&quot;}" class="pagebuilder-slide-wrapper"><div data-element="overlay" class="pagebuilder-overlay pagebuilder-poster-overlay" data-overlay-color="transparent"><div class="pagebuilder-poster-content"><div data-element="content"><h3>Title</h3><div></div></div></div></div></div></div></div></div></div></div>

0 commit comments

Comments
 (0)