Skip to content

Commit 958deb0

Browse files
committed
MC-3486: Need basic conflict resolution for toolbar in MC-1416
- Moved min toolbar width to configuration
1 parent 2e9256c commit 958deb0

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@
545545
<item name="fixed_toolbar_container" xsi:type="boolean">true</item>
546546
</item>
547547
<item name="mode" xsi:type="string">inline</item>
548+
<item name="minToolbarWidth" xsi:type="number">360</item>
548549
</item>
549550
</argument>
550551
</arguments>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
}
2525
.mce-tinymce-inline {
2626
left: -2px !important;
27-
min-width: 360px;
2827
right: -2px;
2928
top: -1px !important;
3029
}

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

Lines changed: 8 additions & 3 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/ts/js/content-type/wysiwyg.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,28 @@ export default class Wysiwyg {
5858
this.wysiwygAdapter = WysiwygFactory(elementId, config);
5959

6060
const $element = $("#" + elementId);
61-
const maxToolbarWidth = 360;
61+
const minToolbarWidth = config.additional.minToolbarWidth;
6262

6363
// prevent interactability with options when in editing mode
6464
this.onFocus(() => {
6565
window.getSelection().empty();
66+
6667
$(`#${elementId}`).closest(".pagebuilder-content-type").addClass("pagebuilder-toolbar-active");
6768

6869
// If there isn't enough room for a left-aligned toolbar, right align it
69-
if ($(window).width() < $element.offset().left + maxToolbarWidth) {
70+
if ($(window).width() < $element.offset().left + minToolbarWidth) {
7071
$element.addClass("_right-aligned-toolbar");
7172
}
7273
else {
7374
$element.removeClass("_right-aligned-toolbar");
7475
}
7576

7677
events.trigger("stage:interactionStart");
78+
79+
// Wait for everything else to finish
80+
_.defer(() => {
81+
$(config.adapter.settings.fixed_toolbar_container + ' .mce-tinymce-inline').css('min-width', minToolbarWidth + "px");
82+
})
7783
});
7884

7985
// resume normal interactability with opens when leaving editing mode

0 commit comments

Comments
 (0)