Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: do not move focus when focused in on grid via clicking (#7323) (CP: 24.3) #7327

Merged
merged 1 commit into from
Apr 12, 2024
Merged

fix: do not move focus when focused in on grid via clicking (#7323) (CP: 24.3) #7327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions packages/grid/src/vaadin-grid-keyboard-navigation-mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,10 +814,12 @@ export const KeyboardNavigationMixin = (superClass) =>
const rootTarget = e.composedPath()[0];

if (rootTarget === this.$.table || rootTarget === this.$.focusexit) {
// The focus enters the top (bottom) of the grid, meaning that user has
// tabbed (shift-tabbed) into the grid. Move the focus to
// the first (the last) focusable.
this._predictFocusStepTarget(rootTarget, rootTarget === this.$.table ? 1 : -1).focus();
if (!this._isMousedown) {
// The focus enters the top (bottom) of the grid, meaning that user has
// tabbed (shift-tabbed) into the grid. Move the focus to
// the first (the last) focusable.
this._predictFocusStepTarget(rootTarget, rootTarget === this.$.table ? 1 : -1).focus();
}
this._setInteracting(false);
} else {
this._detectInteracting(e);
Expand Down
11 changes: 11 additions & 0 deletions packages/grid/test/keyboard-navigation.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,17 @@ describe('keyboard navigation', () => {
expect(grid.shadowRoot.activeElement).to.equal(tabbableElements[3]);
});

it('should not enter grid on table click', () => {
const tabbableElements = getTabbableElements(grid.shadowRoot);

// Click and focusin on table element
mouseDown(tabbableElements[0]);
focusin(tabbableElements[0], focusable);

// Expect no focus on header cell
expect(grid.shadowRoot.activeElement).to.be.null;
});

it('should set native focus to header on header cell click', () => {
const tabbableElements = getTabbableElements(grid.shadowRoot);
focusFirstHeaderCell();
Expand Down
Loading