Skip to content

Commit 447e0df

Browse files
MC-3735: Allow inline WYSIWYG editing of slides
- Add textarea as fallback - Add test that cover all appearances - Activate inline mode on slide container click
1 parent e6336fb commit 447e0df

File tree

16 files changed

+719
-195
lines changed

16 files changed

+719
-195
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@
163163
<element name="slideBorderRadiusStyle" type="button" selector="div[style*='border-radius: {{arg1}}']" parameterized="true"/>
164164
<element name="editFormBackgroundImagePreview" type="button" selector="//input[@name='background_image']/ancestor::div[@class='admin__field-control']/descendant::img"/>
165165
<element name="editFormBackgroundMobileImagePreview" type="button" selector="//input[@name='mobile_image']/ancestor::div[@class='admin__field-control']/descendant::img"/>
166-
<element name="tinymce" type="button" selector="(//div[contains(@class,'pagebuilder-slide-wrapper')])[{{arg1}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
167-
<element name="tinymcePanel" type="button" selector="(//div[contains(@class,'pagebuilder-slide-wrapper')])[{{arg1}}]//div[contains(@class, 'mce-tinymce-inline')]" parameterized="true"/>
166+
<element name="tinymce" type="button" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg1}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
167+
<element name="tinymcePanel" type="button" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg1}}]//div[contains(@class, 'mce-tinymce-inline')]" parameterized="true"/>
168168
</section>
169169
<section name="SlideOnConfigurationPanel">
170170
<element name="tinyMCEIFrame" type="text" selector="pagebuilder_slide_form_content_ifr"/>

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

Lines changed: 197 additions & 16 deletions
Large diffs are not rendered by default.

app/code/Magento/PageBuilder/etc/adminhtml/di.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,9 +521,11 @@
521521
<item name="component" xsi:type="string">Magento_PageBuilder/js/content-type/wysiwyg/tinymce4</item>
522522
<item name="component_initializers" xsi:type="array">
523523
<item name="text" xsi:type="string">Magento_PageBuilder/js/content-type/text/wysiwyg/tinymce4/component-initializer</item>
524+
<item name="slide" xsi:type="string">Magento_PageBuilder/js/content-type/slide/wysiwyg/tinymce4/component-initializer</item>
524525
</item>
525526
<item name="config_modifiers" xsi:type="array">
526527
<item name="text" xsi:type="string">Magento_PageBuilder/js/content-type/text/wysiwyg/tinymce4/config-modifier</item>
528+
<item name="slide" xsi:type="string">Magento_PageBuilder/js/content-type/slide/wysiwyg/tinymce4/config-modifier</item>
527529
</item>
528530
<item name="mode" xsi:type="string">inline</item>
529531
<item name="minToolbarWidth" xsi:type="number">360</item>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
.pagebuilder-slide {
1111
background-color: @color-gray98;
12+
cursor: text;
1213

1314
.pagebuilder-empty-slide {
1415
color: @color-gray65-lighten;
@@ -67,4 +68,17 @@
6768
box-shadow: 0 0 0 1px rgb(153, 153, 153);
6869
}
6970
}
71+
72+
.inline-wysiwyg-textarea {
73+
border: 0;
74+
margin: 2px 0;
75+
min-height: 50px;
76+
min-width: 100%;
77+
padding: 5px;
78+
resize: none;
79+
80+
&:focus {
81+
resize: vertical;
82+
}
83+
}
7084
}

app/code/Magento/PageBuilder/view/adminhtml/web/js/binding/live-edit.js

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

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/preview.js

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

0 commit comments

Comments
 (0)