Skip to content

Commit 0a2f369

Browse files
committed
MC-943: Grouping content blocks and containers in the Panel
- update close icon in full screen view
1 parent 95747fa commit 0a2f369

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="PageBuilderStage">
1212
<element name="openFullScreen" type="button" selector="//i[@class='icon-pagebuilder-fullscreen']"/>
13-
<element name="exitFullScreen" type="button" selector="//i[@class='icon-pagebuilder-fullscreen-exit']"/>
13+
<element name="exitFullScreen" type="button" selector=".pagebuilder-header .action-close"/>
1414
<element name="stageLoading" type="button" selector="div.pagebuilder-stage-loading"/>
1515
<element name="stageWrapper" type="button" selector="//div[@class='pagebuilder-stage-wrapper']"/>
1616
<element name="stageWrapperFullScreen" type="button" selector="div.pagebuilder-stage-wrapper.stage-full-screen"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
</actionGroup>
8686
<fillField selector="{{TextOnConfiguration.textArea}}" userInput="Hello Product Page From PageBuilder" stepKey="addTextToEditor"/>
8787
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveEditPanelSettings"/>
88-
<click selector=".icon-pagebuilder-fullscreen-exit" stepKey="exitPageBuilderFullScreen" />
88+
<click selector="{{PageBuilderStage.exitFullScreen}}" stepKey="exitPageBuilderFullScreen" />
8989
<actionGroup ref="fillMainProductForm" stepKey="fillMainProductForm">
9090
<argument name="product" value="SimpleProduct"/>
9191
</actionGroup>
@@ -327,7 +327,7 @@
327327
</actionGroup>
328328
<fillField selector="{{TextOnConfiguration.textArea}}" userInput="Hello Product Page From PageBuilder" stepKey="addTextToEditor"/>
329329
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveEditPanelSettings"/>
330-
<click selector=".icon-pagebuilder-fullscreen-exit" stepKey="exitPageBuilderFullScreen" />
330+
<click selector="{{PageBuilderStage.exitFullScreen}}" stepKey="exitPageBuilderFullScreen" />
331331
<actionGroup ref="fillMainProductForm" stepKey="fillMainProductForm">
332332
<argument name="product" value="SimpleProduct"/>
333333
</actionGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,8 +1251,8 @@
12511251
<waitForElementVisible time="5" selector="{{EditPanelForm.editFormSave}}" stepKey="waitForSaveButton"/>
12521252
<click selector="{{EditPanelForm.editFormSave}}" stepKey="clickSaveButton"/>
12531253
<waitForElementNotVisible time="5" selector="{{EditPanelForm.editForm}}" stepKey="waitForEditFormNotVisible"/>
1254-
<waitForElementVisible selector=".icon-pagebuilder-fullscreen-exit" stepKey="waitForExitPageBuilderFullScreen"/>
1255-
<click selector=".icon-pagebuilder-fullscreen-exit" stepKey="exitPageBuilderFullScreen"/>
1254+
<waitForElementVisible selector="{{PageBuilderStage.exitFullScreen}}" stepKey="waitForExitPageBuilderFullScreen"/>
1255+
<click selector="{{PageBuilderStage.exitFullScreen}}" stepKey="exitPageBuilderFullScreen"/>
12561256
<waitForElementVisible selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="waitForSaveCategory"/>
12571257
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
12581258
<waitForPageLoad stepKey="waitForPageLoad3"/>

app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="pagebuilder-stage-wrapper"
88
css="'stage-full-screen': isFullScreen">
99
<div class="admin__field pagebuilder-header">
10-
<i click="toggleFullScreen.bind($data)" css="'icon-pagebuilder-fullscreen': !isFullScreen(), 'icon-pagebuilder-fullscreen-exit': isFullScreen()"></i>
10+
<i click="toggleFullScreen.bind($data)" css="'icon-pagebuilder-fullscreen': !isFullScreen(), 'action-close': isFullScreen()"></i>
1111
</div>
1212
<br/>
1313
<with args="panel">

0 commit comments

Comments
 (0)