Skip to content

Commit d85088d

Browse files
davemacaulaydavemacaulay
committed
MAGETWO-92562: drop handle appears randomly if the column is tall
- Ensure you can drop into other columns when they contain large amounts of content
1 parent faf38b8 commit d85088d

File tree

4 files changed

+90
-5
lines changed

4 files changed

+90
-5
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,15 @@
165165
<argument name="containerTargetIndex" defaultValue="1" type="string"/>
166166
<argument name="offsetXCoordinate" defaultValue="10" type="string"/>
167167
<argument name="offsetYCoordinate" defaultValue="0" type="string"/>
168+
<argument name="containerOffsetXCoordinate" defaultValue="null" type="string"/>
169+
<argument name="containerOffsetYCoordinate" defaultValue="null" type="string"/>
168170
</arguments>
169171
<waitForElementVisible time="20" selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForContentBlockInStageVisible"/>
170172
<moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverContentBlockStage"/>
171173
<waitForPageLoad time="30" stepKey="waitForAnimation"/>
172174
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockOptionsMenuByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForOptions"/>
173175
<waitForElementVisible selector="{{PageBuilderActionsSection.contentBlockMoveByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForEditButton"/>
174-
<dragAndDrop selector1="{{PageBuilderActionsSection.contentBlockMoveByIndex(contentBlockType.role, contentBlockIndex)}}" selector2="{{PageBuilderActionsSection.contentBlockContainer(containerTargetType.role, containerTargetIndex)}}" stepKey="moveContentTypeIntoContainer"/>
176+
<dragAndDrop selector1="{{PageBuilderActionsSection.contentBlockMoveByIndex(contentBlockType.role, contentBlockIndex)}}" selector2="{{PageBuilderActionsSection.contentBlockContainer(containerTargetType.role, containerTargetIndex)}}" x="{{containerOffsetXCoordinate}}" y="{{containerOffsetYCoordinate}}" stepKey="moveContentTypeIntoContainer"/>
175177
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
176178
<waitForElementVisible time="30" selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockIndex)}}" stepKey="waitForContentBlockInStage"/>
177179
</actionGroup>

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

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,4 +431,86 @@
431431
<argument name="contentBlockIndex" value="1"/>
432432
</actionGroup>
433433
</test>
434+
<test name="MoveContentIntoEmptyTallColumnGroup">
435+
<annotations>
436+
<features value="Pagebuilder"/>
437+
<stories value="Column"/>
438+
<title value="Drag content from a tall column into adjacent empty column"/>
439+
<description value="Move content from a tall column within a group into an empty column alongside"/>
440+
<severity value="CRITICAL"/>
441+
<testCaseId value="MAGETWO-92572"/>
442+
<useCaseId value="MAGETWO-86953"/>
443+
<group value="pagebuilder"/>
444+
<group value="pagebuilder-column"/>
445+
<group value="pagebuilder-heading"/>
446+
</annotations>
447+
<before>
448+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
449+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
450+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
451+
</before>
452+
<after>
453+
<actionGroup ref="logout" stepKey="logout"/>
454+
</after>
455+
<actionGroup ref="dragContentBlockToStage" stepKey="dragFirstColumnIntoStage">
456+
<argument name="contentBlockType" value="PageBuilderColumnContentBlock"/>
457+
</actionGroup>
458+
<actionGroup ref="dragContentBlockToContainer" stepKey="dragHeadingIntoColumn">
459+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
460+
<argument name="contentBlockIndex" value="1"/>
461+
<argument name="containerTargetType" value="PageBuilderColumnContentBlock"/>
462+
<argument name="containerTargetIndex" value="2"/>
463+
</actionGroup>
464+
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
465+
<argument name="index" value="1"/>
466+
</actionGroup>
467+
<comment userInput="Create 10 headings to increase height of column group" stepKey="commentDuplicateHeading"/>
468+
<actionGroup ref="duplicateContentBlock" stepKey="duplicateFirstHeading">
469+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
470+
</actionGroup>
471+
<actionGroup ref="duplicateContentBlock" stepKey="duplicateSecondHeading">
472+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
473+
</actionGroup>
474+
<actionGroup ref="duplicateContentBlock" stepKey="duplicateThirdHeading">
475+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
476+
</actionGroup>
477+
<actionGroup ref="duplicateContentBlock" stepKey="duplicateFourthHeading">
478+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
479+
</actionGroup>
480+
<actionGroup ref="duplicateContentBlock" stepKey="duplicateFifthHeading">
481+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
482+
</actionGroup>
483+
<actionGroup ref="duplicateContentBlock" stepKey="duplicateSixthHeading">
484+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
485+
</actionGroup>
486+
<actionGroup ref="duplicateContentBlock" stepKey="duplicateSeventhHeading">
487+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
488+
</actionGroup>
489+
<actionGroup ref="duplicateContentBlock" stepKey="duplicateEighthHeading">
490+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
491+
</actionGroup>
492+
<actionGroup ref="duplicateContentBlock" stepKey="duplicateNinthHeading">
493+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
494+
</actionGroup>
495+
<actionGroup ref="duplicateContentBlock" stepKey="duplicateTenthHeading">
496+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
497+
</actionGroup>
498+
<comment userInput="Attempt to move heading into half way down other group" stepKey="commentMoveHeading"/>
499+
<actionGroup ref="moveContentTypeToContainer" stepKey="moveSliderIntoExistingRow">
500+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
501+
<argument name="contentBlockIndex" value="5"/>
502+
<argument name="containerTargetType" value="PageBuilderColumnContentBlock"/>
503+
<argument name="containerTargetIndex" value="1"/>
504+
<argument name="containerOffsetXCoordinate" value="10"/>
505+
<argument name="containerOffsetYCoordinate" value="600"/>
506+
</actionGroup>
507+
<comment userInput="Validate heading was moved successfully" stepKey="commentValidateHeadingMove"/>
508+
<actionGroup ref="validateContentBlockInsideContainerStage" stepKey="confirmHeadingInMovedColumn">
509+
<argument name="containerTargetType" value="PageBuilderColumnContentBlock"/>
510+
<argument name="containerTargetIndex" value="1"/>
511+
<argument name="positionInContainer" value="1"/>
512+
<argument name="contentBlockType" value="PageBuilderHeadingContentBlock"/>
513+
<argument name="contentBlockIndex" value="1"/>
514+
</actionGroup>
515+
</test>
434516
</tests>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_drag-drop.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@
4747

4848
.pagebuilder-content-type-wrapper.ui-sortable-helper {
4949
opacity: .7;
50+
51+
.pagebuilder-options {
52+
.pagebuilder-options-visible;
53+
}
5054
}
5155

5256
.pagebuilder-draggable-content-type a {

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
.pagebuilder-content-type.children-min-height.pagebuilder-column {
1111
margin-right: 1px;
1212
> .element-children {
13+
min-height: 100%;
1314
padding: 0;
1415
}
1516
}
@@ -85,7 +86,3 @@
8586
.pagebuilder-stage .pagebuilder-column-group.resizing .pagebuilder-content-type.pagebuilder-column .pagebuilder-column-resize-handle {
8687
display: block;
8788
}
88-
89-
.pagebuilder-column-group:not(.empty-child) .pagebuilder-content-type.children-min-height.pagebuilder-column > .element-children {
90-
min-height: inherit;
91-
}

0 commit comments

Comments
 (0)