-
Notifications
You must be signed in to change notification settings - Fork 6.8k
feat(popover-edit): Arrow keys move focus to neighboring cells #15762
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
/** | ||
* @license | ||
* Copyright Google LLC All Rights Reserved. | ||
* | ||
* Use of this source code is governed by an MIT-style license that can be | ||
* found in the LICENSE file at https://angular.io/license | ||
*/ | ||
|
||
import {Directionality} from '@angular/cdk/bidi'; | ||
import {LEFT_ARROW, UP_ARROW, RIGHT_ARROW, DOWN_ARROW} from '@angular/cdk/keycodes'; | ||
import {Injectable} from '@angular/core'; | ||
import {PartialObserver} from 'rxjs'; | ||
|
||
import {EDITABLE_CELL_SELECTOR, ROW_SELECTOR, TABLE_SELECTOR} from './constants'; | ||
import {closest} from './polyfill'; | ||
|
||
/** | ||
* Service responsible for moving cell focus around in response to keyboard events. | ||
* May be overridden to customize the keyboard behavior of popover edit. | ||
*/ | ||
@Injectable({providedIn: 'root'}) | ||
export class FocusDispatcher { | ||
/** Observes keydown events triggered from the table. */ | ||
readonly keyObserver: PartialObserver<KeyboardEvent>; | ||
|
||
constructor(protected readonly directionality: Directionality) { | ||
this.keyObserver = {next: (event) => this.handleKeyboardEvent(event)}; | ||
} | ||
|
||
/** | ||
* Moves focus to earlier or later cells (in dom order) by offset cells relative to | ||
* currentCell. | ||
*/ | ||
moveFocusHorizontally(currentCell: HTMLElement, offset: number): void { | ||
const cells = Array.from(closest(currentCell, TABLE_SELECTOR)!.querySelectorAll( | ||
EDITABLE_CELL_SELECTOR)) as HTMLElement[]; | ||
const currentIndex = cells.indexOf(currentCell); | ||
const newIndex = currentIndex + offset; | ||
|
||
if (cells[newIndex]) { | ||
cells[newIndex].focus(); | ||
} | ||
} | ||
|
||
/** Moves focus to up or down by row by offset cells relative to currentCell. */ | ||
moveFocusVertically(currentCell: HTMLElement, offset: number): void { | ||
const currentRow = closest(currentCell, ROW_SELECTOR)!; | ||
const rows = Array.from(closest(currentRow, TABLE_SELECTOR)!.querySelectorAll(ROW_SELECTOR)); | ||
const currentRowIndex = rows.indexOf(currentRow); | ||
const currentIndexWithinRow = | ||
Array.from(currentRow.querySelectorAll(EDITABLE_CELL_SELECTOR)).indexOf(currentCell); | ||
const newRowIndex = currentRowIndex + offset; | ||
|
||
if (rows[newRowIndex]) { | ||
const rowToFocus = | ||
Array.from(rows[newRowIndex].querySelectorAll(EDITABLE_CELL_SELECTOR)) as HTMLElement[]; | ||
|
||
if (rowToFocus[currentIndexWithinRow]) { | ||
rowToFocus[currentIndexWithinRow].focus(); | ||
} | ||
} | ||
} | ||
|
||
/** Translates arrow keydown events into focus move operations. */ | ||
protected handleKeyboardEvent(event: KeyboardEvent): void { | ||
const cell = closest(event.target, EDITABLE_CELL_SELECTOR) as HTMLElement | null; | ||
|
||
if (!cell) { | ||
return; | ||
} | ||
|
||
switch (event.keyCode) { | ||
case UP_ARROW: | ||
this.moveFocusVertically(cell, -1); | ||
break; | ||
case DOWN_ARROW: | ||
this.moveFocusVertically(cell, 1); | ||
break; | ||
case LEFT_ARROW: | ||
this.moveFocusHorizontally(cell, this.directionality.value === 'ltr' ? -1 : 1); | ||
break; | ||
case RIGHT_ARROW: | ||
this.moveFocusHorizontally(cell, this.directionality.value === 'ltr' ? 1 : -1); | ||
break; | ||
default: | ||
// If the keyboard event is not handled, return now so that we don't `preventDefault`. | ||
return; | ||
} | ||
|
||
event.preventDefault(); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.