fix: do not throw on Tab if grid has tabindex (#3838) (#3839)

Co-authored-by: Serhii Kulykov <iamkulykov@gmail.com>
vaadin · May 12, 2022 · 32ffd9d · 32ffd9d
1 parent febbbf7
commit 32ffd9d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/packages/grid/src/vaadin-grid-keyboard-navigation-mixin.js b/packages/grid/src/vaadin-grid-keyboard-navigation-mixin.js
@@ -617,6 +617,11 @@ export const KeyboardNavigationMixin = (superClass) =>
     _onTabKeyDown(e) {
       const focusTarget = this._predictFocusStepTarget(e.composedPath()[0], e.shiftKey ? -1 : 1);
 
+      // Can be undefined if grid has tabindex
+      if (!focusTarget) {
+        return;
+      }
+
       // Prevent focus-trap logic from intercepting the event.
       e.stopPropagation();
 

diff --git a/packages/grid/test/keyboard-navigation.test.js b/packages/grid/test/keyboard-navigation.test.js
@@ -2183,6 +2183,16 @@ describe('empty grid', () => {
     // Expect programmatic focus on focus exit element
     expect(grid.shadowRoot.activeElement).to.equal(grid.$.focusexit);
   });
+
+  it('should not throw on Shift + Tab when grid has tabindex', () => {
+    grid.setAttribute('tabindex', '0');
+
+    grid.focus();
+
+    expect(() => {
+      shiftTab(grid);
+    }).to.not.throw(Error);
+  });
 });
 
 describe('hierarchical data', () => {