Skip to content

Commit 1c968fd

Browse files
committed
MC-3146: Add new row appearances to configuration
- Fix issue with visual select not displaying value after being hidden - Update full width padding styles
1 parent 25b4e65 commit 1c968fd

File tree

3 files changed

+28
-3
lines changed

3 files changed

+28
-3
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_full-width.less

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
// Full Width row appearance styles
88
// _____________________________________________
99

10-
[data-appearance='full-width'] > .element-children {
10+
.pagebuilder-content-type.children-min-height.pagebuilder-row[data-appearance='full-width'] > .element-children {
1111
margin-left: auto;
1212
margin-right: auto;
1313
max-width: 90%;
14+
padding-left: 20px;
15+
padding-right: 20px;
1416
width: @layout__max-width;
1517
}

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/visual-select.js

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ define([
1212
return Select.extend({
1313
defaults: {
1414
noticeMessage: '',
15+
listens: {
16+
value: 'setNoticeMessage',
17+
}
1518
},
1619

1720
/**
@@ -108,6 +111,26 @@ define([
108111
}
109112

110113
return this;
111-
}
114+
},
115+
116+
/**
117+
* Set the notice message on value change
118+
*
119+
* @param value
120+
* @returns {exports}
121+
*/
122+
setNoticeMessage: function (value) {
123+
var noticeMessage = "",
124+
selectedOption = _.find(this.options(), function (option) {
125+
return option.value === value;
126+
});
127+
128+
if (selectedOption && typeof selectedOption.noticeMessage !== "undefined") {
129+
noticeMessage = selectedOption.noticeMessage;
130+
}
131+
132+
this.noticeMessage(noticeMessage);
133+
return this;
134+
},
112135
});
113136
});

app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/visual-select.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
attr="id: uid, name: inputName"/>
1313

1414
<ol data-bind="foreach: options, css: {'_disabled': disabled}">
15-
<li data-bind="click: function() { if(!$parent.disabled()) {$parent.value(value); $parent.noticeMessage($data.noticeMessage);} }, css: {active: $parent.value() == value, 'admin__field-visual-select-small': $data.size == 'small', 'admin__field-visual-select-large': $data.size == 'large', 'no-pointer-events': $parent.disabled()}, event: {keyup: function() { if(!$parent.disabled() && (event.keyCode==32||event.keyCode==13)) { $parent.value(value); $parent.noticeMessage($data.noticeMessage);} }}, attr: { tabindex: !$parent.disabled() ? 0 : 'false', name: value }">
15+
<li data-bind="click: function() { if(!$parent.disabled()) {$parent.value(value);} }, css: {active: $parent.value() == value, 'admin__field-visual-select-small': $data.size == 'small', 'admin__field-visual-select-large': $data.size == 'large', 'no-pointer-events': $parent.disabled()}, event: {keyup: function() { if(!$parent.disabled() && (event.keyCode==32||event.keyCode==13)) { $parent.value(value);} }}, attr: { tabindex: !$parent.disabled() ? 0 : 'false', name: value }">
1616
<img if="$data.icon" data-bind="attr:{src: $data.icon}" draggable="false" aria-hidden="true"/>
1717
<!-- ko if: $data.size == 'large' -->
1818
<div ifnot="$data.icon" class="admin__field-visual-select-spacer"></div>

0 commit comments

Comments
 (0)