Skip to content

Commit f1dd583

Browse files
irenelagnoirenelagno
authored
Merge pull request #47 from magento-trigger/team3-delivery
[Team 3] Sprint 7 Delivery
2 parents d3b49e0 + 94ea690 commit f1dd583

File tree

67 files changed

+742
-572
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+742
-572
lines changed

‎app/code/Magento/PageBuilder/docs/content-type-configuration.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ The following is an example of a content type configuration in `etc/content_type
6060
</element>
6161
<element name="link" path=".//a">
6262
<attributes>
63-
<attribute var="link_url" name="href" />
64-
<attribute var="open_in_new_tab" name="target" converter="Magento_PageBuilder/js/converter/default/attribute/target"/>
63+
<complex_attribute var="link_url" persist="false" reader="Magento_PageBuilder/js/property/default/link"/>
64+
<attribute var="link_url" name="href" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-href" />
65+
<attribute var="link_url" name="target" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-target" />
66+
<attribute var="link_url" name="data-link-type" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-type" />
6567
</attributes>
6668
</element>
6769
<element name="overlay" path=".//a/div[2]/div">
@@ -235,8 +237,10 @@ Set the `default` attribute to "true" in an `appearance` node to set the default
235237
</element>
236238
<element name="link" path=".//a">
237239
<attributes>
238-
<attribute var="link_url" name="href" />
239-
<attribute var="open_in_new_tab" name="target" converter="Magento_PageBuilder/js/converter/default/attribute/target"/>
240+
<complex_attribute var="link_url" persist="false" reader="Magento_PageBuilder/js/property/default/link"/>
241+
<attribute var="link_url" name="href" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-href" />
242+
<attribute var="link_url" name="target" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-target" />
243+
<attribute var="link_url" name="data-link-type" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-type" />
240244
</attributes>
241245
</element>
242246
<element name="overlay" path=".//a/div[2]/div">

‎app/code/Magento/PageBuilder/etc/content_types/banner.xml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@
4141
</element>
4242
<element name="link" path=".//a">
4343
<attributes>
44-
<attribute name="href" var="link_url"/>
45-
<attribute converter="Magento_PageBuilder/js/converter/default/attribute/target" name="target" var="open_in_new_tab"/>
44+
<complex_attribute var="link_url" persist="false" reader="Magento_PageBuilder/js/property/default/link"/>
45+
<attribute var="link_url" name="href" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-href" />
46+
<attribute var="link_url" name="target" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-target" />
47+
<attribute var="link_url" name="data-link-type" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-type" />
4648
</attributes>
4749
</element>
4850
<element name="overlay" path=".//a/div[1]/div">
@@ -131,8 +133,10 @@
131133
</element>
132134
<element name="link" path=".//a">
133135
<attributes>
134-
<attribute name="href" var="link_url"/>
135-
<attribute converter="Magento_PageBuilder/js/converter/default/attribute/target" name="target" var="open_in_new_tab"/>
136+
<complex_attribute var="link_url" persist="false" reader="Magento_PageBuilder/js/property/default/link"/>
137+
<attribute var="link_url" name="href" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-href" />
138+
<attribute var="link_url" name="target" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-target" />
139+
<attribute var="link_url" name="data-link-type" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-type" />
136140
</attributes>
137141
</element>
138142
<element name="overlay" path=".//a/div[1]/div">
@@ -221,8 +225,10 @@
221225
</element>
222226
<element name="link" path=".//a">
223227
<attributes>
224-
<attribute name="href" var="link_url"/>
225-
<attribute converter="Magento_PageBuilder/js/converter/default/attribute/target" name="target" var="open_in_new_tab"/>
228+
<complex_attribute var="link_url" persist="false" reader="Magento_PageBuilder/js/property/default/link"/>
229+
<attribute var="link_url" name="href" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-href" />
230+
<attribute var="link_url" name="target" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-target" />
231+
<attribute var="link_url" name="data-link-type" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-type" />
226232
</attributes>
227233
</element>
228234
<element name="overlay" path=".//a/div[1]/div">
@@ -311,8 +317,10 @@
311317
</element>
312318
<element name="link" path=".//a">
313319
<attributes>
314-
<attribute name="href" var="link_url"/>
315-
<attribute converter="Magento_PageBuilder/js/converter/default/attribute/target" name="target" var="open_in_new_tab"/>
320+
<complex_attribute var="link_url" persist="false" reader="Magento_PageBuilder/js/property/default/link"/>
321+
<attribute var="link_url" name="href" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-href" />
322+
<attribute var="link_url" name="target" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-target" />
323+
<attribute var="link_url" name="data-link-type" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-type" />
316324
</attributes>
317325
</element>
318326
<element name="overlay" path=".//a/div[2]/div">

‎app/code/Magento/PageBuilder/etc/content_types/button_item.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
<element name="link" path="./a">
3636
<style_properties>
3737
<property var="text_align" name="text_align"/>
38-
<property var="border" name="border_style"/>
38+
<property var="border" name="border_style" converter="Magento_PageBuilder/js/converter/default/style/border-style"/>
3939
<property var="border_color" name="border_color" converter="Magento_PageBuilder/js/converter/default/style/color"/>
40-
<property var="border_width" name="border_width" converter="Magento_PageBuilder/js/converter/default/style/remove-px"/>
40+
<property var="border_width" name="border_width" converter="Magento_PageBuilder/js/converter/default/style/border-width"/>
4141
<property var="border_radius" name="border_radius" converter="Magento_PageBuilder/js/converter/default/style/remove-px"/>
4242
<complex_property var="margins_and_padding" reader="Magento_PageBuilder/js/property/default/margins-and-paddings" converter="Magento_PageBuilder/js/converter/default/style/margins-and-paddings"/>
4343
</style_properties>
4444
<attributes>
45-
<complex_attribute var="button_link" persist="false" reader="Magento_PageBuilder/js/converter/default/attribute/link"/>
45+
<complex_attribute var="button_link" persist="false" reader="Magento_PageBuilder/js/property/default/link"/>
4646
<attribute var="button_link" name="href" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-href" />
4747
<attribute var="button_link" name="target" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-target" />
4848
<attribute var="button_link" name="data-link-type" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-type" />

‎app/code/Magento/PageBuilder/etc/content_types/buttons.xml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,27 @@
2222
</allowed_parents>
2323
<appearances>
2424
<appearance default="true" name="default">
25+
<data_mapping>
26+
<elements>
27+
<element name="main" path=".">
28+
<style_properties>
29+
<property name="text_align" var="text_align"/>
30+
<property converter="Magento_PageBuilder/js/converter/default/style/border-style" var="border" name="border_style"/>
31+
<property converter="Magento_PageBuilder/js/converter/default/style/color" name="border_color" var="border_color"/>
32+
<property converter="Magento_PageBuilder/js/converter/default/style/border-width" name="border_width" var="border_width"/>
33+
<property converter="Magento_PageBuilder/js/converter/default/style/remove-px" name="border_radius" var="border_radius"/>
34+
<complex_property converter="Magento_PageBuilder/js/converter/default/style/margins-and-paddings" reader="Magento_PageBuilder/js/property/default/margins-and-paddings" var="margins_and_padding"/>
35+
</style_properties>
36+
<attributes>
37+
<attribute name="data-role" var="name"/>
38+
</attributes>
39+
<css var="css_classes"/>
40+
</element>
41+
</elements>
42+
</data_mapping>
2543
<preview_template>Magento_PageBuilder/component/block/preview/buttons.html</preview_template>
2644
<render_template>Magento_PageBuilder/component/block/render/buttons.html</render_template>
27-
<readers>
28-
<reader component="Magento_PageBuilder/js/component/format/read/default" name="default"/>
29-
</readers>
45+
<reader>Magento_PageBuilder/js/component/format/read/configurable</reader>
3046
</appearance>
3147
</appearances>
3248
</type>

‎app/code/Magento/PageBuilder/etc/content_types/image.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@
6262
</element>
6363
<element name="link" path=".//a">
6464
<attributes>
65-
<attribute name="href" var="link_url"/>
66-
<attribute name="target" var="link_target"/>
65+
<complex_attribute var="link_url" persist="false" reader="Magento_PageBuilder/js/property/default/link"/>
66+
<attribute var="link_url" name="href" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-href" />
67+
<attribute var="link_url" name="target" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-target" />
68+
<attribute var="link_url" name="data-link-type" virtual="true" converter="Magento_PageBuilder/js/converter/default/attribute/link-type" />
6769
<attribute name="title" var="title_attribute"/>
6870
</attributes>
6971
</element>

‎app/code/Magento/PageBuilder/i18n/en_US.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,5 @@ Fade,Fade
219219
"Full Width","Full Width"
220220
"ID: %1","ID: %1"
221221
"Page", "Page"
222-
"Page Name", "Page Name"
222+
"Page Name", "Page Name"
223+
"No Color", "No Color"

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

Lines changed: 20 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,27 @@
101101
<collapsible>true</collapsible>
102102
<opened>true</opened>
103103
</settings>
104-
<field name="background_color" sortOrder="10" formElement="input">
104+
<field name="background_color" sortOrder="10" formElement="colorPicker">
105105
<settings>
106106
<label translate="true">Background Color</label>
107+
<componentType>colorPicker</componentType>
108+
<placeholder translate="true">No Color</placeholder>
109+
<validation>
110+
<rule name="validate-color" xsi:type="boolean">true</rule>
111+
</validation>
112+
<dataScope>background_color</dataScope>
107113
<additionalClasses>
108-
<class name="admin__field-small">true</class>
114+
<class name="admin__field-medium">true</class>
109115
</additionalClasses>
110-
<addAfter translate="true">hex color</addAfter>
111-
<dataType>text</dataType>
112-
<dataScope>background_color</dataScope>
113116
</settings>
117+
<formElements>
118+
<colorPicker>
119+
<settings>
120+
<colorPickerMode>full</colorPickerMode>
121+
<colorFormat>hex</colorFormat>
122+
</settings>
123+
</colorPicker>
124+
</formElements>
114125
</field>
115126
<field name="background_image" sortOrder="20" formElement="imageUploader">
116127
<settings>
@@ -293,46 +304,14 @@
293304
</wysiwyg>
294305
</formElements>
295306
</field>
296-
<field name="link_url" sortOrder="20" formElement="input">
297-
<argument name="data" xsi:type="array">
298-
<item name="config" xsi:type="array">
299-
<item name="disabledValues" xsi:type="array">
300-
<item name="none" xsi:type="string">never_show</item>
301-
</item>
302-
</item>
303-
</argument>
307+
<urlInput name="link_url" sortOrder="20">
304308
<settings>
305-
<label translate="true">Link</label>
306309
<dataType>text</dataType>
310+
<label translate="true">Link</label>
307311
<dataScope>link_url</dataScope>
312+
<urlTypes class="Magento\Ui\Model\UrlInput\LinksConfigProvider"/>
308313
</settings>
309-
</field>
310-
<field name="open_in_new_tab" sortOrder="30" formElement="checkbox">
311-
<argument name="data" xsi:type="array">
312-
<item name="config" xsi:type="array">
313-
<item name="default" xsi:type="string">false</item>
314-
<item name="disabledValues" xsi:type="array">
315-
<item name="none" xsi:type="string">never_show</item>
316-
</item>
317-
</item>
318-
</argument>
319-
<settings>
320-
<dataType>boolean</dataType>
321-
<label translate="true">Open in new tab</label>
322-
<dataScope>open_in_new_tab</dataScope>
323-
</settings>
324-
<formElements>
325-
<checkbox>
326-
<settings>
327-
<valueMap>
328-
<map name="false" xsi:type="number">0</map>
329-
<map name="true" xsi:type="number">1</map>
330-
</valueMap>
331-
<prefer>toggle</prefer>
332-
</settings>
333-
</checkbox>
334-
</formElements>
335-
</field>
314+
</urlInput>
336315
<field name="show_button" sortOrder="40" formElement="select">
337316
<argument name="data" xsi:type="array">
338317
<item name="config" xsi:type="array">

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_base_form.xml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
</select>
113113
</formElements>
114114
</field>
115-
<field name="border_color" sortOrder="30" formElement="input">
115+
<field name="border_color" sortOrder="30" formElement="colorPicker">
116116
<argument name="data" xsi:type="array">
117117
<item name="config" xsi:type="array">
118118
<item name="disabledValues" xsi:type="array">
@@ -121,14 +121,28 @@
121121
</item>
122122
</argument>
123123
<settings>
124-
<dataType>text</dataType>
125124
<label translate="true">Border Color</label>
126-
<addAfter translate="true">hex color</addAfter>
127-
<placeholder translate="true">Default</placeholder>
125+
<componentType>colorPicker</componentType>
126+
<placeholder translate="true">No Color</placeholder>
127+
<validation>
128+
<rule name="validate-color" xsi:type="boolean">true</rule>
129+
</validation>
130+
<dataScope>border_color</dataScope>
131+
<additionalClasses>
132+
<class name="admin__field-medium">true</class>
133+
</additionalClasses>
128134
<imports>
129135
<link name="setDisabled">ns = ${ $.ns }, index = border:value</link>
130136
</imports>
131137
</settings>
138+
<formElements>
139+
<colorPicker>
140+
<settings>
141+
<colorPickerMode>full</colorPickerMode>
142+
<colorFormat>hex</colorFormat>
143+
</settings>
144+
</colorPicker>
145+
</formElements>
132146
</field>
133147
<field name="border_width" sortOrder="40" formElement="input">
134148
<argument name="data" xsi:type="array">

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_column_form.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,27 @@
105105
<collapsible>true</collapsible>
106106
<opened>true</opened>
107107
</settings>
108-
<field name="background_color" sortOrder="10" formElement="input">
108+
<field name="background_color" sortOrder="10" formElement="colorPicker">
109109
<settings>
110110
<label translate="true">Background Color</label>
111+
<componentType>colorPicker</componentType>
112+
<placeholder translate="true">No Color</placeholder>
113+
<validation>
114+
<rule name="validate-color" xsi:type="boolean">true</rule>
115+
</validation>
116+
<dataScope>background_color</dataScope>
117+
<additionalClasses>
118+
<class name="admin__field-medium">true</class>
119+
</additionalClasses>
111120
</settings>
121+
<formElements>
122+
<colorPicker>
123+
<settings>
124+
<colorPickerMode>full</colorPickerMode>
125+
<colorFormat>hex</colorFormat>
126+
</settings>
127+
</colorPicker>
128+
</formElements>
112129
</field>
113130
<field name="background_image" sortOrder="20" formElement="imageUploader">
114131
<settings>

0 commit comments

Comments
 (0)