From 9c63f70039c4a88ec9a0cf98c1fa880dcacf0303 Mon Sep 17 00:00:00 2001 From: Kristiyan Kostadinov Date: Tue, 23 Jan 2018 16:45:30 +0100 Subject: [PATCH] refactor(focus-monitor): make checkChildren parameter optional (#9384) After we made the `renderer` param optional, `checkChildren` became required when using the two-param signature. These changes make it optional which is slightly more convenient on consumption. --- src/cdk/a11y/focus-monitor.spec.ts | 2 +- src/cdk/a11y/focus-monitor.ts | 4 ++-- src/lib/checkbox/checkbox.ts | 2 +- src/lib/expansion/expansion-panel-header.ts | 2 +- src/lib/radio/radio.ts | 2 +- src/lib/slide-toggle/slide-toggle.ts | 2 +- src/lib/tooltip/tooltip.ts | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cdk/a11y/focus-monitor.spec.ts b/src/cdk/a11y/focus-monitor.spec.ts index 1b53d56be5d3..ecc40ad2af33 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 ae8cc1f8eb3c..67e51f85def0 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 b439f4abc270..5588c7a62e79 100644 --- a/src/lib/checkbox/checkbox.ts +++ b/src/lib/checkbox/checkbox.ts @@ -216,7 +216,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 b68cf5348839..592434d3b21f 100644 --- a/src/lib/expansion/expansion-panel-header.ts +++ b/src/lib/expansion/expansion-panel-header.ts @@ -82,7 +82,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 8c3ff6cc629a..a874f7e523c1 100644 --- a/src/lib/radio/radio.ts +++ b/src/lib/radio/radio.ts @@ -540,7 +540,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 ac4655238372..405271a433bb 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 e56bf8263f91..e488fbcf0178 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));