Skip to content

Commit 37e820a

Browse files
omiroshnichenkoomiroshnichenko
authored
Merge pull request #611 from magento/609_content-type-toolbar-fullscreen-fix
#609: Content Type Toolbar hidden under …
2 parents 7f064a5 + 25a97f3 commit 37e820a

22 files changed

+246
-31
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9-
<actionGroup name="openPageBuilderFullScreen">
9+
<actionGroup name="openPageBuilderFullScreen" deprecated="This action group is no longer supported. Consider using `ClickEditWithPageBuilderButtonActionGroup` instead.">
1010
<waitForElementVisible selector="{{PageBuilderStage.openFullScreen}}" stepKey="waitForFullScreenButton"/>
1111
<click selector="{{PageBuilderStage.openFullScreen}}" stepKey="clickFullScreenButton"/>
1212
<waitForPageLoad stepKey="waitForFullScreenAnimation"/>

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminVerifyTinyMCEToolbarButtonsActionGroup">
12+
<annotations>
13+
<description>Validates that all of the Tiny MCE buttons are present in the specified Tiny MCE toolbar.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="section" defaultValue="WYSIWYGOnPageBuilderInline"/>
17+
</arguments>
18+
<waitForElementVisible selector="{{section.toolbar}}" stepKey="waitForToolbar"/>
19+
<seeElement selector="{{section.undo}}" stepKey="seeUndo"/>
20+
<seeElement selector="{{section.redo}}" stepKey="seeRedo"/>
21+
<seeElement selector="{{section.formatSelector}}" stepKey="seeFormatSelector"/>
22+
<seeElement selector="{{section.fontSize}}" stepKey="seeFontSize"/>
23+
<seeElement selector="{{section.lineHeight}}" stepKey="seeLineHeight"/>
24+
<seeElement selector="{{section.textColor}}" stepKey="seeTextColor"/>
25+
<seeElement selector="{{section.backgroundColor}}" stepKey="seeBackgroundColor"/>
26+
<seeElement selector="{{section.bold}}" stepKey="seeBold"/>
27+
<seeElement selector="{{section.italic}}" stepKey="seeItalic"/>
28+
<seeElement selector="{{section.underline}}" stepKey="seeUnderline"/>
29+
<seeElement selector="{{section.alignLeft}}" stepKey="seeAlignLeft"/>
30+
<seeElement selector="{{section.alignCenter}}" stepKey="seeAlignCenter"/>
31+
<seeElement selector="{{section.alignRight}}" stepKey="seeAlignRight"/>
32+
<seeElement selector="{{section.numberedList}}" stepKey="seeNumberedList"/>
33+
<seeElement selector="{{section.bulletList}}" stepKey="seeBulletList"/>
34+
<seeElement selector="{{section.insertLink}}" stepKey="seeInsertLink"/>
35+
<seeElement selector="{{section.imageSelector}}" stepKey="seeImageSelector"/>
36+
<seeElement selector="{{section.table}}" stepKey="seeTable"/>
37+
<seeElement selector="{{section.specialCharacter}}" stepKey="seeSpecialCharacter"/>
38+
<seeElement selector="{{section.insertWidget}}" stepKey="seeInsertWidget"/>
39+
<seeElement selector="{{section.insertVariable}}" stepKey="seeInsertVariable"/>
40+
</actionGroup>
41+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="WYSIWYGOnPageBuilderInline">
11+
<element name="toolbar" type="button" selector=".mce-tinymce.mce-tinymce-inline"/>
1112
<element name="inlineCss" type="button" selector=".mce-tinymce.mce-tinymce-inline"/>
1213
<element name="notCss" type="button" selector=".mce-tinymce:not(.mce-tinymce-inline)"/>
1314
<element name="undo" type="button" selector=".mce-tinymce-inline div[aria-label='Undo']"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@
3232
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
3333
</actionGroup>
3434
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
35-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
36-
<argument name="contentType" value="PageBuilderRowContentType"/>
37-
</actionGroup>
38-
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMargins">
39-
<argument name="property" value="PageBuilderMarginsProperty_50"/>
40-
</actionGroup>
41-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRow"/>
4235
</before>
4336
<after>
4437
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingLiveEditToolbarNotCutOffInFullScreenModeTest.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,39 @@
115115
<!-- Check bottom of toolbar is above top of input box -->
116116
<comment userInput="Check bottom of toolbar is above top of input box" stepKey="commentCheckToolbarAboveInputBoxAfterExitFullScreen"/>
117117
<comment userInput="assertToolbarAboveInputBoxAfterExitFullScreen" stepKey="assertToolbarAboveInputBoxAfterExitFullScreen"/>
118+
<!-- Remove heading and two of the columns to create 3/12 column -->
119+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeHeadingContentType">
120+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
121+
<argument name="contentTypeNumber" value="1"/>
122+
</actionGroup>
123+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeFirstColumnContentType">
124+
<argument name="contentType" value="PageBuilderColumnContentType"/>
125+
<argument name="contentTypeNumber" value="1"/>
126+
</actionGroup>
127+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeSecondColumnContentType">
128+
<argument name="contentType" value="PageBuilderColumnContentType"/>
129+
<argument name="contentTypeNumber" value="1"/>
130+
</actionGroup>
131+
<seeElement selector="{{ColumnOnBackend.displayLabel('1','3/12')}}" stepKey="validateColumnWidth"/>
132+
<!-- Add Another Heading Content Type -->
133+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingContentTypeIntoColumn2">
134+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
135+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
136+
<argument name="containerTargetIndex" value="1"/>
137+
<argument name="contentTypeIndex" value="1"/>
138+
</actionGroup>
139+
<executeJS function="{{HeadingOnStage.headingToolbarViewportPositionTop('0')}}" stepKey="toolbarTopPositionInMediumColumn"/>
140+
<executeJS function="{{HeadingOnStage.headingContentTypeViewportPositionBottom('0')}}" stepKey="inputBoxBottomPositionInMediumColumn"/>
141+
<executeJS function="{{HeadingOnStage.headingContentTypeViewportPositionTop('0')}}" stepKey="inputBoxTopPositionInMediumColumn"/>
142+
<!-- Assert toolbar did not overflow in 3/12 column -->
143+
<assertGreaterThanOrEqual stepKey="assertToolbarTopBoundingClientRectIsNotNegativeInMediumColumn">
144+
<expectedResult type="int">0</expectedResult>
145+
<actualResult type="variable">$inputBoxTopPositionInMediumColumn</actualResult>
146+
</assertGreaterThanOrEqual>
147+
<!-- Check top of toolbar is below bottom of input box in 3/12 column -->
148+
<assertGreaterThanOrEqual stepKey="assertToolbarAboveInputBoxInMediumColumn">
149+
<expectedResult type="variable">$inputBoxBottomPositionInMediumColumn</expectedResult>
150+
<actualResult type="variable">$toolbarTopPositionInMediumColumn</actualResult>
151+
</assertGreaterThanOrEqual>
118152
</test>
119153
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedValidateParallaxVideoBackground.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<argument name="lazyLoad" value="PageBuilderVideoBackgroundLazyLoad_Enabled"/>
6666
<argument name="playOnlyWhenVisible" value="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Enabled"/>
6767
<argument name="fallbackImage" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
68+
<argument name="expectedPosition" value="position: absolute;"/>
6869
</actionGroup>
6970
<actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateParallaxStorefront" before="validateStorefront">
7071
<argument name="page" value="RowOnStorefront"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedValidateParallaxVideoBackground.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<argument name="lazyLoad" value="PageBuilderVideoBackgroundLazyLoad_Enabled"/>
6969
<argument name="playOnlyWhenVisible" value="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Enabled"/>
7070
<argument name="fallbackImage" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
71+
<argument name="expectedPosition" value="position: absolute;"/>
7172
</actionGroup>
7273
<actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateParallaxStorefront" before="validateStorefront">
7374
<argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthValidateParallaxVideoBackground.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<argument name="lazyLoad" value="PageBuilderVideoBackgroundLazyLoad_Enabled"/>
6969
<argument name="playOnlyWhenVisible" value="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Enabled"/>
7070
<argument name="fallbackImage" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
71+
<argument name="expectedPosition" value="position: absolute;"/>
7172
</actionGroup>
7273
<actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateParallaxStorefront" before="validateStorefront">
7374
<argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemMoveSlideItemsToRearrangeTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
<!-- Validate Stage -->
9393
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
9494
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeSlideContentAfterSave"/>
95+
<waitForElementNotVisible selector="{{SlideOnBackend.base('2')}}" stepKey="dontSeeNextSlideAfterSave"/>
9596
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusNavigationAfterSave"/>
9697
<moveMouseOver selector="{{SliderOnStage.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide1AfterSave"/>
9798
<see userInput="{{PageBuilderSlideItemSlideName_Slide1.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName1InTooltipAfterSave"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextTooltipMenusAreNotCutOffInFullScreenModeTest.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,18 @@
5757
<comment userInput="inputBoxTopPositionAfterExitFullScreen" stepKey="inputBoxTopPositionAfterExitFullScreen"/>
5858
<comment userInput="toolbarTopPositionAfterExitFullScreen" stepKey="toolbarTopPositionAfterExitFullScreen"/>
5959
<comment userInput="toolbarBottomPositionAfterExitFullScreen" stepKey="toolbarBottomPositionAfterExitFullScreen"/>
60+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeHeadingContentType">
61+
<argument name="contentType" value="PageBuilderTextContentType"/>
62+
<argument name="contentTypeNumber" value="1"/>
63+
</actionGroup>
64+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingContentTypeIntoColumn2">
65+
<argument name="contentType" value="PageBuilderTextContentType"/>
66+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
67+
<argument name="containerTargetIndex" value="1"/>
68+
<argument name="contentTypeIndex" value="1"/>
69+
</actionGroup>
70+
<executeJS function="return document.evaluate(`{{PageBuilderStage.inlineWYSIWYGEditorPanel(PageBuilderTextContentType.role, '1')}}`, document.body).iterateNext().getBoundingClientRect().top" stepKey="toolbarTopPositionInMediumColumn"/>
71+
<executeJS function="return document.evaluate(`{{TextOnStage.wysiwyg('1')}}`, document.body).iterateNext().getBoundingClientRect().bottom" stepKey="inputBoxBottomPositionInMediumColumn"/>
72+
<executeJS function="return document.evaluate(`{{TextOnStage.wysiwyg('1')}}`, document.body).iterateNext().getBoundingClientRect().top" stepKey="inputBoxTopPositionInMediumColumn"/>
6073
</test>
6174
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTinyMCE4ToolbarOnPageBuilderStageTest.xml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,47 @@
114114
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage2"/>
115115
<waitForPageLoad stepKey="waitForPageLoad3"/>
116116
<seeElement selector="{{TextOnStorefront.textInImportantStyle(PageBuilderTextProperty.value)}}" stepKey="seeTextInImportantStyleOnStorefront"/>
117+
<!-- Remove HTML Code Content Type -->
118+
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateBackToCreatedCMSPage">
119+
<argument name="CMSPage" value="$$createCMSPage$$"/>
120+
</actionGroup>
121+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
122+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeHTMLCodeContentType">
123+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
124+
<argument name="contentTypeNumber" value="1"/>
125+
</actionGroup>
126+
<actionGroup ref="confirmRemovalModal" stepKey="confirmHTMLCodeRemoval"/>
127+
<!-- Remove Text Content Type -->
128+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeTextContentType">
129+
<argument name="contentType" value="PageBuilderTextContentType"/>
130+
<argument name="contentTypeNumber" value="1"/>
131+
</actionGroup>
132+
<actionGroup ref="confirmRemovalModal" stepKey="confirmTextRemoval"/>
133+
<!-- Create 9/12 column -->
134+
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
135+
<argument name="contentType" value="PageBuilderColumnContentType"/>
136+
</actionGroup>
137+
<actionGroup ref="duplicateContentType" stepKey="duplicateFirstColumn">
138+
<argument name="contentType" value="PageBuilderColumnContentType"/>
139+
<argument name="targetIndex" value="2"/>
140+
</actionGroup>
141+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeFirstColumnContentType">
142+
<argument name="contentType" value="PageBuilderColumnContentType"/>
143+
<argument name="contentTypeNumber" value="1"/>
144+
</actionGroup>
145+
<!-- Assert toolbar did not overflow in 9/12 column -->
146+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection2">
147+
<argument name="contentType" value="PageBuilderTextContentType"/>
148+
</actionGroup>
149+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextContentTypeIntoColumn">
150+
<argument name="contentType" value="PageBuilderTextContentType"/>
151+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
152+
<argument name="containerTargetIndex" value="1"/>
153+
<argument name="contentTypeIndex" value="1"/>
154+
</actionGroup>
155+
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor">
156+
<argument name="section" value="TextOnStage"/>
157+
</actionGroup>
158+
<actionGroup ref="AdminVerifyTinyMCEToolbarButtonsActionGroup" stepKey="verifyTinyMCE4InColumnContentType"/>
117159
</test>
118160
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/TinyMCE/TinyMCEVerifyCatalogProductsListWidgetTest.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@
3434
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
3535
</actionGroup>
3636
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
37-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
38-
<argument name="contentType" value="PageBuilderRowContentType"/>
39-
</actionGroup>
40-
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMargins">
41-
<argument name="property" value="PageBuilderMarginsProperty_50"/>
42-
</actionGroup>
43-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRow"/>
4437
</before>
4538
<after>
4639
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type-toolbar.js

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)