Skip to content

Commit 84ad34a

Browse files
committed
MC-5025: Right/Left Margin Not Working For Content Types
- add further documentation to explain percent vs pixels - add type safety check for margins_and_padding
1 parent 1769c20 commit 84ad34a

File tree

2 files changed

+21
-12
lines changed
  • app/code/Magento/PageBuilder/view/adminhtml/web

2 files changed

+21
-12
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/style/max-width.js

Lines changed: 11 additions & 6 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/video/converter/style/max-width.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {DataObject} from "../../../../data-store";
88

99
/**
1010
* Subtract margin from max-width to fit inside parent container
11+
* Accepted values are in pixels. If no value is set by user, it's 100%
1112
*
1213
* @api
1314
*/
@@ -33,13 +34,16 @@ export default class MaxWidth implements ConverterInterface {
3334
* @returns {string | object}
3435
*/
3536
public toDom(name: string, data: DataObject): string {
36-
if (data.max_width !== "") {
37-
return data.max_width + "px";
37+
if (data[name] !== "") {
38+
return data[name] + "px";
3839
}
39-
const margins = data.margins_and_padding.margin || {};
40-
const marginLeft = margins.left ? parseInt(margins.left as string, 10) : 0;
41-
const marginRight = margins.right ? parseInt(margins.right as string, 10) : 0;
40+
if (data.margins_and_padding && data.margins_and_padding !== undefined) {
41+
const margins = data.margins_and_padding.margin || {};
42+
const marginLeft = margins.left ? parseInt(margins.left as string, 10) : 0;
43+
const marginRight = margins.right ? parseInt(margins.right as string, 10) : 0;
4244

43-
return "calc(100% - " + (marginLeft + marginRight) + "px)";
45+
return "calc(100% - " + (marginLeft + marginRight) + "px)";
46+
}
47+
return "100%";
4448
}
4549
}

0 commit comments

Comments
 (0)