Skip to content

Commit bb624ae

Browse files
authored
fix: Fix aria-disabled usage (#2056)
1 parent efe03bc commit bb624ae

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

packages/main/src/ProgressIndicator.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
aria-valuenow="{{validatedValue}}"
66
aria-valuemax="100"
77
aria-valuetext="{{valueStateText}}"
8-
?aria-disabled="{{disabled}}"
8+
aria-disabled="{{_ariaDisabled}}"
99
>
1010
<div class="ui5-progress-indicator-bar" style="{{styles.bar}}">
1111
{{#unless showValueInRemainingBar}}

packages/main/src/ProgressIndicator.js

+4
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,10 @@ class ProgressIndicator extends UI5Element {
213213
return this.valueStateIconMappings()[this.valueState];
214214
}
215215

216+
get _ariaDisabled() {
217+
return this.disabled || undefined;
218+
}
219+
216220
static async onDefine() {
217221
await fetchI18nBundle("@ui5/webcomponents");
218222
}

packages/main/src/RatingIndicator.hbs

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
role="slider"
33
aria-roledescription="{{_ariaRoleDescription}}"
44
aria-valuemin="0"
5-
aria-valuenow="{{this.value}}"
6-
aria-valuemax="{{this.maxValue}}"
5+
aria-valuenow="{{value}}"
6+
aria-valuemax="{{maxValue}}"
77
aria-orientation="horizontal"
8-
?aria-disabled="{{this.disabled}}"
9-
?aria-readonly="{{this.readOnly}}"
8+
aria-disabled="{{_ariaDisabled}}"
9+
?aria-readonly="{{readOnly}}"
1010
tabindex="{{tabIndex}}"
1111
@focusin="{{_onfocusin}}"
1212
@focusout="{{_onfocusout}}"

packages/main/src/RatingIndicator.js

+4
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,10 @@ class RatingIndicator extends UI5Element {
290290
get _ariaRoleDescription() {
291291
return this.i18nBundle.getText(RATING_INDICATOR_TEXT);
292292
}
293+
294+
get _ariaDisabled() {
295+
return this.disabled || undefined;
296+
}
293297
}
294298

295299
RatingIndicator.define();

packages/main/src/TabInStrip.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
aria-setsize="{{this._setsize}}"
77
aria-controls="ui5-tc-contentItem-{{this._posinset}}"
88
aria-selected="{{this.effectiveSelected}}"
9-
?aria-disabled="{{this.effectiveDisabled}}"
9+
aria-disabled="{{this.effectiveDisabled}}"
1010
?disabled="{{this.effectiveDisabled}}"
1111
aria-labelledby="{{this.ariaLabelledBy}}"
1212
data-ui5-stable="{{this.stableDomRef}}"

0 commit comments

Comments
 (0)