Skip to content

Commit 3c24579

Browse files
Merge pull request #619 from magento/develop
Sync develop -> 1.5.0-release
2 parents 3de2b8c + a67b7dc commit 3c24579

File tree

114 files changed

+930
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+930
-208
lines changed

app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php

+32-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77

88
namespace Magento\PageBuilder\Component\Form\Element;
99

10+
use Magento\Framework\App\ObjectManager;
1011
use Magento\Framework\Data\FormFactory;
1112
use Magento\Framework\View\Element\UiComponent\ContextInterface;
13+
use Magento\PageBuilder\Model\View\File\Collector\PageBuilder;
1214
use Magento\Ui\Component\Wysiwyg\ConfigInterface;
1315
use Magento\Catalog\Api\CategoryAttributeRepositoryInterface;
1416
use Magento\Framework\Exception\NoSuchEntityException;
17+
use Magento\PageBuilder\Model\Config as PageBuilderConfig;
1518
use Magento\PageBuilder\Model\State as PageBuilderState;
1619
use Magento\PageBuilder\Model\Stage\Config as Config;
1720

@@ -23,7 +26,7 @@
2326
class Wysiwyg extends \Magento\Ui\Component\Form\Element\Wysiwyg
2427
{
2528
/**
26-
* Wysiwyg constructor.
29+
* WYSIWYG Constructor
2730
*
2831
* @param ContextInterface $context
2932
* @param FormFactory $formFactory
@@ -34,6 +37,11 @@ class Wysiwyg extends \Magento\Ui\Component\Form\Element\Wysiwyg
3437
* @param array $components
3538
* @param array $data
3639
* @param array $config
40+
* @param PageBuilderConfig|null $pageBuilderConfig
41+
* @param bool $overrideSnapshot
42+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
43+
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
44+
* @throws \Magento\Framework\Exception\NoSuchEntityException
3745
*/
3846
public function __construct(
3947
ContextInterface $context,
@@ -44,21 +52,25 @@ public function __construct(
4452
Config $stageConfig,
4553
array $components = [],
4654
array $data = [],
47-
array $config = []
55+
array $config = [],
56+
PageBuilderConfig $pageBuilderConfig = null,
57+
bool $overrideSnapshot = false
4858
) {
4959
$wysiwygConfigData = isset($config['wysiwygConfigData']) ? $config['wysiwygConfigData'] : [];
60+
5061
// If a dataType is present we're dealing with an attribute
5162
if (isset($config['dataType'])) {
5263
try {
5364
$attribute = $attrRepository->get($data['name']);
65+
5466
if ($attribute) {
5567
$config['wysiwyg'] = (bool)$attribute->getIsWysiwygEnabled();
5668
}
5769
} catch (NoSuchEntityException $e) {
58-
// This model is used by non product attributes
5970
$config['wysiwyg'] = true;
6071
}
6172
}
73+
6274
$isEnablePageBuilder = isset($wysiwygConfigData['is_pagebuilder_enabled'])
6375
&& !$wysiwygConfigData['is_pagebuilder_enabled']
6476
|| false;
@@ -70,12 +82,28 @@ public function __construct(
7082
$data['config']['template'] = 'ui/form/field';
7183
$data['config']['elementTmpl'] = 'Magento_PageBuilder/form/element/wysiwyg';
7284
$wysiwygConfigData = $stageConfig->getConfig();
85+
$wysiwygConfigData['pagebuilder_button'] = true;
86+
$wysiwygConfigData['pagebuilder_content_snapshot'] = true;
87+
88+
if ($overrideSnapshot) {
89+
$pageBuilderConfig = $pageBuilderConfig ?: ObjectManager::getInstance()->get(PageBuilderConfig::class);
90+
$wysiwygConfigData['pagebuilder_content_snapshot'] = $pageBuilderConfig->isContentPreviewEnabled();
91+
}
92+
93+
// Add Classes for Page Builder Stage
94+
if (isset($wysiwygConfigData['pagebuilder_content_snapshot'])
95+
&& $wysiwygConfigData['pagebuilder_content_snapshot']) {
96+
$data['config']['additionalClasses'] = [
97+
'admin__field-wide admin__field-page-builder' => true
98+
];
99+
}
100+
73101
$data['config']['wysiwygConfigData'] = isset($config['wysiwygConfigData']) ?
74102
array_replace_recursive($config['wysiwygConfigData'], $wysiwygConfigData) :
75103
$wysiwygConfigData;
76104
$wysiwygConfigData['activeEditorPath'] = 'Magento_PageBuilder/pageBuilderAdapter';
105+
77106
$config['wysiwygConfigData'] = $wysiwygConfigData;
78-
$wysiwygConfigData['activeEditorPath'] = 'Magento_PageBuilder/pageBuilderAdapter';
79107
}
80108

81109
parent::__construct($context, $formFactory, $wysiwygConfig, $components, $data, $config);

app/code/Magento/PageBuilder/Model/Config.php

+15-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ class Config extends \Magento\Framework\Config\Data implements \Magento\PageBuil
1717
{
1818
const IS_PAGEBUILDER_ENABLED = 'cms/pagebuilder/enabled';
1919

20+
private const IS_PAGEBUILDER_CONTENT_PREVIEW_ENABLED = 'cms/pagebuilder/enable_content_preview';
21+
2022
/**
2123
* @var ScopeConfigInterface
2224
*/
@@ -66,7 +68,19 @@ public function getContentTypes(): array
6668
public function isEnabled(): bool
6769
{
6870
return (bool)$this->scopeConfig->getValue(
69-
\Magento\PageBuilder\Model\Config::IS_PAGEBUILDER_ENABLED
71+
self::IS_PAGEBUILDER_ENABLED
72+
);
73+
}
74+
75+
/**
76+
* Returns Configuration Setting for Page Builder Content Preview
77+
*
78+
* @return bool
79+
*/
80+
public function isContentPreviewEnabled(): bool
81+
{
82+
return (bool) $this->scopeConfig->getValue(
83+
self::IS_PAGEBUILDER_CONTENT_PREVIEW_ENABLED
7084
);
7185
}
7286
}

app/code/Magento/PageBuilder/Plugin/Catalog/Ui/DataProvider/Product/Form/Modifier/EavPlugin.php

+14-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Magento\Catalog\Api\Data\ProductAttributeInterface;
1212
use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav as EavModifier;
1313
use Magento\Framework\Stdlib\ArrayManager;
14+
use Magento\PageBuilder\Model\Config;
1415

1516
/**
1617
* Data Provider for EAV Attributes on Product Page
@@ -24,12 +25,21 @@ class EavPlugin
2425
*/
2526
private $arrayManager;
2627

28+
/**
29+
* @var Config
30+
*/
31+
private $config;
32+
2733
/**
2834
* @param ArrayManager $arrayManager
35+
* @param Config $config
2936
*/
30-
public function __construct(ArrayManager $arrayManager)
31-
{
37+
public function __construct(
38+
ArrayManager $arrayManager,
39+
Config $config
40+
) {
3241
$this->arrayManager = $arrayManager;
42+
$this->config = $config;
3343
}
3444

3545
/**
@@ -53,7 +63,7 @@ public function afterSetupAttributeMeta(
5363
) {
5464
$meta = $result;
5565

56-
if ($attribute->getData('is_pagebuilder_enabled')) {
66+
if ($this->config->isContentPreviewEnabled() && $attribute->getData('is_pagebuilder_enabled')) {
5767
$meta = $this->arrayManager->merge(
5868
static::META_ATTRIBUTE_CONFIG_PATH,
5969
$result,
@@ -83,7 +93,7 @@ public function afterSetupAttributeContainerMeta(
8393
) {
8494
$containerMeta = $result;
8595

86-
if ($attribute->getData('is_pagebuilder_enabled')) {
96+
if ($this->config->isContentPreviewEnabled() && $attribute->getData('is_pagebuilder_enabled')) {
8797
$containerMeta = $this->arrayManager->merge(
8898
static::META_ATTRIBUTE_CONFIG_PATH,
8999
$result,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminSetPageBuilderContentPreviewActionGroup">
10+
<annotations>
11+
<description>Sets "Enable Page Builder Content Preview" flag value.</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="enablePageBuilderContentPreview" defaultValue="1" type="string"/>
15+
</arguments>
16+
<magentoCLI command="config:set cms/pagebuilder/enable_content_preview {{enablePageBuilderContentPreview}}" stepKey="setConfig"/>
17+
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
18+
</actionGroup>
19+
</actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminOpenPageBuilderFromContentPreviewOverlayActionGroup.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111
<annotations>
1212
<description>Click Page Builder preview overlay to open Page Builder stage.</description>
1313
</annotations>
14-
<waitForElementVisible selector="{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
15-
<click selector="{{PageBuilderStage.stageOverlay}}" stepKey="clickOnStageOverlayOnStage"/>
14+
<arguments>
15+
<argument name="pageBuilderArea" defaultValue="" type="string"/>
16+
</arguments>
17+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
18+
<click selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="clickOnStageOverlayOnStage"/>
1619
<waitForPageLoad stepKey="waitForPageLoadPageBuilder"/>
17-
<waitForElementVisible selector="{{PageBuilderPanel.layoutMenuSection}}" stepKey="waitForPageBuilderLayoutMenu"/>
20+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderPanel.layoutMenuSection}}" stepKey="waitForPageBuilderLayoutMenu"/>
1821
<waitForElementVisible selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="waitForPageBuilderFullScreen"/>
1922
</actionGroup>
2023
</actionGroups>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="ClickEditWithPageBuilderButtonActionGroup">
10+
<annotations>
11+
<description>Validates that Page Builder opens (full screen) using the "Edit with Page Builder" button.</description>
12+
</annotations>
13+
<waitForElementVisible selector="{{PageBuilderStage.editWithPageBuilderButton}}" stepKey="waitForEditWithPageBuilderButton"/>
14+
<click selector="{{PageBuilderStage.editWithPageBuilderButton}}" stepKey="clickEditWithPageBuilderButton"/>
15+
<waitForPageLoad stepKey="waitForFullScreenAnimation"/>
16+
<seeElement selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="seeStageFullScreen"/>
17+
<seeElement selector="{{PageBuilderStage.exitFullScreen}}" stepKey="seeExitFullScreenButton"/>
18+
</actionGroup>
19+
</actionGroups>

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="openPageBuilderFullScreen">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="openPageBuilderFullScreen" deprecated="This action group is no longer supported. Consider using `ClickEditWithPageBuilderButtonActionGroup` instead.">
1110
<waitForElementVisible selector="{{PageBuilderStage.openFullScreen}}" stepKey="waitForFullScreenButton"/>
1211
<click selector="{{PageBuilderStage.openFullScreen}}" stepKey="clickFullScreenButton"/>
1312
<waitForPageLoad stepKey="waitForFullScreenAnimation"/>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidatePageBuilderPreviewActionGroup.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="ValidatePageBuilderPreviewActionGroup">
1110
<annotations>
1211
<description>Verifies Page Builder preview has the 'Edit with Page Builder' button, has an overlay, does not have the Page Builder left panel, does not have the Page Builder template buttons, and does not open content type option menus.</description>
@@ -16,12 +15,13 @@
1615
</arguments>
1716
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.editWithPageBuilderButton}}" stepKey="waitForEditWithPageBuilderButton"/>
1817
<see userInput="Edit with Page Builder" selector="{{pageBuilderArea}}{{PageBuilderStage.editWithPageBuilderButton}}" stepKey="seeEditWithPageBuilderButton"/>
18+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageSnapshot}}" stepKey="seeStageSnapshot"/>
1919
<dontSeeElement selector="{{PageBuilderPanel.leftPanel}}" stepKey="dontSeePageBuilderContentTypePanel"/>
2020
<dontSeeElementInDOM selector="{{pageBuilderArea}}{{PageBuilderStage.applyTemplateButton}}" stepKey="dontSeePageBuilderApplyTemplateButton"/>
2121
<dontSeeElementInDOM selector="{{pageBuilderArea}}{{PageBuilderStage.saveAsTemplateButton}}" stepKey="dontSeePageBuilderSaveAsTemplateButton"/>
22-
<waitForElementVisible selector="{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
23-
<moveMouseOver selector="{{PageBuilderStage.stageOverlay}}" stepKey="mouseOverStageOverlay"/>
24-
<waitForElementVisible selector="{{PageBuilderStage.stageOverlayOnHover}}" stepKey="waitForStageOverlayOnHover"/>
22+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
23+
<moveMouseOver selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="mouseOverStageOverlay"/>
24+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlayOnHover}}" stepKey="waitForStageOverlayOnHover"/>
2525
<dontSeeElement selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderRowContentType.role)}}" stepKey="dontSeeRowOptionMenu"/>
2626
</actionGroup>
2727
</actionGroups>
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/PageBuilderStageSection/PageBuilderStageSection.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
109
<section name="PageBuilderStage">
1110
<element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
1211
<element name="applyTemplateButton" type="button" selector="//button[contains(@data-bind,'toggleTemplateManger') and text()='Apply Template']"/>
@@ -20,10 +19,11 @@
2019
<element name="editButtonSelector" type="button" selector="//button/span[contains(text(), 'Edit with Page Builder')]"/>
2120
<element name="enabled" type="button" selector="//div[not(contains(@class, '_disabled'))]/div[contains(@class, 'pagebuilder-wysiwyg-wrapper')]/div[contains(@class, 'pagebuilder-stage-wrapper')]"/>
2221
<element name="disabled" type="button" selector="//div[contains(@class, '_disabled')]/div[contains(@class, 'pagebuilder-wysiwyg-wrapper')]/div[contains(@class, 'pagebuilder-stage-wrapper')]"/>
22+
<element name="stageSnapshot" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-wrapper') and contains(@class, 'pagebuilder-wysiwyg-snapshot')]"/>
2323
<element name="stagePreview" type="button" selector="//div[contains(@class, 'pagebuilder-stage-wrapper') and not(contains(@class, 'stage-full-screen'))]"/>
2424
<element name="stageWrapperFullScreen" type="button" selector="div.pagebuilder-stage-wrapper.stage-is-active.stage-full-screen"/>
25-
<element name="stageOverlay" type="button" selector="div.pagebuilder-wysiwyg-overlay"/>
26-
<element name="stageOverlayOnHover" type="button" selector="div.pagebuilder-wysiwyg-overlay._hover"/>
25+
<element name="stageOverlay" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-overlay')]"/>
26+
<element name="stageOverlayOnHover" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-overlay') and contains(@class, '_hover')]"/>
2727
<element name="stageWidthJS" type="button" selector="document.querySelector('div[class~=\'root-container-container\']').clientWidth"/>
2828
<element name="modal" type="text" selector="aside.modal-popup._show"/>
2929
<element name="modalOk" type="button" selector="aside.modal-popup._show button.action-primary.action-accept"/>

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
*/
77
-->
88

9-
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1110
<section name="ContentManagementSection">
1211
<element name="PageBuilderOptions" type="button" selector="#cms_pagebuilder-head"/>
1312
<element name="CheckIfPageBuilderTabExpanded" type="button" selector="#cms_pagebuilder-head:not(.open)"/>
1413
<element name="EnablePageBuilderSystemValue" type="button" selector="#cms_pagebuilder_enabled_inherit"/>
1514
<element name="EnablePageBuilder" type="button" selector="#cms_pagebuilder_enabled"/>
15+
<element name="enablePageBuilderContentPreview" type="button" selector="#cms_pagebuilder_enable_content_preview"/>
16+
<element name="enablePageBuilderContentPreviewComment" type="text" selector="#row_cms_pagebuilder_enable_content_preview .value .note span"/>
1617
<element name="DisclaimerMessage" type="text" selector="//aside[@data-type='popup']//div[@class='modal-inner-wrap']"/>
1718
<element name="CancelBtn" type="button" selector=".action-pagebuilder-cancel"/>
1819
<element name="TurnOffBtn" type="button" selector=".action-accept"/>

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

+1
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']"/>

0 commit comments

Comments
 (0)