Merge branch 'MC-5405-column-height' into cms-team-1-delivery

Author: davemacaulay

app/code/Magento/PageBuilder/Test/Mftf/Data/ColumnData.xml

@@ -47,11 +47,6 @@
         <data key="fieldName">appearance</data>
         <data key="value">align-top</data>
     </entity>
-    <!-- Minimum Height -->
-    <entity name="PageBuilderEmptyColumnHeightProperty" type="pagebuilder_column_min_height_property">
-        <data key="value">190</data>
-        <data key="valueWithPadding">210</data>
-    </entity>
     <!-- Background Color -->
     <entity name="PageBuilderBackgroundColorProperty" type="pagebuilder_column_background_color_property">
         <data key="name">Background Color</data>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest.xml

@@ -87,12 +87,10 @@
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <comment userInput="Validate Column Height On Stage With Custom Min Height Matches Expected" stepKey="commentValidateColumnHeight"/>
-        <actionGroup ref="validateContentTypeHeightOnStage" stepKey="assertInitialColumnHeightMatchesExpected">
+        <actionGroup ref="validateContentTypeHeightOnStageWithoutPadding" stepKey="assertInitialColumnHeightMatchesExpected">
             <argument name="contentType" value="PageBuilderColumnContentType"/>
             <argument name="index" value="1"/>
             <argument name="containerDefaultHeight" value="PageBuilderMinHeightProperty_500"/>
-            <argument name="expectedPaddingTop" value="PageBuilderPaddingProperty10"/>
-            <argument name="expectedPaddingBottom" value="PageBuilderPaddingProperty10"/>
         </actionGroup>
         <executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderColumnContentType.role,'1')}}" stepKey="actualStageInitialColumnHeight"/>
         <comment userInput="Validate Row Height adjusts to Column Height" stepKey="commentValidateRowHeightAdjustToColumn"/>
@@ -146,6 +144,9 @@
         <actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
             <argument name="contentType" value="PageBuilderColumnContentType"/>
         </actionGroup>
+        <actionGroup ref="removeEmptyContentTypeFromStage" stepKey="removeColumn1">
+            <argument name="contentType" value="PageBuilderColumnContentType"/>
+        </actionGroup>
         <comment userInput="Enter column min height 200 px" stepKey="commentEnterColumnMinHeight"/>
         <actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel">
             <argument name="contentType" value="PageBuilderColumnContentType"/>
@@ -156,7 +157,7 @@
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <comment userInput="Validate Column Height On Stage With Custom Min Height Matches Expected" stepKey="commentValidateColumnHeight"/>
         <executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderColumnContentType.role,'1')}}" stepKey="actualStageContentTypeHeight"/>
-        <executeJS function="return Math.round({{PageBuilderMinHeightProperty_200.value}} + {{PageBuilderPaddingProperty10.paddingTop}} + {{PageBuilderPaddingProperty10.paddingBottom}})" stepKey="expectedColumnHeight"/>
+        <executeJS function="return Math.round({{PageBuilderMinHeightProperty_200.value}})" stepKey="expectedColumnHeight"/>
         <assertEquals stepKey="assertHeightOnStageMatchesExpected">
             <expectedResult type="variable">actualStageContentTypeHeight</expectedResult>
             <actualResult type="variable">expectedColumnHeight</actualResult>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest.xml

@@ -41,12 +41,10 @@
         </actionGroup>
         <seeNumberOfElements selector="{{ColumnOnBackend.columnGroupColumns('1')}}" userInput="2" stepKey="seeElementColumn"/>
         <comment userInput="Validate Initial Column Height On Stage Matches Expected" stepKey="commentValidateColumnHeight"/>
-        <actionGroup ref="validateContentTypeHeightOnStage" stepKey="assertInitialColumnHeightMatchesExpected">
+        <actionGroup ref="validateContentTypeHeightOnStageWithoutPadding" stepKey="assertInitialColumnHeightMatchesExpected">
             <argument name="contentType" value="PageBuilderColumnContentType"/>
             <argument name="index" value="1"/>
-            <argument name="containerDefaultHeight" value="PageBuilderEmptyColumnHeightProperty"/>
-            <argument name="expectedPaddingTop" value="PageBuilderPaddingProperty10"/>
-            <argument name="expectedPaddingBottom" value="PageBuilderPaddingProperty10"/>
+            <argument name="containerDefaultHeight" value="PageBuilderMinHeightProperty_300"/>
         </actionGroup>
         <executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderColumnContentType.role,'1')}}" stepKey="actualStageInitialColumnHeight"/>
         <comment userInput="Validate Row Height adjusts to Column Height" stepKey="commentValidateRowHeightAdjustToColumn"/>
@@ -201,13 +199,9 @@
         </actionGroup>
         <actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightBeforeSave">
             <argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
-            <argument name="border" value="PageBuilderAdvancedBorderWidthProperty10"/>
-            <argument name="padding" value="PageBuilderPaddingProperty10"/>
         </actionGroup>
         <actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightAfterSave">
             <argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
-            <argument name="border" value="PageBuilderAdvancedBorderWidthProperty10"/>
-            <argument name="padding" value="PageBuilderPaddingProperty10"/>
         </actionGroup>
         <actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
             <argument name="contentType" value="PageBuilderColumnContentType"/>

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_default.less

@@ -8,11 +8,13 @@
 //  _____________________________________________
 
 .pagebuilder-content-type.children-min-height.pagebuilder-column {
+    display: flex;
     margin-right: 1px;
 
     > .element-children {
-        height: 100%;
-        min-height: inherit;
+        flex: 1;
+        max-width: 100%;
+        min-height: auto;
         padding: 0;
     }
 }
@@ -22,7 +24,7 @@
     min-height: inherit;
 
     &.empty-container {
-        min-height: 190px;
+        min-height: 300px;
     }
 
     .pagebuilder-column-resize-handle {

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_default.less

@@ -8,7 +8,6 @@
 //  _____________________________________________
 
 .pagebuilder-image {
-    border: 1px solid transparent;
     width: 100%;
 }
 

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/map/_default.less

@@ -7,9 +7,14 @@
 //  Default appearance styles
 //  _____________________________________________
 
-.pagebuilder-map > div:first-child {
-    height: 300px;
+.pagebuilder-map {
+    line-height: 10px;
+
+    > div:first-child {
+        height: 300px;
+    }
 }
+
 [data-role='map'] {
     display: block;
     height: 300px;