fix(module:nz-alert): emit close after fade animation is done

Fixes NG-ZORRO#1666
dmytroyarmak · Jun 15, 2018 · 263f012 · 263f012
1 parent fc67ce5
commit 263f012
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/components/alert/nz-alert.component.html b/components/alert/nz-alert.component.html
@@ -1,4 +1,4 @@
-<div [ngClass]="outerClassMap" *ngIf="display" [@fadeAnimation]>
+<div [ngClass]="outerClassMap" *ngIf="display" [@fadeAnimation] (@fadeAnimation.done)="onFadeAnimationDone()">
   <ng-container *ngIf="nzShowIcon">
     <i class="ant-alert-icon" [ngClass]="nzIconType" *ngIf="nzIconType; else iconTemplate"></i>
     <ng-template #iconTemplate>

diff --git a/components/alert/nz-alert.component.ts b/components/alert/nz-alert.component.ts
@@ -126,7 +126,12 @@ export class NzAlertComponent implements OnInit {
 
   closeAlert(): void {
     this.display = false;
-    this.nzOnClose.emit(true);
+  }
+
+  onFadeAnimationDone(): void {
+    if (!this.display) {
+      this.nzOnClose.emit(true);
+    }
   }
 
   updateOuterClassMap(): void {