Skip to content

Commit a013dbb

Browse files
committed
MC-5383: Option Menus, Heading Inline Editor & tinyMCE Inline Editor Are Cut Off on Full Screen View
Dynamically calculate and apply required padding on stage for inline toolbar
1 parent 47ad4f2 commit a013dbb

File tree

13 files changed

+174
-26
lines changed

13 files changed

+174
-26
lines changed

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

Lines changed: 1 addition & 1 deletion
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/banner/preview.js

Lines changed: 1 addition & 1 deletion
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: 4 additions & 1 deletion
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/text/preview.js

Lines changed: 1 addition & 1 deletion
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/wysiwyg/factory.js

Lines changed: 4 additions & 4 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/wysiwyg/tinymce4.js

Lines changed: 75 additions & 5 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-factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import FieldDefaultsInterface from "./field-defaults.d";
2121
*
2222
* @param {ContentTypeConfigInterface} config
2323
* @param {ContentTypeInterface} parent
24-
* @param {number} stageId
24+
* @param {string} stageId
2525
* @param {object} data
2626
* @param {number} childrenLength
2727
* @returns {Promise<ContentTypeInterface>}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export default class Preview extends BasePreview {
177177
config.adapter.settings.fixed_toolbar_container = "#" + this.parent.id + " .pagebuilder-banner-text-content";
178178

179179
WysiwygFactory(
180-
this.parent.id,
180+
this.parent,
181181
element.id,
182182
this.config.name,
183183
config,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,9 @@ export default class Preview extends BasePreview {
252252

253253
/**
254254
* Init the WYSIWYG
255+
*
256+
* @param {boolean} focus Should wysiwyg focus after initialization?
257+
* @returns Promise
255258
*/
256259
public initWysiwyg(focus: boolean = false) {
257260
if (this.wysiwyg) {
@@ -265,7 +268,7 @@ export default class Preview extends BasePreview {
265268
}
266269

267270
return WysiwygFactory(
268-
this.parent.id,
271+
this.parent,
269272
this.element.id,
270273
this.config.name,
271274
wysiwygConfig,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export default class Preview extends BasePreview {
7373
wysiwygConfig.adapter.settings.auto_focus = this.parent.dropped ? element.id : null;
7474

7575
WysiwygFactory(
76-
this.parent.id,
76+
this.parent,
7777
element.id,
7878
this.config.name,
7979
wysiwygConfig,

0 commit comments

Comments
 (0)