Skip to content

Commit 06cfd30

Browse files
omiroshnichenkoomiroshnichenko
authored
Merge pull request #377 from magento-obsessive-owls/PB-277-new
[Owls] Full height Row
2 parents c6def81 + 346000d commit 06cfd30

File tree

14 files changed

+635
-79
lines changed

14 files changed

+635
-79
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
</actionGroup>
4343
<!-- Validate Min Height -->
4444
<actionGroup name="validateContentTypeHeightEqualToMinHeight">
45+
<annotations>
46+
<description>Validates that a content type's minimum height is equal to it's actual height minus top padding minus bottom padding minus border width times two.</description>
47+
</annotations>
4548
<arguments>
4649
<argument name="content" type="string"/>
4750
<argument name="index" defaultValue="1" type="string"/>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,16 @@
453453
<data key="paddingBottom">0</data>
454454
<data key="paddingLeft">0</data>
455455
</entity>
456+
<entity name="PageBuilderPadding_0" type="pagebuilder_padding_property">
457+
<data key="name">Margins and Padding</data>
458+
<data key="section">advanced</data>
459+
<data key="fieldName">margins_and_padding</data>
460+
<data key="value">0</data>
461+
<data key="paddingTop">0</data>
462+
<data key="paddingRight">0</data>
463+
<data key="paddingBottom">0</data>
464+
<data key="paddingLeft">0</data>
465+
</entity>
456466
<entity name="PageBuilderPaddingProperty_Empty" type="pagebuilder_padding_property">
457467
<data key="name">Margins and Padding</data>
458468
<data key="section">advanced</data>

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

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<data key="section">appearance_fieldset</data>
1515
<data key="fieldName">min_height</data>
1616
<data key="value"/>
17+
<data key="helperText">Minimum height can be a single number with any valid CSS unit (50px, 50%, 50em, 50vh) or a calculation (50% + 50px).</data>
1718
</entity>
1819
<entity name="PageBuilderMinHeightProperty_0" type="pagebuilder_min_height_property">
1920
<data key="name">Minimum Height</data>
@@ -29,33 +30,70 @@
2930
<data key="value">500</data>
3031
<data key="style">min-height: 500px</data>
3132
</entity>
33+
<entity name="PageBuilderMinHeightProperty_500px" type="pagebuilder_min_height_property">
34+
<data key="name">Minimum Height</data>
35+
<data key="section">appearance_fieldset</data>
36+
<data key="fieldName">min_height</data>
37+
<data key="value">500px</data>
38+
<data key="intValue">500</data>
39+
<data key="style">min-height: 500px</data>
40+
</entity>
3241
<entity name="PageBuilderMinHeightProperty_300" type="pagebuilder_min_height_property">
3342
<data key="name">Minimum Height</data>
3443
<data key="section">appearance_fieldset</data>
3544
<data key="fieldName">min_height</data>
3645
<data key="value">300</data>
3746
<data key="style">min-height: 300px</data>
3847
</entity>
48+
<entity name="PageBuilderMinHeightProperty_300px" type="pagebuilder_min_height_property">
49+
<data key="name">Minimum Height</data>
50+
<data key="section">appearance_fieldset</data>
51+
<data key="fieldName">min_height</data>
52+
<data key="value">300px</data>
53+
<data key="style">min-height: 300px</data>
54+
</entity>
3955
<entity name="PageBuilderMinHeightProperty_200" type="pagebuilder_min_height_property">
4056
<data key="name">Minimum Height</data>
4157
<data key="section">appearance_fieldset</data>
4258
<data key="fieldName">min_height</data>
4359
<data key="value">200</data>
4460
<data key="style">min-height: 200px</data>
4561
</entity>
62+
<entity name="PageBuilderMinHeightProperty_200px" type="pagebuilder_min_height_property">
63+
<data key="name">Minimum Height</data>
64+
<data key="section">appearance_fieldset</data>
65+
<data key="fieldName">min_height</data>
66+
<data key="value">200px</data>
67+
<data key="intValue">200</data>
68+
<data key="style">min-height: 200px</data>
69+
</entity>
70+
<entity name="PageBuilderMinHeightProperty_100vh" type="pagebuilder_min_height_property">
71+
<data key="name">Minimum Height</data>
72+
<data key="section">appearance_fieldset</data>
73+
<data key="fieldName">min_height</data>
74+
<data key="value">100vh</data>
75+
<data key="style">min-height: 100vh</data>
76+
</entity>
77+
<entity name="PageBuilderMinHeightProperty_100vh_Minus_200px" type="pagebuilder_min_height_property">
78+
<data key="name">Minimum Height</data>
79+
<data key="section">appearance_fieldset</data>
80+
<data key="fieldName">min_height</data>
81+
<data key="value">calc(100vh - 200px)</data>
82+
<data key="style">min-height: calc(100vh - 200px)</data>
83+
</entity>
4684
<entity name="PageBuilderMinHeightProperty_NonNumeric" type="pagebuilder_min_height_property">
4785
<data key="name">Minimum Height</data>
4886
<data key="section">appearance_fieldset</data>
4987
<data key="fieldName">min_height</data>
5088
<data key="value">a</data>
51-
<data key="errorMessage">Please enter a valid number in this field.</data>
89+
<data key="errorMessage">Please enter a valid number or calculation: Valid numbers must have an extension (px, %, pt, vh). Calculations must have white space around the + and - operators and cannot divide by zero.</data>
5290
</entity>
5391
<entity name="PageBuilderMinHeightProperty_Negative1" type="pagebuilder_min_height_property">
5492
<data key="name">Minimum Height</data>
5593
<data key="section">appearance_fieldset</data>
5694
<data key="fieldName">min_height</data>
5795
<data key="value">-1</data>
58-
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
96+
<data key="errorMessage">Please enter a valid number or calculation: Valid numbers must have an extension (px, %, pt, vh). Calculations must have white space around the + and - operators and cannot divide by zero.</data>
5997
</entity>
6098
<!-- Vertical Alignment -->
6199
<entity name="PageBuilderVerticalAlignmentPropertyTop" type="pagebuilder_vertical_alignment_property">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<element name="rowChildContentWidthJS" type="text" selector="document.querySelectorAll('[data-content-type=row]')[{{arg1}} - 1].querySelectorAll('[data-content-type={{arg2}}]')[{{arg3}} - 1].clientWidth" parameterized="true"/>
3737
<element name="appearanceContained" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
3838
<element name="appearanceFullWidthFullBleed" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
39-
<element name="minHeight" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
39+
<element name="minHeight" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'min-height: {{arg2}};')]" parameterized="true"/>
4040
<element name="verticalAlignContainer" type="button" selector="(//div[contains(@class, 'pagebuilder-row')])[{{arg1}}]//div[contains(@class, 'element-children') and contains(@class, 'row-container')][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
4141
<!-- Background Configuration -->
4242
<element name="backgroundType" type="text" parameterized="true" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{index}}][@data-background-type='{{backgroundType}}']"/>
@@ -115,7 +115,7 @@
115115
<element name="appearanceContainedCSS" type="text" selector="[data-content-type=row][data-appearance=contained]"/>
116116
<element name="appearanceFullBleedCSS" type="text" selector="[data-content-type=row][data-appearance=full-bleed]"/>
117117
<element name="appearanceFullWidthCSS" type="text" selector="[data-content-type=row][data-appearance=full-width]"/>
118-
<element name="minHeight" type="button" selector="(//div[@data-content-type='row'])[{{arg1}}]/div[contains(@style, 'min-height: {{arg2}}px;')]" parameterized="true"/>
118+
<element name="minHeight" type="button" selector="(//div[@data-content-type='row'])[{{arg1}}]/div[contains(@style, 'min-height: {{arg2}};')]" parameterized="true"/>
119119
<element name="verticalAlignContainer" type="button" selector="(//div[@data-content-type='row'])[{{arg1}}]/div[contains(@style, 'justify-content: {{arg2}};')]" parameterized="true"/>
120120
<!-- Background Configuration -->
121121
<element name="backgroundType" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{index}}]/div[@data-background-type='{{backgroundType}}']"/>
@@ -206,7 +206,7 @@
206206
<element name="videoBackgroundFallbackImageSource" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//img[contains(@src,'{{fileName}}')]"/>
207207
<element name="videoBackgroundNoFallbackImage" type="text" parameterized="true" selector="(//div[@data-content-type='row'])[{{rowIndex}}]//div[contains(@id,'jarallax-container')]//div"/>
208208
<!-- Layout Configuration -->
209-
<element name="minHeight" type="button" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style, 'min-height: {{arg2}}px;')]" parameterized="true"/>
209+
<element name="minHeight" type="button" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style, 'min-height: {{arg2}};')]" parameterized="true"/>
210210
<element name="verticalAlignContainer" type="button" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style, 'justify-content: {{arg2}};')]" parameterized="true"/>
211211
<!-- Advanced Configuration -->
212212
<element name="alignment" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>

0 commit comments

Comments
 (0)