Skip to content

Commit c4a4303

Browse files
authored
refactor: move dialog role to CRUD dialog (#9806)
* refactor: move dialog role to CRUD dialog * Revert "refactor: move dialog role to CRUD dialog" This reverts commit 15880a2. * refactor: move dialog role to CRUD dialog
1 parent 0d32901 commit c4a4303

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

packages/crud/src/vaadin-crud-dialog.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,6 @@ class CrudDialog extends DialogBaseMixin(OverlayClassMixin(ThemePropertyMixin(Po
128128

129129
static get properties() {
130130
return {
131-
ariaLabel: {
132-
type: String,
133-
},
134-
135131
fullscreen: {
136132
type: Boolean,
137133
},
@@ -150,7 +146,6 @@ class CrudDialog extends DialogBaseMixin(OverlayClassMixin(ThemePropertyMixin(Po
150146
popover="manual"
151147
.owner="${this.crudElement}"
152148
.opened="${this.opened}"
153-
aria-label="${ifDefined(this.ariaLabel)}"
154149
@opened-changed="${this._onOverlayOpened}"
155150
@mousedown="${this._bringOverlayToFront}"
156151
@touchstart="${this._bringOverlayToFront}"
@@ -160,7 +155,6 @@ class CrudDialog extends DialogBaseMixin(OverlayClassMixin(ThemePropertyMixin(Po
160155
.modeless="${this.modeless}"
161156
.withBackdrop="${!this.modeless}"
162157
?fullscreen="${this.fullscreen}"
163-
role="dialog"
164158
focus-trap
165159
exportparts="backdrop, overlay, header, content, footer"
166160
>
@@ -173,6 +167,13 @@ class CrudDialog extends DialogBaseMixin(OverlayClassMixin(ThemePropertyMixin(Po
173167
`;
174168
}
175169

170+
/** @protected */
171+
firstUpdated(props) {
172+
super.firstUpdated(props);
173+
174+
this.role = 'dialog';
175+
}
176+
176177
/** @private **/
177178
__cancel() {
178179
this.dispatchEvent(new CustomEvent('cancel'));

packages/crud/src/vaadin-crud.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,14 @@ class Crud extends CrudMixin(ElementMixin(ThemableMixin(PolylitMixin(LumoInjecti
243243
? html`
244244
<vaadin-crud-dialog
245245
id="dialog"
246+
aria-label="${ifDefined(this.__dialogAriaLabel)}"
247+
theme="${ifDefined(this._theme)}"
248+
exportparts="backdrop, overlay, header, content, footer"
246249
.crudElement="${this}"
247250
.opened="${this.editorOpened}"
248251
.fullscreen="${this._fullscreen}"
249-
.ariaLabel="${this.__dialogAriaLabel}"
250252
.noCloseOnOutsideClick="${this.__isDirty}"
251253
.noCloseOnEsc="${this.__isDirty}"
252-
theme="${ifDefined(this._theme)}"
253-
exportparts="backdrop, overlay, header, content, footer"
254254
@cancel="${this.__cancel}"
255255
>
256256
<slot name="header" slot="header"></slot>

packages/crud/test/a11y.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,22 +309,22 @@ describe('a11y', () => {
309309
await nextRender();
310310
});
311311

312-
it('should set correct role attribute to the dialog overlay', async () => {
312+
it('should set correct role attribute to the dialog', async () => {
313313
newButton.click();
314314
await nextRender();
315-
expect(dialog.$.overlay.getAttribute('role')).to.equal('dialog');
315+
expect(dialog.getAttribute('role')).to.equal('dialog');
316316
});
317317

318318
it('should set correct aria-label to the new item dialog', async () => {
319319
newButton.click();
320320
await nextRender();
321-
expect(dialog.$.overlay.getAttribute('aria-label')).to.equal('New item');
321+
expect(dialog.getAttribute('aria-label')).to.equal('New item');
322322
});
323323

324324
it('should set correct aria-label to the edit item dialog', async () => {
325325
editButtons[0].click();
326326
await nextRender();
327-
expect(dialog.$.overlay.getAttribute('aria-label')).to.equal('Edit item');
327+
expect(dialog.getAttribute('aria-label')).to.equal('Edit item');
328328
});
329329
});
330330

packages/crud/test/dom/__snapshots__/crud.test.snap.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ snapshots["vaadin-crud host default"] =
261261
`;
262262
/* end snapshot vaadin-crud host default */
263263

264-
snapshots["vaadin-crud shadow default"] =
264+
snapshots["vaadin-crud shadow default"] =
265265
`<div id="container">
266266
<div id="main">
267267
<slot name="grid">
@@ -280,6 +280,7 @@ snapshots["vaadin-crud shadow default"] =
280280
<vaadin-crud-dialog
281281
exportparts="backdrop, overlay, header, content, footer"
282282
id="dialog"
283+
role="dialog"
283284
>
284285
<slot
285286
name="header"

0 commit comments

Comments
 (0)