Merge remote-tracking branch 'origin/2.4-develop' into MCP-792

Author: aa-kashk

app/code/Magento/Customer/view/adminhtml/web/template/default-address.html

@@ -7,7 +7,7 @@
 <div data-bind="attr: {class: contentClass}">
     <div data-bind="attr: {class: 'fieldset-wrapper address-information ' + defaultAddressClass}">
         <address>
-            <div class="address_caption">
+            <div class="address_caption" data-bind="attr: {id: defaultAddressId}">
                 <text args="title"></text>
                 <each args="data: elems, as: 'element'">
                     <render if="hasTemplate()"></render>

app/code/Magento/Customer/view/base/ui_component/customer_form.xml

@@ -348,6 +348,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="defaultAddressClass" xsi:type="string">billing-address</item>
+                        <item name="defaultAddressId" xsi:type="string">billing-address-caption</item>
                         <item name="title" translate="true" xsi:type="string">Default Billing Address</item>
                         <item name="contentClass" xsi:type="string">customer-default-billing-address-content</item>
                         <item name="notExistsMessage" xsi:type="string" translate="true">The customer does not have default billing address</item>
@@ -366,6 +367,8 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="buttonClasses" xsi:type="string">edit-default-billing-address-button</item>
+                        <item name="buttonTextId" xsi:type="string">edit-billing-address</item>
+                        <item name="ariLabelledby" xsi:type="string">billing-address-caption edit-billing-address</item>
                         <item name="actions" xsi:type="array">
                             <item name="0" xsi:type="array">
                                 <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal.update_customer_address_form_loader</item>
@@ -398,6 +401,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="defaultAddressClass" xsi:type="string">shipping-address</item>
+                        <item name="defaultAddressId" xsi:type="string">shipping-address-caption</item>
                         <item name="title" xsi:type="string" translate="true">Default Shipping Address</item>
                         <item name="contentClass" xsi:type="string">customer-default-shipping-address-content</item>
                         <item name="notExistsMessage" xsi:type="string" translate="true">The customer does not have default shipping address</item>
@@ -416,6 +420,8 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="buttonClasses" xsi:type="string">edit-default-shipping-address-button</item>
+                        <item name="buttonTextId" xsi:type="string">edit-shipping-address</item>
+                        <item name="ariLabelledby" xsi:type="string">shipping-address-caption edit-shipping-address</item>
                         <item name="actions" xsi:type="array">
                             <item name="0" xsi:type="array">
                                 <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal.update_customer_address_form_loader</item>

app/code/Magento/Ui/view/base/web/js/form/components/button.js

@@ -25,7 +25,9 @@ define([
             template: 'ui/form/components/button/simple',
             visible: true,
             disabled: false,
-            title: ''
+            title: '',
+            buttonTextId: '',
+            ariLabelledby: ''
         },
 
         /**

app/code/Magento/Ui/view/base/web/templates/form/element/button.html

@@ -8,8 +8,8 @@
         css="buttonClasses"
         click="action"
         disable="disabled"
-        attr="'data-index': index">
-    <span text="title"></span>
+        attr="'data-index': index, 'aria-labelledby': ariLabelledby">
+    <span attr="'id': buttonTextId" text="title"></span>
 </button>
 
 <if args="childError">

app/code/Magento/Ui/view/base/web/templates/form/element/date.html

@@ -13,5 +13,6 @@
         name: inputName,
         placeholder: placeholder,
         'aria-describedby': noticeId,
-        disabled: disabled
+        disabled: disabled,
+        id:uid
     }" />