Skip to content

Commit bf61e5b

Browse files
committed
MC-3799: Slide poster overlay does not cover entire slide in admin when switching appearances
- Remove styleNoReset to resolve issue with slide overlay retaining it’s padding
1 parent c169ddb commit bf61e5b

File tree

6 files changed

+4
-20
lines changed

6 files changed

+4
-20
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/observable-updater.js

Lines changed: 0 additions & 8 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/template/content-type/slide/collage-centered/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
attr="data.main.attributes"
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
12-
<div ko-style="Object.assign(data.main.style(), data.desktop_image.styleNoReset(), {paddingLeft: 'calc(25% + ' + data.desktop_image.style().paddingLeft + ')', paddingRight: 'calc(25% + ' + data.desktop_image.style().paddingRight + ')'})"
12+
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), {paddingLeft: 'calc(25% + ' + data.desktop_image.style().paddingLeft + ')', paddingRight: 'calc(25% + ' + data.desktop_image.style().paddingRight + ')'})"
1313
event="mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper, mousedown: activateEditor">
1414
<scope args="getUploader().getUiComponent()">
1515
<render />

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-left/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
attr="data.main.attributes"
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
12-
<div ko-style="Object.assign(data.main.style(), data.desktop_image.styleNoReset(), {paddingRight: 'calc(50% + ' + data.desktop_image.style().paddingRight + ')'})"
12+
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), {paddingRight: 'calc(50% + ' + data.desktop_image.style().paddingRight + ')'})"
1313
css="data.main.css"
1414
event="mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper, mousedown: activateEditor">
1515
<scope args="getUploader().getUiComponent()">

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-right/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
attr="data.main.attributes"
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
12-
<div ko-style="Object.assign(data.main.style(), data.desktop_image.styleNoReset(), {paddingLeft: 'calc(50% + ' + data.desktop_image.style().paddingLeft + ')'})"
12+
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), {paddingLeft: 'calc(50% + ' + data.desktop_image.style().paddingLeft + ')'})"
1313
event="mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper, mousedown: activateEditor">
1414
<scope args="getUploader().getUiComponent()">
1515
<render />

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
1212
<div class="pagebuilder-slide-wrapper"
13-
ko-style="Object.assign(data.main.style(), data.desktop_image.styleNoReset())"
13+
ko-style="Object.assign(data.main.style(), data.desktop_image.style())"
1414
event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
1515
<div class="pagebuilder-poster-overlay"
1616
attr="data.overlay.attributes"

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ export default class ObservableUpdater {
5757
viewModel.data[elementName] = {
5858
attributes: ko.observable({}),
5959
style: ko.observable({}),
60-
styleNoReset: ko.observable({}),
6160
css: ko.observable({}),
6261
html: ko.observable({}),
6362
};
@@ -66,13 +65,6 @@ export default class ObservableUpdater {
6665
if (config[elementName].style !== undefined) {
6766
const currentStyles = viewModel.data[elementName].style();
6867
let newStyles = this.convertStyle(config[elementName], data);
69-
/**
70-
* There maybe instances when you need to interface with the styles without the reset applied, this is
71-
* currently used when merging multiple elements styles together, as the reset can cause undesired
72-
* effects if all elements attempt to apply.
73-
*/
74-
viewModel.data[elementName].styleNoReset(newStyles);
75-
7668
if (currentStyles) {
7769
/**
7870
* If so we need to retrieve the previous styles applied to this element and create a new object

0 commit comments

Comments
 (0)