Skip to content

Commit 6090c63

Browse files
committed
MC-1263: Buttons of Image Content Block are not aligned correctly
- Updated with Cr feedback
1 parent 9f7754f commit 6090c63

File tree

1 file changed

+27
-6
lines changed

1 file changed

+27
-6
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/image-uploader.js

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,13 @@ define([
2828
},
2929
// listed in ascending order
3030
elementWidthModifierClasses: {
31-
'_micro-ui': 130,
32-
'_compact-ui': 440
31+
'_micro-ui': {
32+
maxWidth: 130
33+
},
34+
'_compact-ui': {
35+
minWidth: 131,
36+
maxWidth: 440
37+
}
3338
},
3439
translations: {
3540
allowedFileTypes: $t('Allowed file types'),
@@ -160,7 +165,10 @@ define([
160165
* Adds the appropriate ui state class to the upload control area based on the current rendered size
161166
*/
162167
updateResponsiveClasses: function () {
163-
var modifierClass;
168+
var classesToAdd = [],
169+
classConfig,
170+
elementWidth = this.$uploadArea.width(),
171+
modifierClass;
164172

165173
if (!this.$uploadArea.is(':visible')) {
166174
return;
@@ -169,11 +177,24 @@ define([
169177
this.$uploadArea.removeClass(Object.keys(this.elementWidthModifierClasses).join(' '));
170178

171179
for (modifierClass in this.elementWidthModifierClasses) {
172-
if (this.$uploadArea.width() < this.elementWidthModifierClasses[modifierClass]) {
173-
this.$uploadArea.addClass(modifierClass);
174-
break;
180+
if (!this.elementWidthModifierClasses.hasOwnProperty(modifierClass)) {
181+
continue;
182+
}
183+
184+
classConfig = this.elementWidthModifierClasses[modifierClass];
185+
186+
if (classConfig.minWidth && classConfig.maxWidth &&
187+
(classConfig.minWidth <= elementWidth && elementWidth <= classConfig.maxWidth) ||
188+
classConfig.minWidth && !classConfig.maxWidth && classConfig.minWidth <= elementWidth ||
189+
classConfig.maxWidth && !classConfig.minWidth && elementWidth <= classConfig.maxWidth
190+
) {
191+
classesToAdd.push(modifierClass);
175192
}
176193
}
194+
195+
if (classesToAdd.length) {
196+
this.$uploadArea.addClass(classesToAdd.join(' '));
197+
}
177198
}
178199
});
179200
});

0 commit comments

Comments
 (0)