Add aria-modal attribute and role='dialog' for modal Window (#10447)

Fixes #10424

2 files changed, 22 insertions, 2 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/VWindow.java b/client/src/main/java/com/vaadin/client/ui/VWindow.java
index 02d3ce63cd..a07a08ef99 100644
--- a/client/src/main/java/com/vaadin/client/ui/VWindow.java
+++ b/client/src/main/java/com/vaadin/client/ui/VWindow.java
@@ -444,7 +444,7 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
                     && nativeEvent.getKeyCode() == KeyCodes.KEY_TAB
                     && nativeEvent.getShiftKey()) {
                 nativeEvent.preventDefault();
-                FocusUtil.focusOnLastFocusableElement(this.getElement());
+                FocusUtil.focusOnLastFocusableElement(getElement());
             }
             if (nativeEvent.getEventTarget().cast() == topTabStop
                     && nativeEvent.getKeyCode() == KeyCodes.KEY_BACKSPACE) {
@@ -461,7 +461,7 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
                     && nativeEvent.getKeyCode() == KeyCodes.KEY_TAB
                     && !nativeEvent.getShiftKey()) {
                 nativeEvent.preventDefault();
-                FocusUtil.focusOnFirstFocusableElement(this.getElement());
+                FocusUtil.focusOnFirstFocusableElement(getElement());
             }
             if (nativeEvent.getEventTarget().cast() == bottomTabStop
                     && nativeEvent.getKeyCode() == KeyCodes.KEY_BACKSPACE) {
@@ -706,12 +706,16 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
     public void setVaadinModality(boolean modality) {
         vaadinModality = modality;
         if (vaadinModality) {
+            getElement().setAttribute("aria-modal", "true");
+            Roles.getDialogRole().set(getElement());
             if (isAttached()) {
                 showModalityCurtain();
             }
             addTabBlockHandlers();
             deferOrdering();
         } else {
+            getElement().removeAttribute("aria-modal");
+            Roles.getDialogRole().remove(getElement());
             if (modalityCurtain != null) {
                 if (isAttached()) {
                     hideModalityCurtain();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/ModalWindowFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ModalWindowFocusTest.java
index b01a9ded14..8cbb9d6ae9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/ModalWindowFocusTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/ModalWindowFocusTest.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.tests.components.window;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -91,6 +92,21 @@ public class ModalWindowFocusTest extends MultiBrowserTest {
 
     }
 
+    @Test
+    public void verifyAriaModalAndRoleAttributes() {
+        waitForElementPresent(By.id("firstButton"));
+        WebElement button = findElement(By.id("firstButton"));
+        button.click();
+
+        waitForElementPresent(By.className("v-window"));
+        WebElement windowElement = findElement(By.className("v-window"));
+        String ariaModal = windowElement.getAttribute("aria-modal");
+        assertEquals("true", ariaModal);
+        String role = windowElement.getAttribute("role");
+        assertEquals("dialog", role);
+
+    }
+
     private void pressEscAndWait() {
         new Actions(driver).sendKeys(Keys.ESCAPE).build().perform();
         sleep(100);