Skip to content

Commit 76d13db

Browse files
MC-401: Advanced Attributes Not Removing From Preview
- fix converters to return empty string for default values
1 parent ba3a657 commit 76d13db

File tree

10 files changed

+40
-36
lines changed

10 files changed

+40
-36
lines changed

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

Lines changed: 3 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/converter/style/margins-and-paddings.js

Lines changed: 8 additions & 8 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/converter/style/margins.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/converter/style/paddings.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/ts/js/converter/style/border-style.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default class BorderStyleDefault implements ConverterInterface {
2828
* @returns {string}
2929
*/
3030
public toDom(name: string, data: DataObject): string {
31-
if (data[name]) {
31+
if (data[name] && data[name] !== "_default") {
3232
return data[name].toString();
3333
}
3434
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ export default class BorderWidth implements ConverterInterface {
2424
* @returns {string | object}
2525
*/
2626
public toDom(name: string, data: object): string | object {
27-
return data[name] + "px";
27+
if (data[name]) {
28+
return data[name] + "px";
29+
}
2830
}
2931
}

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/margins-and-paddings.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ export default class MarginsAndPaddings implements ConverterInterface {
4848
}
4949
if (value) {
5050
if (undefined !== value.margin) {
51-
result.marginLeft = value.margin.left + "px";
52-
result.marginTop = value.margin.top + "px";
53-
result.marginRight = value.margin.right + "px";
54-
result.marginBottom = value.margin.bottom + "px";
51+
result.marginLeft = value.margin.left ? value.margin.left + "px" : "";
52+
result.marginTop = value.margin.top ? value.margin.top + "px" : "";
53+
result.marginRight = value.margin.right ? value.margin.right + "px" : "";
54+
result.marginBottom = value.margin.bottom ? value.margin.bottom + "px" : "";
5555
}
5656
if (undefined !== value.padding) {
57-
result.paddingLeft = value.padding.left + "px";
58-
result.paddingTop = value.padding.top + "px";
59-
result.paddingRight = value.padding.right + "px";
60-
result.paddingBottom = value.padding.bottom + "px";
57+
result.paddingLeft = value.padding.left ? value.padding.left + "px" : "";
58+
result.paddingTop = value.padding.top ? value.padding.top + "px" : "";
59+
result.paddingRight = value.padding.right ? value.padding.right + "px" : "";
60+
result.paddingBottom = value.padding.bottom ? value.padding.bottom + "px" : "";
6161
}
6262
}
6363
return result;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ export default class Margins implements ConverterInterface {
3939
value = JSON.parse(value);
4040
}
4141
if (value && undefined !== value.margin) {
42-
result.marginLeft = value.margin.left + "px";
43-
result.marginTop = value.margin.top + "px";
44-
result.marginRight = value.margin.right + "px";
45-
result.marginBottom = value.margin.bottom + "px";
42+
result.marginLeft = value.margin.left ? value.margin.left + "px" : "";
43+
result.marginTop = value.margin.top ? value.margin.top + "px" : "";
44+
result.marginRight = value.margin.right ? value.margin.right + "px" : "";
45+
result.marginBottom = value.margin.bottom ? value.margin.bottom + "px" : "";
4646
}
4747
return result;
4848
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ export default class Paddings implements ConverterInterface {
3939
value = JSON.parse(value);
4040
}
4141
if (value && undefined !== value.padding) {
42-
result.paddingLeft = value.padding.left + "px";
43-
result.paddingTop = value.padding.top + "px";
44-
result.paddingRight = value.padding.right + "px";
45-
result.paddingBottom = value.padding.bottom + "px";
42+
result.paddingLeft = value.padding.left ? value.padding.left + "px" : "";
43+
result.paddingTop = value.padding.top ? value.padding.top + "px" : "";
44+
result.paddingRight = value.padding.right ? value.padding.right + "px" : "";
45+
result.paddingBottom = value.padding.bottom ? value.padding.bottom + "px" : "";
4646
}
4747
return result;
4848
}

0 commit comments

Comments
 (0)