Skip to content

fix(ui5-button): move button type text from aria-label to aria-description #12474

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

Merged
merged 4 commits into from
Oct 20, 2025
Merged

fix(ui5-button): move button type text from aria-label to aria-description #12474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
105ba12
fix(ui5-button): move button type text from aria-label to aria-descri…
unazko Oct 13, 2025
d90ed80
fix: resolve lint error
unazko Oct 13, 2025
a5e6653
fix: resolve merge conflicts
unazko Oct 14, 2025
4a9def0
fix: adjust tests
unazko Oct 20, 2025
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
16 changes: 11 additions & 5 deletions packages/main/cypress/specs/Button.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,19 +345,22 @@ describe("Accessibility", () => {
.as("button");

cy.get("@button")
.should("have.attr", "aria-label", "Action Emphasized");
.should("have.attr", "aria-label", "Action");

cy.get("@button")
.should("have.attr", "aria-description", "Emphasized");
});

it("aria-label uses accessibleName when both text and accessibleName are provided", () => {
cy.mount(<Button design="Emphasized" accessibleName="Custom Action Label">Button Text</Button>);
cy.mount(<Button accessibleName="Custom Action Label">Button Text</Button>);

cy.get("[ui5-button]")
.shadow()
.find("button")
.as("button");

cy.get("@button")
.should("have.attr", "aria-label", "Custom Action Label Emphasized");
.should("have.attr", "aria-label", "Custom Action Label");
});

it("aria-expanded is properly applied on the button tag", () => {
Expand Down Expand Up @@ -424,7 +427,7 @@ describe("Accessibility", () => {
.as("button");

cy.get("@button")
.should("have.attr", "aria-description", "Decline");
.should("have.attr", "aria-description", "Decline Negative Action");
});


Expand Down Expand Up @@ -455,7 +458,10 @@ describe("Accessibility", () => {
.as("button");

cy.get("@button")
.should("have.attr", "aria-label", `Download ${BUTTON_ARIA_TYPE_EMPHASIZED.defaultText} 1 item`);
.should("have.attr", "aria-label", `Download 1 item`);

cy.get("@button")
.should("have.attr", "aria-description", BUTTON_ARIA_TYPE_EMPHASIZED.defaultText);
});

it("setting accessible-name-ref on the host is reflected on the button tag", () => {
Expand Down
9 changes: 6 additions & 3 deletions packages/main/src/Button.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,17 +628,20 @@ class Button extends UI5Element implements IButton {
get ariaLabelText() {
const effectiveAriaLabelText = getEffectiveAriaLabelText(this) || "";
const textContent = this.textContent || "";
const typeLabelText = this.hasButtonType ? this.buttonTypeText : "";
const internalLabelText = this.effectiveBadgeDescriptionText || "";

// Use either the effective aria label text (if accessibleName is provided) or the button's text content
const mainLabelText = effectiveAriaLabelText || textContent;
const labelParts = [mainLabelText, typeLabelText, internalLabelText].filter(part => part);
const labelParts = [mainLabelText, internalLabelText].filter(part => part);
return labelParts.join(" ");
}

get ariaDescriptionText() {
return this.accessibleDescription === "" ? undefined : this.accessibleDescription;
const accessibleDescription = this.accessibleDescription === "" ? undefined : this.accessibleDescription;
const typeLabelText = this.hasButtonType ? this.buttonTypeText : "";

const descriptionParts = [accessibleDescription, typeLabelText].filter(part => part);
return descriptionParts.length > 0 ? descriptionParts.join(" ") : undefined;
}

get _computedAccessibilityAttributes(): ButtonAccessibilityAttributes {
Expand Down
Loading