Skip to content

Commit ef2886b

Browse files
authored
feat(ui5-dialog): improve accessibility (#1288)
1 parent 0746012 commit ef2886b

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

packages/main/src/Dialog.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<span class="ui5-popup-frame" @focusin="{{_onfocusin}}">
44
<span id="{{_id}}-firstfe" tabindex="0"></span>
55
<div style="{{zindex}}" class="ui5-dialog-root-parent {{classes.dialogParent}}">
6-
<div tabindex="-1" aria-labelledby="{{headerId}}" role="dialog" aria-modal="true" class="ui5-popup-root ui5-dialog-root {{classes.dialogParent}}">
6+
<div tabindex="-1" aria-labelledby="{{headerAriaLabelledBy}}" role="dialog" aria-modal="true" class="ui5-popup-root ui5-dialog-root {{classes.dialogParent}}">
77
{{> header}}
88
<section class="ui5-dialog-section">
99
<div class="ui5-popup-content">

packages/main/src/Dialog.js

+7
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,13 @@ class Dialog extends Popup {
140140
get blockLayer() {
141141
return `z-index: ${this._zIndex};`;
142142
}
143+
144+
get headerAriaLabelledBy() {
145+
if (this.headerText || this.header) {
146+
return `${this._id}-popup-heading`;
147+
}
148+
return undefined;
149+
}
143150
}
144151

145152
Dialog.define();

packages/main/src/Popup.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
{{#if hasHeader}}
33
<header>
44
{{#if header.length}}
5-
<div role="{{role}}" class="ui5-popup-header">
5+
<div id="{{_id}}-popup-heading" role="{{role}}" class="ui5-popup-header">
66
<slot name="header"></slot>
77
</div>
88
{{else}}
9-
<h2 role="{{role}}" class="ui5-popup-header ui5-popup-headerText">{{headerText}}</h2>
9+
<h2 id="{{_id}}-popup-heading" role="{{role}}" class="ui5-popup-header ui5-popup-headerText">{{headerText}}</h2>
1010
{{/if}}
1111
</header>
1212
{{/if}}

0 commit comments

Comments
 (0)