Skip to content

Commit ce9ebca

Browse files
committed
#628: Page Builder Wysiwyg Editor Element blocks view to content area - Move toolbar to top
1 parent 0bc05da commit ce9ebca

File tree

3 files changed

+5
-52
lines changed

3 files changed

+5
-52
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@
7272
}
7373
}
7474

75-
.mce-tinymce-inline.mce-arrow.mce-container.mce-floatpanel:not(.mce-arrow-up) {
76-
transform: translateY(30px); // table toolbar position fix
77-
}
75+
.mce-tinymce-inline.mce-arrow.mce-container.mce-floatpanel[aria-label="Inline toolbar"] {
76+
transition: transform 200ms;
7877

79-
.mce-tinymce-inline.mce-arrow.mce-container.mce-floatpanel.mce-arrow-up {
80-
transform: translateY(0) !important;
78+
&:not(.mce-arrow-up):not(.mce-arrow-down) {
79+
transform: translate(-1px, -36px); // table toolbar position fix
80+
}
8181
}

app/code/Magento/PageBuilder/view/adminhtml/web/js/wysiwyg/tinymce4.js

Lines changed: 0 additions & 26 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/wysiwyg/tinymce4.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ export default class Wysiwyg implements WysiwygInterface {
168168
.css("min-width", this.config.adapter_config.minToolbarWidth + "px");
169169

170170
this.invertInlineEditorToAccommodateOffscreenToolbar();
171-
this.setStyleOnTableToolbar();
172171
});
173172
}
174173

@@ -178,9 +177,6 @@ export default class Wysiwyg implements WysiwygInterface {
178177
private onChangeContent() {
179178
this.saveContentDebounce();
180179
this.invertInlineEditorToAccommodateOffscreenToolbar();
181-
_.defer(() => {
182-
this.setStyleOnTableToolbar();
183-
});
184180
}
185181

186182
/**
@@ -246,21 +242,4 @@ export default class Wysiwyg implements WysiwygInterface {
246242
private getFixedToolbarContainer() {
247243
return $(`#${this.elementId}`).closest(`${this.config.adapter.settings.fixed_toolbar_container}`);
248244
}
249-
250-
/**
251-
* Adjust table toolbar position, when editor container is smaller than toolbar
252-
*/
253-
private setStyleOnTableToolbar() {
254-
if (this.config.adapter_config.mode !== "inline") {
255-
return;
256-
}
257-
258-
const $tableToolbar = $(".mce-tinymce-inline.mce-arrow.mce-floatpanel:not(.mce-arrow-up)");
259-
260-
if (!$tableToolbar.length) {
261-
return;
262-
}
263-
264-
$tableToolbar.css("transform", "translateY(" + this.getFixedToolbarContainer().height() + "px)");
265-
}
266245
}

0 commit comments

Comments
 (0)