Skip to content

Commit 6685c10

Browse files
author
Michael Yu
committed
MC-3087: Overlay color for banner displays as input instead of color input component
- Converted color input to color input component for banner, slide, and divider
1 parent f25f5de commit 6685c10

File tree

3 files changed

+50
-10
lines changed

3 files changed

+50
-10
lines changed

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_banner_form.xml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@
243243
</select>
244244
</formElements>
245245
</field>
246-
<field name="overlay_color" sortOrder="80" formElement="input">
246+
<field name="overlay_color" sortOrder="80" formElement="colorPicker">
247247
<argument name="data" xsi:type="array">
248248
<item name="config" xsi:type="array">
249249
<item name="disabledValues" xsi:type="array">
@@ -253,16 +253,28 @@
253253
</argument>
254254
<settings>
255255
<label translate="true">Overlay Color</label>
256+
<componentType>colorPicker</componentType>
257+
<placeholder translate="true">No Color</placeholder>
256258
<additionalClasses>
257-
<class name="admin__field-small">true</class>
259+
<class name="admin__field-medium">true</class>
258260
</additionalClasses>
259-
<addAfter translate="true">hex color</addAfter>
260-
<dataType>text</dataType>
261+
<validation>
262+
<rule name="validate-color" xsi:type="boolean">true</rule>
263+
</validation>
261264
<dataScope>overlay_color</dataScope>
265+
<dataType>text</dataType>
262266
<imports>
263267
<link name="setDisabled">ns = ${ $.ns }, index = show_overlay:value</link>
264268
</imports>
265269
</settings>
270+
<formElements>
271+
<colorPicker>
272+
<settings>
273+
<colorPickerMode>full</colorPickerMode>
274+
<colorFormat>hex</colorFormat>
275+
</settings>
276+
</colorPicker>
277+
</formElements>
266278
</field>
267279
<field name="overlay_transparency" sortOrder="90" formElement="input">
268280
<argument name="data" xsi:type="array">

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_divider_form.xml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,33 @@
7474
<settings>
7575
<label/>
7676
</settings>
77-
<field name="line_color" sortOrder="10" formElement="input">
77+
<field name="line_color" sortOrder="10" formElement="colorPicker">
7878
<argument name="data" xsi:type="array">
7979
<item name="config" xsi:type="array">
8080
<item name="default" xsi:type="string">#CECECE</item>
8181
</item>
8282
</argument>
8383
<settings>
8484
<label translate="true">Line Color</label>
85-
<addAfter translate="true">hex code</addAfter>
85+
<componentType>colorPicker</componentType>
86+
<placeholder translate="true">No Color</placeholder>
87+
<additionalClasses>
88+
<class name="admin__field-medium">true</class>
89+
</additionalClasses>
8690
<notice translate="true">Example: #FF5733</notice>
91+
<validation>
92+
<rule name="validate-color" xsi:type="boolean">true</rule>
93+
</validation>
94+
<dataType>text</dataType>
8795
</settings>
96+
<formElements>
97+
<colorPicker>
98+
<settings>
99+
<colorPickerMode>full</colorPickerMode>
100+
<colorFormat>hex</colorFormat>
101+
</settings>
102+
</colorPicker>
103+
</formElements>
88104
</field>
89105
<field name="line_thickness" sortOrder="20" formElement="input">
90106
<argument name="data" xsi:type="array">

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_slide_form.xml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@
431431
</select>
432432
</formElements>
433433
</field>
434-
<field name="overlay_color" sortOrder="80" formElement="input">
434+
<field name="overlay_color" sortOrder="80" formElement="colorPicker">
435435
<argument name="data" xsi:type="array">
436436
<item name="config" xsi:type="array">
437437
<item name="default" xsi:type="string">#FFFFFF</item>
@@ -442,16 +442,28 @@
442442
</argument>
443443
<settings>
444444
<label translate="true">Overlay Color</label>
445+
<componentType>colorPicker</componentType>
446+
<placeholder translate="true">No Color</placeholder>
445447
<additionalClasses>
446-
<class name="admin__field-small">true</class>
448+
<class name="admin__field-medium">true</class>
447449
</additionalClasses>
448-
<addAfter translate="true">hex color</addAfter>
449-
<dataType>text</dataType>
450+
<validation>
451+
<rule name="validate-color" xsi:type="boolean">true</rule>
452+
</validation>
450453
<dataScope>overlay_color</dataScope>
454+
<dataType>text</dataType>
451455
<imports>
452456
<link name="setDisabled">ns = ${ $.ns }, index = show_overlay:value</link>
453457
</imports>
454458
</settings>
459+
<formElements>
460+
<colorPicker>
461+
<settings>
462+
<colorPickerMode>full</colorPickerMode>
463+
<colorFormat>hex</colorFormat>
464+
</settings>
465+
</colorPicker>
466+
</formElements>
455467
</field>
456468
<field name="overlay_transparency" sortOrder="90" formElement="input">
457469
<argument name="data" xsi:type="array">

0 commit comments

Comments
 (0)