Skip to content

Commit e266f7f

Browse files
#559: User Sees No Predefined Gutters
- fix column width - fix invalid margin value
1 parent 33dd29c commit e266f7f

File tree

4 files changed

+11
-6
lines changed
  • app/code/Magento/PageBuilder/view/adminhtml/web

4 files changed

+11
-6
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column/converter/style/margins.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/converter/style/width.js

Lines changed: 3 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/column/converter/style/margins.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ export default class Margins implements ConverterInterface {
4848
if (value && undefined !== value.margin) {
4949
result.marginLeft = value.margin.left ? value.margin.left + "px" : "";
5050
result.marginTop = value.margin.top ? value.margin.top + "px" : "";
51-
result.marginRight = (parseInt(value.margin.right, 10) !== 0 ? value.margin.right : 1) + "px";
51+
result.marginRight = (value.margin.right && parseInt(value.margin.right, 10) !== 0 ?
52+
value.margin.right :
53+
1
54+
) + "px";
5255
result.marginBottom = value.margin.bottom ? value.margin.bottom + "px" : "";
5356
}
5457
return result;

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/width.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ export default class Width implements ConverterInterface {
3535
* @returns {string | object}
3636
*/
3737
public toDom(name: string, data: DataObject): string {
38-
if (data[name] !== "" && data.margins_and_padding) {
39-
const margins = (data.margins_and_padding as any).margin || "";
38+
if (data[name] !== "") {
39+
const marginsAndPadding = data.margins_and_padding || {};
40+
const margins = (marginsAndPadding as any).margin || "";
4041
const marginLeft = margins.left ? parseInt(margins.left as string, 10) : 0;
4142
const marginRight = margins.right ? parseInt(margins.right as string, 10) : 0;
4243

0 commit comments

Comments
 (0)