Skip to content

FORMS-21002: Programmatic label does not convey purpose of control @sunnym @vavarshn #1745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+7 −6
Open

FORMS-21002: Programmatic label does not convey purpose of control @sunnym @vavarshn #1745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...t/jcr_root/apps/core/fd/components/form/review/v1/review/clientlibs/site/js/reviewview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,6 @@
if(value){
value.setAttribute('aria-labelledby', id);
}
if(editButton && editButton.getAttribute(Review.DATA_ATTRIBUTE_VISIBLE) === 'true'){
editButton.setAttribute('aria-describedby', id);
}
}

static isRepeatable(item) {
Expand Down Expand Up @@ -308,7 +305,11 @@
const editButton = cloneNode.querySelector(Review.selectors.editButton);
if (editButton) {
editButton.setAttribute(Review.selectors.fieldId, item.id);
editButton.setAttribute('aria-label', item?.label?.value);
const currentAriaLabel = editButton.getAttribute('aria-label');
const currentItemLabel = item?.label?.value;
if (currentItemLabel && !currentAriaLabel.includes(currentItemLabel)) {
editButton.setAttribute('aria-label', currentAriaLabel + " " + currentItemLabel);
}
if (item.enabled === false) {
editButton.setAttribute('disabled', true);
}
Expand Down
2 changes: 1 addition & 1 deletion ...ontent/jcr_root/apps/core/fd/components/form/review/v1/review/template/fieldTemplate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
<div class="${bemBlock}__field">
<div class="${bemBlock}__label" data-cmp-review-label></div>
<div class="${bemBlock}__value" data-cmp-review-value></div>
<button class="${bemBlock}__edit-button" data-cmp-review-editButton type="button"></button>
<button class="${bemBlock}__edit-button" data-cmp-review-editButton type="button" aria-label="${'Edit' @ i18n, locale=request.locale}"></button>
</div>
</template>
2 changes: 1 addition & 1 deletion ...ontent/jcr_root/apps/core/fd/components/form/review/v1/review/template/panelTemplate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="${bemBlock}__panel">
<div class="${bemBlock}__label-container">
<div class="${bemBlock}__label" data-cmp-review-label></div>
<button class="${bemBlock}__edit-button" data-cmp-review-editButton type="button"></button>
<button class="${bemBlock}__edit-button" data-cmp-review-editButton type="button" aria-label="${'Edit' @ i18n, locale=request.locale}"></button>
</div>
<div class="${bemBlock}__content" data-cmp-review-content></div>
</div>
Expand Down
Loading