Skip to content

Commit 274790d

Browse files
committed
Merge remote-tracking branch 'trigger/MC-1416' into MC-3308
2 parents f784494 + bee470d commit 274790d

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_inline-wysiwyg.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,7 @@
4141
visibility: visible !important;
4242
}
4343
}
44+
&._right-aligned-toolbar ~ div.mce-tinymce-inline {
45+
left: auto !important;
46+
}
4447
}

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

Lines changed: 10 additions & 2 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: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,21 @@ export default class Wysiwyg {
5858
this.wysiwygAdapter.setup(mode);
5959
}
6060

61+
const $element = $("#" + elementId);
62+
const maxToolbarWidth = 360;
63+
6164
// prevent interactability with options when in editing mode
6265
this.onFocus(() => {
6366
$(`#${elementId}`).closest(".pagebuilder-content-type").addClass("pagebuilder-toolbar-active");
67+
68+
// If there isn't enough room for a left-aligned toolbar, right align it
69+
if ($(window).width() < $element.offset().left + maxToolbarWidth) {
70+
$element.addClass('_right-aligned-toolbar');
71+
}
72+
else {
73+
$element.removeClass('_right-aligned-toolbar')
74+
}
75+
6476
events.trigger("stage:interactionStart");
6577
});
6678

0 commit comments

Comments
 (0)