Skip to content

Commit 0d5643f

Browse files
davemacaulaydavemacaulay
committed
MC-3895: Banner and Slide has an overlay transparency field that needs to be removed in favor of transparent color
- Resolve issue with banner on hover overlay background color
1 parent 0cf2e98 commit 0d5643f

File tree

9 files changed

+29
-188
lines changed

9 files changed

+29
-188
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
<attribute name="background_images" source="data-background-images"/>
5656
</element>
5757
<element name="overlay">
58-
<style name="overlay_color" source="background_color"/>
58+
<style name="overlay_color" source="background_color" converter="Magento_PageBuilder/js/content-type/banner/converter/style/overlay-background-color" persistence_mode="write"/>
59+
<attribute name="overlay_color_attribute" storage_key="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-color"/>
5960
</element>
6061
<element name="content">
6162
<html name="message" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
@@ -119,7 +120,8 @@
119120
<attribute name="background_images" source="data-background-images"/>
120121
</element>
121122
<element name="overlay">
122-
<style name="overlay_color" source="background_color"/>
123+
<style name="overlay_color" source="background_color" converter="Magento_PageBuilder/js/content-type/banner/converter/style/overlay-background-color" persistence_mode="write"/>
124+
<attribute name="overlay_color_attribute" storage_key="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-color"/>
123125
</element>
124126
<element name="content">
125127
<html name="message" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
@@ -183,7 +185,8 @@
183185
<attribute name="background_images" source="data-background-images"/>
184186
</element>
185187
<element name="overlay">
186-
<style name="overlay_color" source="background_color"/>
188+
<style name="overlay_color" source="background_color" converter="Magento_PageBuilder/js/content-type/banner/converter/style/overlay-background-color" persistence_mode="write"/>
189+
<attribute name="overlay_color_attribute" storage_key="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-color"/>
187190
</element>
188191
<element name="content">
189192
<html name="message" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
@@ -248,8 +251,9 @@
248251
<element name="overlay">
249252
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/overlay-border-radius" persistence_mode="write"/>
250253
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
251-
<style name="overlay_color" source="background_color"/>
254+
<style name="overlay_color" source="background_color" converter="Magento_PageBuilder/js/content-type/banner/converter/style/overlay-background-color" persistence_mode="write"/>
252255
<style name="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
256+
<attribute name="overlay_color_attribute" storage_key="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-color"/>
253257
</element>
254258
<element name="content">
255259
<html name="message" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/banner/converter/attribute/overlay-color-transparency.js

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

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/banner/converter/attribute/overlay-color.js

Lines changed: 7 additions & 3 deletions
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/js/content-type/banner/converter/attribute/overlay-transparency.js

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

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/banner/converter/style/overlay-background-color.js

Lines changed: 4 additions & 6 deletions
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/ts/js/content-type/banner/converter/attribute/overlay-color-transparency.ts

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

‎app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/attribute/overlay-color.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default class OverlayColor implements ConverterInterface {
1515
* @returns {string | object}
1616
*/
1717
public fromDom(value: string): string | object {
18-
return value === "transparent" ? "" : toHex(value);
18+
return value === "transparent" ? "" : value;
1919
}
2020

2121
/**
@@ -26,6 +26,10 @@ export default class OverlayColor implements ConverterInterface {
2626
* @returns {string | object}
2727
*/
2828
public toDom(name: string, data: DataObject): string | object {
29-
return data[name].toString();
29+
if (data.overlay_color) {
30+
return data.overlay_color.toString();
31+
}
32+
33+
return "";
3034
}
3135
}

‎app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/attribute/overlay-transparency.ts

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

‎app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/overlay-background-color.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,10 @@ export default class OverlayBackgroundColor implements ConverterInterface {
2727
* @returns {string | object}
2828
*/
2929
public toDom(name: string, data: DataObject): string | object {
30-
let overlayColor: string = "transparent";
31-
if (data.show_overlay === "always" && data.overlay_color !== "" && data.overlay_color !== undefined) {
32-
overlayColor = fromHex(
33-
data.overlay_color.toString(),
34-
percentToDecimal(data.overlay_transparency.toString()),
35-
);
30+
if (data.show_overlay === "always" && data[name] !== "" && data[name] !== undefined) {
31+
return data[name].toString();
3632
}
37-
return overlayColor;
33+
34+
return "transparent";
3835
}
3936
}

0 commit comments

Comments
 (0)