Skip to content

Commit 80d0e6d

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'owls/PB-55' into PB-370-Introduce-upgrade-mechanism
2 parents 7914804 + 58aa534 commit 80d0e6d

File tree

5 files changed

+37
-6
lines changed

5 files changed

+37
-6
lines changed

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@
7070
<element name="base" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]//div[@data-element='inner']" parameterized="true"/>
7171
<element name="baseJS" type="text" selector="(document.querySelectorAll('[data-content-type=row]')[{{arg1}} - 1]).querySelector('[data-element=inner]')" parameterized="true"/>
7272
</section>
73+
<section name="RowOnStage_FullWidth">
74+
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]" parameterized="true"/>
75+
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
76+
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
77+
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
78+
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
79+
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
80+
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
81+
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
82+
<element name="padding" type="text" selector="(//div[contains(@class, 'pagebuilder-row')])[{{arg1}}]//div[contains(@class, 'element-children') and contains(@class, 'row-container')][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
83+
</section>
7384
<section name="RowOnStage_Contained_Invalid">
7485
<element name="border" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
7586
<element name="borderColor" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
@@ -121,6 +132,17 @@
121132
<element name="margins" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]/div[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
122133
<element name="padding" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]/div[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
123134
</section>
135+
<section name="RowOnStorefront_FullWidth">
136+
<element name="base" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]" parameterized="true"/>
137+
<element name="alignment" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
138+
<element name="border" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
139+
<element name="borderColor" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
140+
<element name="borderWidth" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
141+
<element name="borderRadius" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
142+
<element name="cssClasses" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
143+
<element name="margins" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
144+
<element name="padding" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]//div[contains(@class, 'row-full-width-inner')][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
145+
</section>
124146
<section name="RowOnStorefront_FullWidth_FullBleed">
125147
<element name="base" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]" parameterized="true"/>
126148
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-content-type=row]')[{{arg1}} - 1]" parameterized="true"/>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,10 @@
603603
<argument name="backgroundRepeat" value="PageBuilderBackgroundRepeat_Enabled"/>
604604
<argument name="backgroundAttachment" value="PageBuilderBackgroundAttachment_Fixed"/>
605605
</actionGroup>
606+
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateRowHeightCMSBlockStage">
607+
<argument name="content" value="{{RowOnStage.baseCSS}}"/>
608+
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
609+
</actionGroup>
606610
<actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateRowParallaxBackgroundCMSPageStage">
607611
<argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>
608612
<argument name="index" value="2"/>
@@ -860,6 +864,10 @@
860864
<argument name="backgroundRepeat" value="PageBuilderBackgroundRepeat_Enabled"/>
861865
<argument name="backgroundAttachment" value="PageBuilderBackgroundAttachment_Fixed"/>
862866
</actionGroup>
867+
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateRowHeightCMSBlockStage">
868+
<argument name="content" value="{{RowOnStage.baseCSS}}"/>
869+
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
870+
</actionGroup>
863871
<comment userInput="---merging to remove step---" stepKey="validateParallaxBackgroundCMSBlockStage"/>
864872
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateBackgroundImageCMSBlockStage">
865873
<argument name="section" value="RowOnStage"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@
925925
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
926926
</actionGroup>
927927
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage">
928-
<argument name="page" value="RowOnStage"/>
928+
<argument name="page" value="RowOnStage_FullWidth"/>
929929
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
930930
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
931931
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -1035,7 +1035,7 @@
10351035
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
10361036
</actionGroup>
10371037
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
1038-
<argument name="page" value="RowOnStage"/>
1038+
<argument name="page" value="RowOnStage_FullWidth"/>
10391039
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
10401040
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
10411041
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -1145,7 +1145,7 @@
11451145
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
11461146
</actionGroup>
11471147
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
1148-
<argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>
1148+
<argument name="page" value="RowOnStorefront_FullWidth"/>
11491149
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
11501150
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
11511151
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,16 @@
9292
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
9393
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
9494
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/margins"/>
95-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/paddings"/>
9695
<attribute name="name" source="data-content-type"/>
9796
<attribute name="appearance" source="data-appearance"/>
9897
<attribute name="enable_parallax" source="data-enable-parallax"/>
9998
<attribute name="parallax_speed" source="data-parallax-speed"/>
10099
<attribute name="background_images" source="data-background-images"/>
101100
<css name="css_classes"/>
102101
</element>
103-
<element name="inner" />
102+
<element name="inner">
103+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/paddings"/>
104+
</element>
104105
<element name="container">
105106
<style name="justify_content" source="justify_content"/>
106107
<static_style source="display" value="flex"/>

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-width/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false"
1313
afterRender="initParallax">
1414
<render args="getOptions().template"/>
15-
<div class="element-children content-type-container" each="contentType.getChildren()" ko-style="data.container.style" css="getChildrenCss()" attr="{id: contentType.id + '-children'}" data-bind="sortable: getSortableOptions()" afterRender="function (element) { if (typeof afterChildrenRender === 'function') { afterChildrenRender(element); } }">
15+
<div class="element-children content-type-container" each="contentType.getChildren()" ko-style="Object.assign({}, data.container.style(), data.inner.style())" css="getChildrenCss()" attr="{id: contentType.id + '-children'}" data-bind="sortable: getSortableOptions()" afterRender="function (element) { if (typeof afterChildrenRender === 'function') { afterChildrenRender(element); } }">
1616
<if args="$parent.isContainer()">
1717
<div class="pagebuilder-drop-indicator"></div>
1818
</if>

0 commit comments

Comments
 (0)