@vaadin/grid 22.0.4 → 22.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/grid",
-  "version": "22.0.4",
+  "version": "22.0.7",
   "publishConfig": {
     "access": "public"
   },
@@ -40,19 +40,19 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/checkbox": "^22.0.4",
-    "@vaadin/component-base": "^22.0.4",
-    "@vaadin/text-field": "^22.0.4",
-    "@vaadin/vaadin-lumo-styles": "^22.0.4",
-    "@vaadin/vaadin-material-styles": "^22.0.4",
-    "@vaadin/vaadin-themable-mixin": "^22.0.4"
+    "@vaadin/checkbox": "^22.0.7",
+    "@vaadin/component-base": "^22.0.7",
+    "@vaadin/text-field": "^22.0.7",
+    "@vaadin/vaadin-lumo-styles": "^22.0.7",
+    "@vaadin/vaadin-material-styles": "^22.0.7",
+    "@vaadin/vaadin-themable-mixin": "^22.0.7"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/polymer-legacy-adapter": "^22.0.4",
+    "@vaadin/polymer-legacy-adapter": "^22.0.7",
     "@vaadin/testing-helpers": "^0.3.2",
     "lit": "^2.0.0",
     "sinon": "^9.2.0"
   },
-  "gitHead": "55891f68d4da41e846e06dfe51dceba1665e41ce"
+  "gitHead": "947d74491296ca746b360ecb5f5a8efd55ab2866"
 }

package/src/vaadin-grid-a11y-mixin.js

@@ -94,24 +94,12 @@ export const A11yMixin = (superClass) =>
      * @protected
      */
     _a11yUpdateRowLevel(row, level) {
-      row.setAttribute('aria-level', level + 1);
-    }
-
-    /**
-     * @param {!HTMLElement} row
-     * @param {boolean} detailsOpened
-     * @protected
-     */
-    _a11yUpdateRowDetailsOpened(row, detailsOpened) {
-      const detailsCell = row.querySelector('[part~=details-cell]');
-
-      Array.from(row.children).forEach((cell) => {
-        if (detailsCell) {
-          cell.setAttribute('aria-expanded', detailsOpened);
-        } else {
-          cell.removeAttribute('aria-expanded');
-        }
-      });
+      // Set level for the expandable rows itself, and all the nested rows.
+      if (level > 0 || this.__isRowCollapsible(row) || this.__isRowExpandable(row)) {
+        row.setAttribute('aria-level', level + 1);
+      } else {
+        row.removeAttribute('aria-level');
+      }
     }
 
     /**

package/src/vaadin-grid-keyboard-navigation-mixin.js

@@ -617,6 +617,9 @@ export const KeyboardNavigationMixin = (superClass) =>
     _onTabKeyDown(e) {
       const focusTarget = this._predictFocusStepTarget(e.composedPath()[0], e.shiftKey ? -1 : 1);
 
+      // Prevent focus-trap logic from intercepting the event.
+      e.stopPropagation();
+
       if (focusTarget === this.$.table) {
         // The focus is about to exit the grid to the top.
         this.$.table.focus();

package/src/vaadin-grid-row-details-mixin.js

@@ -84,7 +84,6 @@ export const RowDetailsMixin = (superClass) =>
           if (!row.querySelector('[part~=details-cell]')) {
             this._updateRow(row, this._columnTree[this._columnTree.length - 1]);
             const isDetailsOpened = this._isDetailsOpened(row._item);
-            this._a11yUpdateRowDetailsOpened(row, isDetailsOpened);
             this._toggleDetailsCell(row, isDetailsOpened);
           }
         });

package/src/vaadin-grid.js

@@ -908,7 +908,6 @@ class Grid extends ElementMixin(
 
     this._a11yUpdateRowLevel(row, model.level);
     this._a11yUpdateRowSelected(row, model.selected);
-    this._a11yUpdateRowDetailsOpened(row, model.detailsOpened);
 
     row.toggleAttribute('expanded', model.expanded);
     row.toggleAttribute('selected', model.selected);