Skip to content

Commit d265ada

Browse files
committed
refactor(datepicker): use common overlay keyboard handling
Switches the datepicker to use the `OverlayKeyboardDispatcher`, rather than managing the keyboard logic itself. This simplifies things and handles the cases where the popup won't close if it lost focus.
1 parent a626c8f commit d265ada

File tree

2 files changed

+9
-32
lines changed

2 files changed

+9
-32
lines changed

src/lib/datepicker/datepicker.spec.ts

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
import {ENTER, ESCAPE, RIGHT_ARROW} from '@angular/cdk/keycodes';
22
import {OverlayContainer} from '@angular/cdk/overlay';
3-
import {
4-
createKeyboardEvent,
5-
dispatchEvent,
6-
dispatchFakeEvent,
7-
dispatchKeyboardEvent,
8-
dispatchMouseEvent,
9-
} from '@angular/cdk/testing';
3+
import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
104
import {Component, ViewChild} from '@angular/core';
115
import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
126
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
@@ -170,21 +164,12 @@ describe('MatDatepicker', () => {
170164
testComponent.datepicker.open();
171165
fixture.detectChanges();
172166

173-
let content = document.querySelector('.cdk-overlay-pane mat-datepicker-content')!;
174-
expect(content).toBeTruthy('Expected datepicker to be open.');
175-
176-
const keyboardEvent = createKeyboardEvent('keydown', ESCAPE);
177-
const stopPropagationSpy = spyOn(keyboardEvent, 'stopPropagation').and.callThrough();
167+
expect(testComponent.datepicker.opened).toBe(true, 'Expected datepicker to be open.');
178168

179-
dispatchEvent(content, keyboardEvent);
169+
dispatchKeyboardEvent(document.body, 'keydown', ESCAPE);
180170
fixture.detectChanges();
181171

182-
content = document.querySelector('.cdk-overlay-pane mat-datepicker-content')!;
183-
184-
expect(content).toBeFalsy('Expected datepicker to be closed.');
185-
expect(stopPropagationSpy).toHaveBeenCalled();
186-
expect(keyboardEvent.defaultPrevented)
187-
.toBe(true, 'Expected default ESCAPE action to be prevented.');
172+
expect(testComponent.datepicker.opened).toBe(false, 'Expected datepicker to be closed.');
188173
});
189174

190175
it('close should close dialog', async(() => {

src/lib/datepicker/datepicker.ts

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
} from '@angular/cdk/overlay';
2020
import {ComponentPortal} from '@angular/cdk/portal';
2121
import {take} from 'rxjs/operators/take';
22+
import {filter} from 'rxjs/operators/filter';
2223
import {
2324
AfterContentInit,
2425
ChangeDetectionStrategy,
@@ -82,7 +83,6 @@ export const MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER = {
8283
host: {
8384
'class': 'mat-datepicker-content',
8485
'[class.mat-datepicker-content-touch]': 'datepicker.touchUi',
85-
'(keydown)': '_handleKeydown($event)',
8686
},
8787
exportAs: 'matDatepickerContent',
8888
encapsulation: ViewEncapsulation.None,
@@ -97,18 +97,6 @@ export class MatDatepickerContent<D> implements AfterContentInit {
9797
ngAfterContentInit() {
9898
this._calendar._focusActiveCell();
9999
}
100-
101-
/**
102-
* Handles keydown event on datepicker content.
103-
* @param event The event.
104-
*/
105-
_handleKeydown(event: KeyboardEvent): void {
106-
if (event.keyCode === ESCAPE) {
107-
this.datepicker.close();
108-
event.preventDefault();
109-
event.stopPropagation();
110-
}
111-
}
112100
}
113101

114102

@@ -368,6 +356,10 @@ export class MatDatepicker<D> implements OnDestroy {
368356
});
369357

370358
this._popupRef = this._overlay.create(overlayConfig);
359+
360+
this._popupRef._keydownEvents
361+
.pipe(filter(event => event.keyCode === ESCAPE))
362+
.subscribe(() => this.close());
371363
}
372364

373365
/** Create the popup PositionStrategy. */

0 commit comments

Comments
 (0)