Merge remote-tracking branch 'origin/MC-4066-map-row-label-removal' into cms-team-1-delivery

Author: cspruiell

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

@@ -159,7 +159,7 @@
                         <item name="componentType" xsi:type="string">container</item>
                     </item>
                 </argument>
-                <field name="location_name" component="Magento_Ui/js/form/element/text" formElement="input" >
+                <field name="location_name" component="Magento_Ui/js/form/element/text" template="Magento_PageBuilder/dynamic-rows/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Location Name</label>
@@ -168,7 +168,7 @@
                         <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                     </settings>
                 </field>
-                <field name="phone" component="Magento_Ui/js/form/element/text" formElement="input">
+                <field name="phone" component="Magento_Ui/js/form/element/text" template="Magento_PageBuilder/dynamic-rows/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Phone Number</label>
@@ -177,7 +177,7 @@
                         <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                     </settings>
                 </field>
-                <field name="address" component="Magento_Ui/js/form/element/text" formElement="input">
+                <field name="address" component="Magento_Ui/js/form/element/text" template="Magento_PageBuilder/dynamic-rows/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Street Address</label>
@@ -186,7 +186,7 @@
                         <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                     </settings>
                 </field>
-                <field name="city" component="Magento_Ui/js/form/element/text" formElement="input">
+                <field name="city" component="Magento_Ui/js/form/element/text" template="Magento_PageBuilder/dynamic-rows/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">City</label>
@@ -195,7 +195,7 @@
                         <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                     </settings>
                 </field>
-                <field name="state" component="Magento_Ui/js/form/element/text" formElement="input">
+                <field name="state" component="Magento_Ui/js/form/element/text" template="Magento_PageBuilder/dynamic-rows/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Region/State</label>
@@ -204,7 +204,7 @@
                         <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                     </settings>
                 </field>
-                <field name="zipcode" component="Magento_Ui/js/form/element/text" formElement="input">
+                <field name="zipcode" component="Magento_Ui/js/form/element/text" template="Magento_PageBuilder/dynamic-rows/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Zip/Postal Code</label>
@@ -213,7 +213,7 @@
                         <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                     </settings>
                 </field>
-                <field name="country" component="Magento_Ui/js/form/element/text" formElement="input">
+                <field name="country" component="Magento_Ui/js/form/element/text" template="Magento_PageBuilder/dynamic-rows/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Country</label>

app/code/Magento/PageBuilder/view/adminhtml/web/template/dynamic-rows/element/text.html

@@ -0,0 +1,40 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="admin__field"
+     visible="visible"
+     css="$data.additionalClasses"
+     attr="'data-index': index">
+    <div class="admin__field-control"
+         css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
+        <render args="elementTmpl" ifnot="hasAddons()"/>
+
+        <div class="admin__control-addon" if="hasAddons()">
+            <render args="elementTmpl"/>
+
+            <label class="admin__addon-prefix" if="$data.addbefore" attr="for: uid">
+                <span text="addbefore"/>
+            </label>
+            <label class="admin__addon-suffix" if="$data.addafter" attr="for: uid">
+                <span text="addafter"/>
+            </label>
+        </div>
+
+        <render args="tooltipTpl" if="$data.tooltip"/>
+
+        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+
+        <label class="admin__field-error" if="error" attr="for: uid" text="error"/>
+
+        <div class="admin__field-note" if="$data.notice" attr="id: noticeId">
+            <span translate="notice"/>
+        </div>
+
+        <div class="admin__additional-info" if="$data.additionalInfo" html="$data.additionalInfo"></div>
+
+        <render args="$data.service.template" if="$data.hasService()"/>
+    </div>
+</div>