fix(select): handle keyboard events from inside panel (#9361)

After the switch to using `aria-describedby` for managing the highlights in `mat-select`, all of the keyboard handling was moved to the select trigger, however this doesn't account for the cases where focus makes it inside the panel (e.g. when toggling options in `multiple` mode).
This commit is contained in:
Kristiyan Kostadinov
2018-01-23 16:50:55 +01:00
committed by Jeremy Elbourn
parent 2d592a5879
commit 69270efb7e
3 changed files with 19 additions and 5 deletions
+2 -1
View File
@@ -37,7 +37,8 @@
(@transformPanel.done)="_onPanelDone()"
[style.transformOrigin]="_transformOrigin"
[class.mat-select-panel-done-animating]="_panelDoneAnimating"
[style.font-size.px]="_triggerFontSize">
[style.font-size.px]="_triggerFontSize"
(keydown)="_handleKeydown($event)">
<div
class="mat-select-content"
+15 -4
View File
@@ -759,8 +759,6 @@ describe('MatSelect', () => {
expect(pane.style.minWidth).toBe('200px');
}));
it('should not attempt to open a select that does not have any options', fakeAsync(() => {
fixture.componentInstance.foods = [];
fixture.detectChanges();
@@ -771,8 +769,6 @@ describe('MatSelect', () => {
expect(fixture.componentInstance.select.panelOpen).toBe(false);
}));
it('should close the panel when tabbing out', fakeAsync(() => {
trigger.click();
fixture.detectChanges();
@@ -787,6 +783,21 @@ describe('MatSelect', () => {
expect(fixture.componentInstance.select.panelOpen).toBe(false);
}));
it('should close when tabbing out from inside the panel', fakeAsync(() => {
trigger.click();
fixture.detectChanges();
flush();
expect(fixture.componentInstance.select.panelOpen).toBe(true);
const panel = overlayContainerElement.querySelector('.mat-select-panel')!;
dispatchKeyboardEvent(panel, 'keydown', TAB);
fixture.detectChanges();
flush();
expect(fixture.componentInstance.select.panelOpen).toBe(false);
}));
it('should focus the first option when pressing HOME', fakeAsync(() => {
fixture.componentInstance.control.setValue('pizza-1');
fixture.detectChanges();
+2
View File
@@ -469,6 +469,8 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
_parentFormGroup, ngControl);
if (this.ngControl) {
// Note: we provide the value accessor through here, instead of
// the `providers` to avoid running into a circular import.
this.ngControl.valueAccessor = this;
}