Version 3.1.4: Fix A11y metadata update upon programmatic selection

TatuLund · May 9, 2023 · 5558f5b · 5558f5b
1 parent 2f5d939
commit 5558f5b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -38,6 +38,10 @@ The integration tests are in. These mainly cover some user interaction that cann
 
 ## Release notes
 
+### 3.1.4
+
+- Fix A11y metadata update upon programmatic selection
+
 ### 3.1.3
 
 - Added an alert text for "No data" when the table is empty

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.vaadin.tatu</groupId>
 	<artifactId>beantable</artifactId>
-	<version>3.1.3</version>
+	<version>3.1.4</version>
 	<name>BeanTable</name>
 	<description>Table component for Vaadin platform</description>
 	<properties>

diff --git a/src/main/java/org/vaadin/tatu/BeanTable.java b/src/main/java/org/vaadin/tatu/BeanTable.java
@@ -520,7 +520,8 @@ private void createCells() {
                     }
                 }
                 if (selectionEnabled) {
-                    cell.setAttribute("aria-selected", "false");
+                    cell.setAttribute("aria-selected",
+                            selected.contains(item) ? "true" : "false");
                 }
                 if (!column.isVisible()) {
                     cell.getStyle().set("display", "none");
@@ -614,7 +615,7 @@ public BeanTable() {
         menuButton.setVisible(false);
         runBeforeClientResponse(ui -> {
             setNoData();
-        });        
+        });
     }
 
     private void enableKeyboardNavigation() {
@@ -1769,7 +1770,7 @@ public static BeanTableI18n getDefault() {
             english.setPreviousPage("Previous page");
             english.setMenuButton("Column selector");
             english.setErrorText("Failed fetching data");
-            english.setNoDataText("No data");            
+            english.setNoDataText("No data");
             english.setPageProvider((currentPage, lastPage) -> "Page "
                     + currentPage + " of " + lastPage);
             return english;

diff --git a/src/test/java/org/vaadin/tatu/BeanTableTest.java b/src/test/java/org/vaadin/tatu/BeanTableTest.java
@@ -797,6 +797,7 @@ public void selection() {
                 .mapToObj(i -> new DataItem("name" + i, "data" + i))
                 .collect(Collectors.toList());
         table.setItems(items);
+        table.setSelectionEnabled(true);
 
         selected = null;
         count = 0;
@@ -880,25 +881,36 @@ public void errorTable() {
 
         ui.add(table);
 
-        Assert.assertEquals("Failed fetching data",
-                table.bodyElement.getChild(0).getChild(0).getText());
+        Element alertCell = table.bodyElement.getChild(0).getChild(0);
+        Assert.assertEquals("Failed fetching data", alertCell.getText());
+        Assert.assertEquals("alert", alertCell.getAttribute("role"));
+        Assert.assertEquals("assertive", alertCell.getAttribute("aria-live"));
+        Assert.assertEquals("3", alertCell.getAttribute("colspan"));
     }
 
     private void assertSelectedThemeSet(BeanTable<DataItem> table,
             int... items) {
         for (int item : items) {
+            Element row = table.bodyElement.getChild(item);
             Assert.assertEquals("item at index " + item + " should be selected",
                     "selected",
-                    table.bodyElement.getChild(item).getAttribute("theme"));
+                    row.getAttribute("theme"));
+            for (int i=1;i<row.getChildCount();i++) {
+                Assert.assertEquals("true", row.getChild(i).getAttribute("aria-selected"));
+            }
         }
     }
 
     private void assertSelectedThemeNotSet(BeanTable<DataItem> table,
             int... items) {
         for (int item : items) {
+            Element row = table.bodyElement.getChild(item);
             Assert.assertEquals(
                     "item at index " + item + " should not be selected", null,
-                    table.bodyElement.getChild(item).getAttribute("theme"));
+                    row.getAttribute("theme"));
+            for (int i=1;i<row.getChildCount();i++) {
+                Assert.assertEquals("false", row.getChild(i).getAttribute("aria-selected"));
+            }
         }
     }
 

diff --git a/src/test/java/org/vaadin/tatu/View.java b/src/test/java/org/vaadin/tatu/View.java
@@ -86,7 +86,7 @@ public View() {
             newData.setText("Add " + nextYear);
         });
         RouterLink lazy = new RouterLink("Lazy load demo", LazyView.class);
-        
+
         table.focus();
         add(plus, minus, table, newData, lazy);
     }