From 716b7873be83456c2d27cbe27753a49034ab1131 Mon Sep 17 00:00:00 2001 From: Michael-James Parsons <2666285+MichaelJamesParsons@users.noreply.github.com> Date: Mon, 8 Jun 2020 11:46:30 -0700 Subject: [PATCH] refactor: assert value for RxJS v7 compatibility --- src/cdk/scrolling/scrollable.ts | 2 +- src/cdk/scrolling/virtual-for-of.ts | 2 +- src/material/snack-bar/snack-bar-container.ts | 4 ++-- src/material/tooltip/tooltip.ts | 2 +- tools/public_api_guard/material/snack-bar.d.ts | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cdk/scrolling/scrollable.ts b/src/cdk/scrolling/scrollable.ts index ba104d5a2987..c9b33029ef2b 100644 --- a/src/cdk/scrolling/scrollable.ts +++ b/src/cdk/scrolling/scrollable.ts @@ -45,7 +45,7 @@ export type ExtendedScrollToOptions = _XAxis & _YAxis & ScrollOptions; selector: '[cdk-scrollable], [cdkScrollable]' }) export class CdkScrollable implements OnInit, OnDestroy { - private _destroyed = new Subject(); + private _destroyed = new Subject(); private _elementScrolled: Observable = new Observable((observer: Observer) => this.ngZone.runOutsideAngular(() => diff --git a/src/cdk/scrolling/virtual-for-of.ts b/src/cdk/scrolling/virtual-for-of.ts index d4f80a50d6c7..1228430f953f 100644 --- a/src/cdk/scrolling/virtual-for-of.ts +++ b/src/cdk/scrolling/virtual-for-of.ts @@ -240,7 +240,7 @@ export class CdkVirtualForOf implements CollectionViewer, DoCheck, OnDestroy ngOnDestroy() { this._viewport.detach(); - this._dataSourceChanges.next(); + this._dataSourceChanges.next(undefined!); this._dataSourceChanges.complete(); this.viewChange.complete(); diff --git a/src/material/snack-bar/snack-bar-container.ts b/src/material/snack-bar/snack-bar-container.ts index 6913ba1280a7..81274fa0fc17 100644 --- a/src/material/snack-bar/snack-bar-container.ts +++ b/src/material/snack-bar/snack-bar-container.ts @@ -62,10 +62,10 @@ export class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy @ViewChild(CdkPortalOutlet, {static: true}) _portalOutlet: CdkPortalOutlet; /** Subject for notifying that the snack bar has exited from view. */ - readonly _onExit: Subject = new Subject(); + readonly _onExit: Subject = new Subject(); /** Subject for notifying that the snack bar has finished entering the view. */ - readonly _onEnter: Subject = new Subject(); + readonly _onEnter: Subject = new Subject(); /** The state of the snack bar animations. */ _animationState = 'void'; diff --git a/src/material/tooltip/tooltip.ts b/src/material/tooltip/tooltip.ts index a5409b3fbb2d..7c61aeb12f73 100644 --- a/src/material/tooltip/tooltip.ts +++ b/src/material/tooltip/tooltip.ts @@ -641,7 +641,7 @@ export class TooltipComponent implements OnDestroy { private _closeOnInteraction: boolean = false; /** Subject for notifying that the tooltip has been hidden from the view */ - private readonly _onHide: Subject = new Subject(); + private readonly _onHide: Subject = new Subject(); /** Stream that emits whether the user has a handset-sized display. */ _isHandset: Observable = this._breakpointObserver.observe(Breakpoints.Handset); diff --git a/tools/public_api_guard/material/snack-bar.d.ts b/tools/public_api_guard/material/snack-bar.d.ts index d19eeaf999e7..155cc9e038ca 100644 --- a/tools/public_api_guard/material/snack-bar.d.ts +++ b/tools/public_api_guard/material/snack-bar.d.ts @@ -35,8 +35,8 @@ export declare class MatSnackBarConfig { export declare class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy { _animationState: string; - readonly _onEnter: Subject; - readonly _onExit: Subject; + readonly _onEnter: Subject; + readonly _onExit: Subject; _portalOutlet: CdkPortalOutlet; _role: 'alert' | 'status' | null; attachDomPortal: (portal: DomPortal) => void;