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.

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(list-key-manager): increase typeahead range to include more characters #6543

Merged
merged 1 commit into from
Aug 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/cdk/a11y/list-key-manager.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,26 @@ describe('Key managers', () => {
expect(keyManager.activeItem).toBe(itemList.items[1]);
}));

it('should handle non-letter characters', fakeAsync(() => {
itemList.items = [
new FakeFocusable('[]'),
new FakeFocusable('321'),
new FakeFocusable('`!?')
];

keyManager.onKeydown(createKeyboardEvent('keydown', 192, undefined, '`')); // types "`"
tick(debounceInterval);
expect(keyManager.activeItem).toBe(itemList.items[2]);

keyManager.onKeydown(createKeyboardEvent('keydown', 51, undefined, '3')); // types "3"
tick(debounceInterval);
expect(keyManager.activeItem).toBe(itemList.items[1]);

keyManager.onKeydown(createKeyboardEvent('keydown', 219, undefined, '[')); // types "["
tick(debounceInterval);
expect(keyManager.activeItem).toBe(itemList.items[0]);
}));

});

});
Expand Down
22 changes: 12 additions & 10 deletions src/cdk/a11y/list-key-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import {QueryList} from '@angular/core';
import {Subject} from 'rxjs/Subject';
import {Subscription} from 'rxjs/Subscription';
import {UP_ARROW, DOWN_ARROW, TAB, A, Z} from '@angular/cdk/keycodes';
import {UP_ARROW, DOWN_ARROW, TAB, A, Z, ZERO, NINE} from '@angular/cdk/keycodes';
import {RxChain, debounceTime, filter, map, doOperator} from '@angular/cdk/rxjs';

/**
Expand Down Expand Up @@ -107,17 +107,19 @@ export class ListKeyManager<T extends ListKeyManagerOption> {
case UP_ARROW: this.setPreviousItemActive(); break;
case TAB: this.tabOut.next(); return;
default:
if (event.keyCode >= A && event.keyCode <= Z) {
// Attempt to use the `event.key` which also maps it to the user's keyboard language,
// otherwise fall back to `keyCode` and `fromCharCode` which always resolve to English.
this._letterKeyStream.next(event.key ?
event.key.toLocaleUpperCase() :
String.fromCharCode(event.keyCode));
const keyCode = event.keyCode;

// Attempt to use the `event.key` which also maps it to the user's keyboard language,
// otherwise fall back to resolving alphanumeric characters via the keyCode.
if (event.key && event.key.length === 1) {
this._letterKeyStream.next(event.key.toLocaleUpperCase());
} else if ((keyCode >= A && keyCode <= Z) || (keyCode >= ZERO && keyCode <= NINE)) {
this._letterKeyStream.next(String.fromCharCode(keyCode));
}

// Note that we return here, in order to avoid preventing
// the default action of non-navigational keys.
return;
// Note that we return here, in order to avoid preventing
// the default action of non-navigational keys.
return;
}

this._pressedLetters = [];
Expand Down
2 changes: 2 additions & 0 deletions src/cdk/keycodes/keycodes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ export const BACKSPACE = 8;
export const DELETE = 46;
export const A = 65;
export const Z = 90;
export const ZERO = 48;
export const NINE = 91;