diff --git a/src/cdk/a11y/focus-monitor.spec.ts b/src/cdk/a11y/focus-monitor.spec.ts index 1b53d56be5d..ecc40ad2af3 100644 --- a/src/cdk/a11y/focus-monitor.spec.ts +++ b/src/cdk/a11y/focus-monitor.spec.ts @@ -30,7 +30,7 @@ describe('FocusMonitor', () => { focusMonitor = fm; changeHandler = jasmine.createSpy('focus origin change handler'); - focusMonitor.monitor(buttonElement, false).subscribe(changeHandler); + focusMonitor.monitor(buttonElement).subscribe(changeHandler); patchElementFocus(buttonElement); })); diff --git a/src/cdk/a11y/focus-monitor.ts b/src/cdk/a11y/focus-monitor.ts index ae8cc1f8eb3..67e51f85def 100644 --- a/src/cdk/a11y/focus-monitor.ts +++ b/src/cdk/a11y/focus-monitor.ts @@ -82,10 +82,10 @@ export class FocusMonitor { * @returns An observable that emits when the focus state of the element changes. * When the element is blurred, null will be emitted. */ - monitor(element: HTMLElement, checkChildren: boolean): Observable; + monitor(element: HTMLElement, checkChildren?: boolean): Observable; monitor( element: HTMLElement, - renderer: Renderer2 | boolean, + renderer?: Renderer2 | boolean, checkChildren?: boolean): Observable { // TODO(mmalerba): clean up after deprecated signature is removed. if (!(renderer instanceof Renderer2)) { diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts index 8c14a1ee638..d533a4890c7 100644 --- a/src/lib/checkbox/checkbox.ts +++ b/src/lib/checkbox/checkbox.ts @@ -215,7 +215,7 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc ngAfterViewInit() { this._focusMonitor - .monitor(this._inputElement.nativeElement, false) + .monitor(this._inputElement.nativeElement) .subscribe(focusOrigin => this._onInputFocusChange(focusOrigin)); } diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts index ffd5306dfeb..f3d3bb10e1b 100644 --- a/src/lib/expansion/expansion-panel-header.ts +++ b/src/lib/expansion/expansion-panel-header.ts @@ -80,7 +80,7 @@ export class MatExpansionPanelHeader implements OnDestroy { ) .subscribe(() => this._changeDetectorRef.markForCheck()); - _focusMonitor.monitor(_element.nativeElement, false); + _focusMonitor.monitor(_element.nativeElement); } /** Height of the header while the panel is expanded. */ diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts index f20bd0738e8..b13b2cb03c9 100644 --- a/src/lib/radio/radio.ts +++ b/src/lib/radio/radio.ts @@ -533,7 +533,7 @@ export class MatRadioButton extends _MatRadioButtonMixinBase ngAfterViewInit() { this._focusMonitor - .monitor(this._inputElement.nativeElement, false) + .monitor(this._inputElement.nativeElement) .subscribe(focusOrigin => this._onInputFocusChange(focusOrigin)); } diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts index 3c80540b121..b1ed6c7ede0 100644 --- a/src/lib/slide-toggle/slide-toggle.ts +++ b/src/lib/slide-toggle/slide-toggle.ts @@ -159,7 +159,7 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro this._slideRenderer = new SlideToggleRenderer(this._elementRef, this._platform); this._focusMonitor - .monitor(this._inputElement.nativeElement, false) + .monitor(this._inputElement.nativeElement) .subscribe(focusOrigin => this._onInputFocusChange(focusOrigin)); } diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts index e56bf8263f9..e488fbcf017 100644 --- a/src/lib/tooltip/tooltip.ts +++ b/src/lib/tooltip/tooltip.ts @@ -217,7 +217,7 @@ export class MatTooltip implements OnDestroy { element.style.webkitUserSelect = element.style.userSelect = ''; } - _focusMonitor.monitor(element, false).subscribe(origin => { + _focusMonitor.monitor(element).subscribe(origin => { // Note that the focus monitor runs outside the Angular zone. if (!origin) { _ngZone.run(() => this.hide(0));