Skip to content

fix(ui5-slider, ui5-range-slider): adjust aria-attributes #10039

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 3 commits into from
Oct 17, 2024
Merged

fix(ui5-slider, ui5-range-slider): adjust aria-attributes #10039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a29875
fix(ui5-slider, ui5-range-slider): adjust aria-attributes
ndeshev Oct 16, 2024
fb922f6
fix(ui5-slider, ui5-range-slider): adjust aria-attributes
ndeshev Oct 16, 2024
adafa77
fix(ui5-slider, ui5-range-slider): adjust aria-attributes
ndeshev Oct 17, 2024
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
10 changes: 6 additions & 4 deletions packages/main/src/RangeSlider.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@
aria-valuemin="{{min}}"
aria-valuemax="{{max}}"
aria-valuenow="{{startValue}}"
aria-labelledby="ui5-slider-startHandleDesc"
aria-labelledby="{{_ariaLabelledByStartHandleText}}"
aria-disabled="{{_ariaDisabled}}"
.aria-describedby="{{_ariaDescribedByHandleText}}"
aria-describedby="{{_ariaDescribedByHandleText}}"
aria-keyshortcuts="F2"
>
<ui5-icon name="direction-arrows" mode="Decorative" slider-icon></ui5-icon>
</div>
Expand Down Expand Up @@ -79,9 +80,10 @@
aria-valuemin="{{min}}"
aria-valuemax="{{max}}"
aria-valuenow="{{endValue}}"
aria-labelledby="ui5-slider-endHandleDesc"
.aria-describedby="{{_ariaDescribedByHandleText}}"
aria-labelledby="{{_ariaLabelledByEndHandleText}}"
aria-describedby="{{_ariaDescribedByHandleText}}"
aria-disabled="{{_ariaDisabled}}"
aria-keyshortcuts="F2"
>
<ui5-icon name="direction-arrows" mode="Decorative" slider-icon></ui5-icon>
</div>
Expand Down
8 changes: 8 additions & 0 deletions packages/main/src/RangeSlider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,6 +1033,14 @@ class RangeSlider extends SliderBase implements IFormInputElement {
return this.shadowRoot!.querySelector<HTMLElement>(".ui5-slider-progress")!;
}

get _ariaLabelledByStartHandleText() {
return this.accessibleName ? ["ui5-slider-accName", "ui5-slider-startHandleDesc"].join(" ").trim() : "ui5-slider-startHandleDesc";
}

get _ariaLabelledByEndHandleText() {
return this.accessibleName ? ["ui5-slider-accName", "ui5-slider-endHandleDesc"].join(" ").trim() : "ui5-slider-endHandleDesc";
}

get _ariaLabelledByInputText() {
return RangeSlider.i18nBundle.getText(SLIDER_TOOLTIP_INPUT_LABEL);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/Slider.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
aria-valuemin="{{min}}"
aria-valuemax="{{max}}"
aria-valuenow="{{value}}"
aria-labelledby="{{_ariaLabelledByHandleText}} ui5-sliderDesc"
aria-labelledby="{{_ariaLabelledByHandleText}}"
aria-disabled="{{_ariaDisabled}}"
aria-keyshortcuts="F2"
aria-describedby="{{_ariaDescribedByHandleText}}"
Expand Down
4 changes: 2 additions & 2 deletions packages/main/src/SliderBase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,11 +797,11 @@ abstract class SliderBase extends UI5Element {
}

get _ariaDescribedByHandleText() {
return this.editableTooltip ? "ui5-slider-accName ui5-slider-InputDesc" : undefined;
return this.editableTooltip ? "ui5-slider-InputDesc" : undefined;
}

get _ariaLabelledByHandleText() {
return this.accessibleName ? "ui5-slider-accName" : undefined;
return this.accessibleName ? "ui5-slider-accName ui5-slider-sliderDesc" : "ui5-slider-sliderDesc";
}

get _ariaDescribedByInputText() {
Expand Down
2 changes: 1 addition & 1 deletion packages/main/test/specs/Slider.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ describe("Accessibility", async () => {
const sliderHandle = await slider.shadow$(".ui5-slider-handle");

assert.strictEqual(await sliderHandle.getAttribute("aria-labelledby"),
"ui5-slider-accName ui5-sliderDesc", "aria-labelledby is set correctly");
"ui5-slider-accName ui5-slider-sliderDesc", "aria-labelledby is set correctly");
assert.strictEqual(await sliderHandle.getAttribute("aria-valuemin"),
`${await slider.getProperty("min")}`, "aria-valuemin is set correctly");
assert.strictEqual(await sliderHandle.getAttribute("aria-valuemax"),
Expand Down