Skip to content

Commit 7d9ba9e

Browse files
danmooney2danmooney2
committed
MC-5410: Banner & Slide Are Missing <A> Tag For Link Attribute On Storefront
Convert data-href attribute to href
1 parent 22044ab commit 7d9ba9e

File tree

30 files changed

+52
-260
lines changed

30 files changed

+52
-260
lines changed

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

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

122122
// mobile wrapper div
123123
$rootElementHtml = '<div' . $this->printAttributes($rootElementAttributes) . '><div data-element="link"';
124-
$rootElementHtml .= isset($eavData['link_url']) ? ' data-href="' . $eavData['link_url'] . '">' : '>';
124+
$rootElementHtml .= isset($eavData['link_url']) ? ' href="' . $eavData['link_url'] . '">' : '>';
125125
$rootElementHtml .= '<div'
126126
. $this->printAttributes($wrapperDivElementAttributes)
127127
. '><div'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public function render(array $itemData, array $additionalData = []) : string
8686
$rootElementAttributes['style'] .= $margin;
8787
$linkAttributes = [
8888
'data-element' => 'link',
89-
'data-href' => $eavData['link_url'] ?? '',
90-
'data-target' => isset($eavData['target_blank']) && $eavData['target_blank'] ? '_blank' : '',
89+
'href' => $eavData['link_url'] ?? '',
90+
'target' => isset($eavData['target_blank']) && $eavData['target_blank'] ? '_blank' : '',
9191
];
9292

9393
$imageAttributes = [

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<element name="messageContentTextAreaTextWidget" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='content']//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
3939
<element name="messageContentText" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='content']//*[contains(text(),'{{arg2}}')]" parameterized="true"/>
4040
<element name="messageContentHeightJS" type="text" selector="return document.evaluate(&quot;(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='content']//div[contains(text(),'{{arg2}}')]&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.clientHeight;" parameterized="true"/>
41-
<element name="linkUrl" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/*[@data-element='link'][contains(@data-href,'{{arg2}}')]" parameterized="true"/>
41+
<element name="linkUrl" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/*[@data-element='link'][contains(@href,'{{arg2}}')]" parameterized="true"/>
4242
<element name="openInNewTab" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/*[@data-element='link'][contains(@data-target,'_blank')]" parameterized="true"/>
4343
<element name="button" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//button" parameterized="true"/>
4444
<element name="showButton" type="button" selector="(//div[@data-role='banner'])[{{arg1}}][@data-show-button='{{arg2}}']" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<element name="messageContentTextAreaTextWidget" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
9595
<element name="messageContentText" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//*[contains(text(),'{{arg2}}')]" parameterized="true"/>
9696
<element name="messageContentHeightJS" type="text" selector="return document.evaluate(&quot;(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//*[contains(text(),'{{arg2}}')]&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.clientHeight;" parameterized="true"/>
97-
<element name="linkUrl" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//*[@data-element='link'][contains(@data-href,'{{arg2}}')]" parameterized="true"/>
97+
<element name="linkUrl" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//*[@data-element='link'][contains(@href,'{{arg2}}')]" parameterized="true"/>
9898
<element name="openInNewTab" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/*[@data-element='link'][contains(@data-target,'_blank')]" parameterized="true"/>
9999
<element name="button" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//button[@data-element='button']" parameterized="true"/>
100100
<element name="noButton" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper'][not(descendant::*[@data-element='button'])]" parameterized="true"/>

‎app/code/Magento/PageBuilder/etc/di.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -511,9 +511,6 @@
511511
<item name="dataRole" xsi:type="string">slide</item>
512512
</item>
513513
</item>
514-
<item name="clickEventBinder" xsi:type="array">
515-
<item name="component" xsi:type="string">Magento_PageBuilder/js/widget/click-event-binder</item>
516-
</item>
517514
</item>
518515
<item name="banner" xsi:type="array">
519516
<item name="default" xsi:type="array">
@@ -524,9 +521,6 @@
524521
<item name="dataRole" xsi:type="string">banner</item>
525522
</item>
526523
</item>
527-
<item name="clickEventBinder" xsi:type="array">
528-
<item name="component" xsi:type="string">Magento_PageBuilder/js/widget/click-event-binder</item>
529-
</item>
530524
</item>
531525
<item name="buttons" xsi:type="array">
532526
<item name="default" xsi:type="array">

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/banner.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
</element>
3434
<element name="link">
3535
<attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
36-
<attribute name="virtual_link_href" storage_key="link_url" source="data-href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
37-
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
36+
<attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
37+
<attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
3838
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
3939
</element>
4040
<element name="wrapper">
@@ -99,8 +99,8 @@
9999
</element>
100100
<element name="link">
101101
<attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
102-
<attribute name="virtual_link_href" storage_key="link_url" source="data-href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
103-
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
102+
<attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
103+
<attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
104104
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
105105
</element>
106106
<element name="wrapper">
@@ -165,8 +165,8 @@
165165
</element>
166166
<element name="link">
167167
<attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
168-
<attribute name="virtual_link_href" storage_key="link_url" source="data-href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
169-
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
168+
<attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
169+
<attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
170170
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
171171
</element>
172172
<element name="wrapper">
@@ -232,8 +232,8 @@
232232
</element>
233233
<element name="link">
234234
<attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
235-
<attribute name="virtual_link_href" storage_key="link_url" source="data-href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
236-
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
235+
<attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
236+
<attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
237237
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
238238
</element>
239239
<element name="wrapper">

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/slide.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
</element>
3838
<element name="link">
3939
<attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
40-
<attribute name="virtual_link_href" storage_key="link_url" source="data-href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
41-
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
40+
<attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
41+
<attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
4242
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
4343
</element>
4444
<element name="overlay">
@@ -102,8 +102,8 @@
102102
</element>
103103
<element name="link">
104104
<attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
105-
<attribute name="virtual_link_href" storage_key="link_url" source="data-href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
106-
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
105+
<attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
106+
<attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
107107
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
108108
</element>
109109
<element name="overlay">
@@ -167,8 +167,8 @@
167167
</element>
168168
<element name="link">
169169
<attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
170-
<attribute name="virtual_link_href" storage_key="link_url" source="data-href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
171-
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
170+
<attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
171+
<attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
172172
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
173173
</element>
174174
<element name="overlay">
@@ -233,8 +233,8 @@
233233
</element>
234234
<element name="link">
235235
<attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
236-
<attribute name="virtual_link_href" storage_key="link_url" source="data-href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
237-
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
236+
<attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
237+
<attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
238238
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
239239
</element>
240240
<element name="overlay">

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/property/link.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-centered/master.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77

88
<div attr="data.main.attributes" ko-style="data.main.style" css="data.main.css">
9-
<div attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
9+
<a attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
1010
<div css="data.wrapper.css"
1111
attr="data.wrapper.attributes"
1212
ko-style="data.wrapper.style"
@@ -25,5 +25,5 @@
2525
</div>
2626
</div>
2727
</div>
28-
</div>
28+
</a>
2929
</div>

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/master.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77

88
<div attr="data.main.attributes" ko-style="data.main.style" css="data.main.css">
9-
<div attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
9+
<a attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
1010
<div attr="data.wrapper.attributes"
1111
ko-style="data.wrapper.style"
1212
css="data.wrapper.css"
@@ -25,5 +25,5 @@
2525
</div>
2626
</div>
2727
</div>
28-
</div>
28+
</a>
2929
</div>

0 commit comments

Comments
 (0)