Skip to content

Commit 6b6fb4e

Browse files
author
Hwashiang Yu
committed
MC-15093: Buttons From Different Button Groups Merge Onto Same Line When in Full-Width Row
- Updated converter logic for button display - Renamed coverter to boolean to better match its intent
1 parent 0eedb70 commit 6b6fb4e

File tree

3 files changed

+13
-13
lines changed
  • app/code/Magento/PageBuilder/view/adminhtml
    • pagebuilder/content_type
    • web
      • js/content-type/buttons/converter/style/display
      • ts/js/content-type/buttons/converter/style/display

3 files changed

+13
-13
lines changed

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/buttons.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<style name="border_color" source="border_color"/>
3333
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
3434
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
35-
<style name="display" source="display" converter="Magento_PageBuilder/js/content-type/buttons/converter/style/display/inline-block" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
35+
<style name="display" source="display" converter="Magento_PageBuilder/js/content-type/buttons/converter/style/display/boolean" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
3636
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins"/>
3737
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
3838
<attribute name="name" source="data-content-type"/>
Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {get} from "../../../../../utils/object";
1111
/**
1212
* @api
1313
*/
14-
export default class InlineBlock implements ConverterInterface {
14+
export default class Boolean implements ConverterInterface {
1515
/**
1616
* Convert value to internal format
1717
*
@@ -23,17 +23,17 @@ export default class InlineBlock implements ConverterInterface {
2323
}
2424

2525
/**
26-
* Convert value to knockout format, if buttons are displayed they should be inline block
26+
* Convert value to knockout format, if buttons are displayed they should be reset to default
2727
*
2828
* @param {string} name
2929
* @param {DataObject} data
3030
* @returns {string}
3131
*/
3232
public toDom(name: string, data: DataObject): string {
33-
const value = get(data, name);
33+
const value: string | boolean = get(data, name);
3434
if (!_.isUndefined(value) && value === false) {
3535
return "none";
3636
}
37-
return "inline-block";
37+
return "";
3838
}
3939
}

0 commit comments

Comments
 (0)