Skip to content

Commit 7d547ec

Browse files
ivoplashkovilhan007
authored andcommitted
fix(ui5-input): correct acc info implementation (#846)
The accInfo method used to return undefined for соме aria attributes. Now the method works as expected.
1 parent e1de47c commit 7d547ec

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

packages/main/src/Input.hbs

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
<span id="{{_id}}-suggestionsText" class="ui5-hidden-text">{{suggestionsText}}</span>
4040
{{/if}}
4141

42-
{{#if accInfo.input.ariaDescribedBy}}
43-
<span id="{{accInfo.input.ariaDescribedBy}}" class="ui5-hidden-text">{{accInfo.input.ariaDescription}}</span>
42+
{{#if accInfo.input.ariaDescription}}
43+
<span id="{{_id}}-descr" class="ui5-hidden-text">{{accInfo.input.ariaDescription}}</span>
4444
{{/if}}
4545

4646
{{#if hasValueState}}
47-
<span id="{{_id}}-descr" class="ui5-hidden-text">{{valueStateText}}</span>
47+
<span id="{{_id}}-valueStateDesc" class="ui5-hidden-text">{{valueStateText}}</span>
4848
{{/if}}
4949
</div>
5050

packages/main/src/Input.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ class Input extends UI5Element {
586586
}
587587

588588
get valueStateTextId() {
589-
return this.hasValueState ? `${this._id}-descr` : "";
589+
return this.hasValueState ? `${this._id}-valueStateDesc` : "";
590590
}
591591

592592
get accInfo() {
@@ -596,10 +596,10 @@ class Input extends UI5Element {
596596
"wrapper": {
597597
},
598598
"input": {
599-
"ariaDescribedBy": this._inputAccInfo ? `${this.suggestionsTextId} ${this.valueStateTextId} ${this._inputAccInfo.ariaDescribedBy}`.trim() : `${this.suggestionsTextId} ${this.valueStateTextId}`.trim(),
599+
"ariaDescribedBy": this._inputAccInfo.ariaDescribedBy ? `${this.suggestionsTextId} ${this.valueStateTextId} ${this._inputAccInfo.ariaDescribedBy}`.trim() : `${this.suggestionsTextId} ${this.valueStateTextId}`.trim(),
600600
"ariaInvalid": this.valueState === ValueState.Error ? "true" : undefined,
601-
"ariaHasPopup": this._inputAccInfo ? this._inputAccInfo.ariaHasPopup : ariaHasPopupDefault,
602-
"ariaAutoComplete": this._inputAccInfo ? this._inputAccInfo.ariaAutoComplete : ariaAutoCompleteDefault,
601+
"ariaHasPopup": this._inputAccInfo.ariaHasPopup ? this._inputAccInfo.ariaHasPopup : ariaHasPopupDefault,
602+
"ariaAutoComplete": this._inputAccInfo.ariaAutoComplete ? this._inputAccInfo.ariaAutoComplete : ariaAutoCompleteDefault,
603603
"role": this._inputAccInfo && this._inputAccInfo.role,
604604
"ariaOwns": this._inputAccInfo && this._inputAccInfo.ariaOwns,
605605
"ariaExpanded": this._inputAccInfo && this._inputAccInfo.ariaExpanded,

0 commit comments

Comments
 (0)