Skip to content

Commit 9c63f70

Browse files
crisbetojelbourn
authored andcommitted
refactor(focus-monitor): make checkChildren parameter optional (angular#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.
1 parent 2f8bb8d commit 9c63f70

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

src/cdk/a11y/focus-monitor.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('FocusMonitor', () => {
3030
focusMonitor = fm;
3131

3232
changeHandler = jasmine.createSpy('focus origin change handler');
33-
focusMonitor.monitor(buttonElement, false).subscribe(changeHandler);
33+
focusMonitor.monitor(buttonElement).subscribe(changeHandler);
3434
patchElementFocus(buttonElement);
3535
}));
3636

src/cdk/a11y/focus-monitor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ export class FocusMonitor {
8282
* @returns An observable that emits when the focus state of the element changes.
8383
* When the element is blurred, null will be emitted.
8484
*/
85-
monitor(element: HTMLElement, checkChildren: boolean): Observable<FocusOrigin>;
85+
monitor(element: HTMLElement, checkChildren?: boolean): Observable<FocusOrigin>;
8686
monitor(
8787
element: HTMLElement,
88-
renderer: Renderer2 | boolean,
88+
renderer?: Renderer2 | boolean,
8989
checkChildren?: boolean): Observable<FocusOrigin> {
9090
// TODO(mmalerba): clean up after deprecated signature is removed.
9191
if (!(renderer instanceof Renderer2)) {

src/lib/checkbox/checkbox.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
216216

217217
ngAfterViewInit() {
218218
this._focusMonitor
219-
.monitor(this._inputElement.nativeElement, false)
219+
.monitor(this._inputElement.nativeElement)
220220
.subscribe(focusOrigin => this._onInputFocusChange(focusOrigin));
221221
}
222222

src/lib/expansion/expansion-panel-header.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export class MatExpansionPanelHeader implements OnDestroy {
8282
)
8383
.subscribe(() => this._changeDetectorRef.markForCheck());
8484

85-
_focusMonitor.monitor(_element.nativeElement, false);
85+
_focusMonitor.monitor(_element.nativeElement);
8686
}
8787

8888
/** Height of the header while the panel is expanded. */

src/lib/radio/radio.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ export class MatRadioButton extends _MatRadioButtonMixinBase
540540

541541
ngAfterViewInit() {
542542
this._focusMonitor
543-
.monitor(this._inputElement.nativeElement, false)
543+
.monitor(this._inputElement.nativeElement)
544544
.subscribe(focusOrigin => this._onInputFocusChange(focusOrigin));
545545
}
546546

src/lib/slide-toggle/slide-toggle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro
159159
this._slideRenderer = new SlideToggleRenderer(this._elementRef, this._platform);
160160

161161
this._focusMonitor
162-
.monitor(this._inputElement.nativeElement, false)
162+
.monitor(this._inputElement.nativeElement)
163163
.subscribe(focusOrigin => this._onInputFocusChange(focusOrigin));
164164
}
165165

src/lib/tooltip/tooltip.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ export class MatTooltip implements OnDestroy {
217217
element.style.webkitUserSelect = element.style.userSelect = '';
218218
}
219219

220-
_focusMonitor.monitor(element, false).subscribe(origin => {
220+
_focusMonitor.monitor(element).subscribe(origin => {
221221
// Note that the focus monitor runs outside the Angular zone.
222222
if (!origin) {
223223
_ngZone.run(() => this.hide(0));

0 commit comments

Comments
 (0)