dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Toast improvements

Browse Source
This commit is contained in:
Igor Kulikov 2020-01-24 19:14:40 +02:00
parent 8f4944fe17
commit 85748665d3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui-ngx/src/app/shared/components/toast.directive.ts
View File

@ -47,6 +47,8 @@ export class ToastDirective implements AfterViewInit, OnDestroy {
private notificationSubscription: Subscription = null; private notificationSubscription: Subscription = null;
private hideNotificationSubscription: Subscription = null; private hideNotificationSubscription: Subscription = null;
private snackBarRef: MatSnackBarRef<TbSnackBarComponent> = null;
constructor(public elementRef: ElementRef, constructor(public elementRef: ElementRef,
public viewContainerRef: ViewContainerRef, public viewContainerRef: ViewContainerRef,
private notificationService: NotificationService, private notificationService: NotificationService,
@ -55,8 +57,6 @@ export class ToastDirective implements AfterViewInit, OnDestroy {
} }
ngAfterViewInit(): void { ngAfterViewInit(): void {
const toastComponent = this;
this.notificationSubscription = this.notificationService.getNotification().subscribe( this.notificationSubscription = this.notificationService.getNotification().subscribe(
(notificationMessage) => { (notificationMessage) => {
if (notificationMessage && notificationMessage.message) { if (notificationMessage && notificationMessage.message) {
@ -70,11 +70,17 @@ export class ToastDirective implements AfterViewInit, OnDestroy {
const config: MatSnackBarConfig = { const config: MatSnackBarConfig = {
horizontalPosition: notificationMessage.horizontalPosition || 'left', horizontalPosition: notificationMessage.horizontalPosition || 'left',
verticalPosition: !isGtSm ? 'bottom' : (notificationMessage.verticalPosition || 'top'), verticalPosition: !isGtSm ? 'bottom' : (notificationMessage.verticalPosition || 'top'),
viewContainerRef: toastComponent.viewContainerRef, viewContainerRef: this.viewContainerRef,
duration: notificationMessage.duration, duration: notificationMessage.duration,
data data
}; };
this.snackBar.openFromComponent(TbSnackBarComponent, config); if (this.snackBarRef) {
this.snackBarRef.dismiss();
}
this.snackBarRef = this.snackBar.openFromComponent(TbSnackBarComponent, config);
this.snackBarRef.afterDismissed().subscribe(() => {
this.snackBarRef = null;
});
} }
} }
} }