Skip to content

Commit 97ab45c

Browse files
authored
ENGCOM-9188: Fix accessibility errors on cart and checkout pages #33851
2 parents 88d3208 + 6bd255b commit 97ab45c

File tree

7 files changed

+14
-11
lines changed

7 files changed

+14
-11
lines changed

app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCartGiftOptionSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<element name="giftOptions" type="button" selector=".action.action-gift"/>
1313
<element name="fieldTo" type="input" selector=".gift-options-content .field-to input"/>
1414
<element name="fieldFrom" type="input" selector=".gift-options-content .field-from input"/>
15-
<element name="message" type="textarea" selector="#gift-message-whole-message"/>
15+
<element name="message" type="textarea" selector=".gift-options-content .field.text .input-text"/>
1616
<element name="update" type="button" selector=".action-update"/>
1717
<element name="cancel" type="button" selector=".action-cancel"/>
1818
</section>

app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,5 +445,6 @@
445445
</block>
446446
</referenceContainer>
447447
<referenceContainer name="page.messages" remove="true"/>
448+
<referenceBlock name="authentication-popup" remove="true"/>
448449
</body>
449450
</page>

app/code/Magento/GiftMessage/Test/Mftf/Section/StorefrontCheckoutCartGiftMessageSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
99
<section name="StorefrontCheckoutCartGiftMessageSection">
10-
<element name="giftItemMessage" type="textarea" selector="tbody.cart:nth-of-type({{blockNumber}}) #gift-message-whole-message" parameterized="true"/>
10+
<element name="giftItemMessage" type="textarea" selector="tbody.cart:nth-of-type({{blockNumber}}) .gift-message .field.text .input-text" parameterized="true"/>
1111
</section>
12-
</sections>
12+
</sections>

app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,13 @@
3333
</div>
3434
</div>
3535
<div class="field text">
36-
<label for="gift-message-whole-message" class="label">
36+
<label data-bind="attr: {for: 'gift-message-whole-message-' + index }" class="label">
3737
<span data-bind="i18n: 'Message:'"></span>
3838
</label>
3939
<div class="control">
40-
<textarea id="gift-message-whole-message"
41-
class="input-text"
40+
<textarea class="input-text"
4241
rows="5" cols="10"
43-
data-bind="value: getObservable('message')"></textarea>
42+
data-bind="value: getObservable('message'), attr: { id: 'gift-message-whole-message-' + index }"></textarea>
4443
</div>
4544
</div>
4645
</fieldset>

app/code/Magento/Ui/view/base/web/js/form/element/abstract.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ define([
131131
uid: uid,
132132
noticeId: 'notice-' + uid,
133133
errorId: 'error-' + uid,
134+
tooltipId: 'tooltip-' + uid,
134135
inputName: utils.serializeName(name.join('.')),
135136
valueUpdate: valueUpdate
136137
});

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
hasFocus: focused,
99
datepicker: { storage: value, options: options },
1010
attr: {
11+
id: uid,
1112
value: value,
1213
name: inputName,
1314
placeholder: placeholder,

app/code/Magento/Ui/view/frontend/web/templates/form/element/helper/tooltip.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@
1313
data-bind="attr: {href: tooltip.link}, mageInit: {'dropdown':{'activeClass': '_active'}}"></a>
1414
<!-- /ko -->
1515

16-
<span id="tooltip-label" class="label"><!-- ko i18n: 'Tooltip' --><!-- /ko --></span>
16+
<span class="label" data-bind="attr: { id: $data.tooltipId ? $data.tooltipId : 'tooltip-label' }"><!-- ko i18n: 'Tooltip' --><!-- /ko --></span>
1717
<!-- ko if: (!tooltip.link)-->
1818
<span
19-
id="tooltip"
2019
class="field-tooltip-action action-help"
2120
tabindex="0"
2221
data-toggle="dropdown"
23-
data-bind="mageInit: {'dropdown':{'activeClass': '_active', 'parent': '.field-tooltip.toggle'}}"
24-
aria-labelledby="tooltip-label"
22+
data-bind="
23+
mageInit: {'dropdown':{'activeClass': '_active', 'parent': '.field-tooltip.toggle'}},
24+
attr: { 'aria-labelledby': $data.tooltipId ? $data.tooltipId : 'tooltip-label' }
25+
"
2526
>
2627
</span>
2728
<!-- /ko -->

0 commit comments

Comments
 (0)