Skip to content

Commit 9dd3694

Browse files
committed
MC-5423: Scheduled Update slide out issues
- Fix wrapper height issues after entering full screen
1 parent 4557c8c commit 9dd3694

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/page-builder.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/ts/js/page-builder.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import Config from "./config";
1212
import PageBuilderInterface from "./page-builder.d";
1313
import Panel from "./panel";
1414
import Stage from "./stage";
15+
import StageToggleFullScreenParamsInterface from "./stage-toggle-full-screen-params";
1516

1617
export default class PageBuilder implements PageBuilderInterface {
1718
public template: string = "Magento_PageBuilder/page-builder";
@@ -47,8 +48,10 @@ export default class PageBuilder implements PageBuilderInterface {
4748

4849
/**
4950
* Tells the stage wrapper to expand to fullScreen
51+
*
52+
* @param {StageToggleFullScreenParamsInterface} args
5053
*/
51-
public toggleFullScreen(args): void {
54+
public toggleFullScreen(args: StageToggleFullScreenParamsInterface): void {
5255
if (typeof args.animate !== "undefined" && args.animate === false) {
5356
this.isFullScreen(!this.isFullScreen());
5457
return;
@@ -58,7 +61,7 @@ export default class PageBuilder implements PageBuilderInterface {
5861
const pageBuilderWrapper = stageWrapper.parents(".pagebuilder-wysiwyg-wrapper");
5962
const panel = stageWrapper.find(".pagebuilder-panel");
6063
if (!this.isFullScreen()) {
61-
pageBuilderWrapper.height(pageBuilderWrapper.outerHeight());
64+
pageBuilderWrapper.css("height", pageBuilderWrapper.outerHeight());
6265
this.previousPanelHeight = panel.outerHeight();
6366
panel.css("height", this.previousPanelHeight + "px");
6467
/**
@@ -92,6 +95,7 @@ export default class PageBuilder implements PageBuilderInterface {
9295
// Wait for the 350ms animation to complete before changing these properties back
9396
_.delay(() => {
9497
panel.css("height", "");
98+
pageBuilderWrapper.css("height", "");
9599
this.wrapperStyles(Object.keys(this.previousWrapperStyles)
96100
.reduce((object: object, styleName: string) => {
97101
return Object.assign(object, {[styleName]: ""});
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
/**
7+
* @api
8+
*/
9+
export default interface StageToggleFullScreenParamsInterface {
10+
animate?: boolean;
11+
}

0 commit comments

Comments
 (0)