Skip to content

Commit 14c9640

Browse files
anthoulaanthoula
committed
Merge branch 'MC-3799-slide-poster-overlay' of github.com:magento-obsessive-owls/magento2-page-builder into cms-team-1-delivery
2 parents 142b3cb + 4a25365 commit 14c9640

File tree

8 files changed

+90
-20
lines changed

8 files changed

+90
-20
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,13 @@
176176
<data key="fieldName">overlay_color</data>
177177
<data key="value"/>
178178
</entity>
179+
<entity name="PageBuilderSlideItemOverlayColor_HexGreen" type="pagebuilder_slide_item_overlay_color_property">
180+
<data key="name">Overlay Color</data>
181+
<data key="section">general</data>
182+
<data key="fieldName">overlay_color</data>
183+
<data key="value">#008000</data>
184+
<data key="rgb">0, 128, 0</data>
185+
</entity>
179186
<entity name="PageBuilderSlideItemOverlayColor_HexWhite" type="pagebuilder_slide_item_overlay_color_property">
180187
<data key="name">Overlay Color</data>
181188
<data key="section">general</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTests.xml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,4 +1377,83 @@
13771377
<argument name="property" value="PageBuilderAppearance_Poster"/>
13781378
</actionGroup>
13791379
</test>
1380+
<test name="SliderPosterValidatePaddingOnAppearanceChange">
1381+
<annotations>
1382+
<features value="PageBuilder"/>
1383+
<stories value="Slider"/>
1384+
<title value="Poster - Validate paddings on appearance switch"/>
1385+
<description value="Validate that paddings are correctly applied to the slide within the admin when switching between appearances."/>
1386+
<severity value="MAJOR"/>
1387+
<useCaseId value="MC-3799"/>
1388+
<testCaseId value="MC-5179"/>
1389+
<group value="pagebuilder"/>
1390+
<group value="pagebuilder-slider"/>
1391+
<group value="pagebuilder-sliderPoster"/>
1392+
</annotations>
1393+
<before>
1394+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1395+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1396+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1397+
</before>
1398+
<after>
1399+
<actionGroup ref="logout" stepKey="logout"/>
1400+
</after>
1401+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1402+
<argument name="group" value="PageBuilderSliderContentType"/>
1403+
</actionGroup>
1404+
<actionGroup ref="dragContentTypeToStage" stepKey="dragSliderIntoStage">
1405+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1406+
</actionGroup>
1407+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openSliderEditPanel">
1408+
<argument name="section" value="SlideOnBackend"/>
1409+
</actionGroup>
1410+
<!-- Fill Out Edit Panel: Appearance Poster -->
1411+
<comment userInput="Fill Out Edit Panel: Appearance Poster" stepKey="commentFillEditPanel"/>
1412+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearancePropertyPoster">
1413+
<argument name="property" value="PageBuilderAppearance_Poster"/>
1414+
</actionGroup>
1415+
<actionGroup ref="selectSlideOutPanelField" stepKey="enterOverlayAlways">
1416+
<argument name="property" value="PageBuilderSlideItemShowOverlay_Always"/>
1417+
</actionGroup>
1418+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayColor">
1419+
<argument name="property" value="PageBuilderSlideItemOverlayColor_HexGreen"/>
1420+
</actionGroup>
1421+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayTransparency">
1422+
<argument name="property" value="PageBuilderSlideItemOverlayTransparency_70"/>
1423+
</actionGroup>
1424+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1425+
<!-- Validate Stage Overlay and Padding -->
1426+
<comment userInput="Validate Stage Overlay and Padding" stepKey="commentValidateOverlayPadding"/>
1427+
<seeElement selector="{{SlideOnBackend.showOverlay('1', PageBuilderSlideItemShowOverlay_Always.value)}}" stepKey="seeOverlayStateStage"/>
1428+
<seeElement selector="{{SlideOnBackend.overlayColorAndTransparency('1', PageBuilderSlideItemOverlayColor_HexGreen.rgb, PageBuilderSlideItemOverlayTransparency_70.decimal)}}" stepKey="seeOverlayColorAndTransparencyStage"/>
1429+
<seeElement selector="{{SlideOnBackend.posterPadding('1', PageBuilderPaddingProperty40.value)}}" stepKey="seePosterPadding" />
1430+
<dontSeeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingProperty40.value)}}" stepKey="dontSeeCollagePadding" />
1431+
<!-- Change Appearance to Collage Left -->
1432+
<comment userInput="Change Appearance to Collage Left" stepKey="commentChangeAppearanceCollageLeft"/>
1433+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage">
1434+
<argument name="section" value="SlideOnBackend"/>
1435+
</actionGroup>
1436+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearancePropertyCollageRight">
1437+
<argument name="property" value="PageBuilderAppearance_CollageRight"/>
1438+
</actionGroup>
1439+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
1440+
<seeElement selector="{{SlideOnBackend.showOverlay('1', PageBuilderSlideItemShowOverlay_Always.value)}}" stepKey="seeOverlayStateStage2"/>
1441+
<seeElement selector="{{SlideOnBackend.overlayColorAndTransparency('1', PageBuilderSlideItemOverlayColor_HexGreen.rgb, PageBuilderSlideItemOverlayTransparency_70.decimal)}}" stepKey="seeOverlayColorAndTransparencyStage2"/>
1442+
<dontSeeElement selector="{{SlideOnBackend.posterPadding('1', PageBuilderPaddingProperty40.value)}}" stepKey="dontSeeDefaultPosterPadding" />
1443+
<!-- Change Appearance back to Poster -->
1444+
<comment userInput="Change Appearance back to Poster" stepKey="commentChangeAppearanceBackToPoster"/>
1445+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage2">
1446+
<argument name="section" value="SlideOnBackend"/>
1447+
</actionGroup>
1448+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearancePropertyPoster2">
1449+
<argument name="property" value="PageBuilderAppearance_Poster"/>
1450+
</actionGroup>
1451+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
1452+
<!-- Validate Stage Overlay and Padding after appearance change -->
1453+
<comment userInput="Validate Stage Overlay and Padding after appearance change" stepKey="commentValidateOverlayPadding2"/>
1454+
<seeElement selector="{{SlideOnBackend.showOverlay('1', PageBuilderSlideItemShowOverlay_Always.value)}}" stepKey="seeOverlayStateStage3"/>
1455+
<seeElement selector="{{SlideOnBackend.overlayColorAndTransparency('1', PageBuilderSlideItemOverlayColor_HexGreen.rgb, PageBuilderSlideItemOverlayTransparency_70.decimal)}}" stepKey="seeOverlayColorAndTransparencyStage3"/>
1456+
<seeElement selector="{{SlideOnBackend.posterPadding('1', PageBuilderPaddingProperty40.value)}}" stepKey="seePosterPadding2" />
1457+
<dontSeeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingProperty40.value)}}" stepKey="dontSeeCollagePadding2" />
1458+
</test>
13801459
</tests>

‎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
@@ -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.wrapper.styleNoReset())"
13+
ko-style="Object.assign(data.main.style(), data.wrapper.style())"
1414
event="mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper, mousedown: activateEditor">
1515
<scope args="getUploader().getUiComponent()">
1616
<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
@@ -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.wrapper.styleNoReset())"
13+
ko-style="Object.assign(data.main.style(), data.wrapper.style())"
1414
css="data.main.css"
1515
event="mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper, mousedown: activateEditor">
1616
<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
@@ -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.wrapper.styleNoReset())"
13+
ko-style="Object.assign(data.main.style(), data.wrapper.style())"
1414
event="mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper, mousedown: activateEditor">
1515
<scope args="getUploader().getUiComponent()">
1616
<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.wrapper.styleNoReset())"
13+
ko-style="Object.assign(data.main.style(), data.wrapper.style())"
1414
event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
1515
<div class="pagebuilder-overlay 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)