fix(module: Toast): fix tasks can reenter the Angular zone via run (N…

…G-ZORRO#93)

* fix(module: Toast):  fix tasks can reenter the Angular zone via run

fix(module: Toast): fix tasks can be kicked off via runOutsideAngular and if needed, these tasks can reenter the Angular zone via run

* fix(module: Toast): fix zone init value of null

components/toast/toast.component.ts

@@ -1,4 +1,4 @@
-import { Component, ViewEncapsulation, Input, TemplateRef, HostBinding } from '@angular/core';
+import { Component, ViewEncapsulation, Input, TemplateRef, HostBinding, NgZone } from '@angular/core';
 
 @Component({
   selector: 'Toast',
@@ -26,14 +26,18 @@ export class ToastComponent {
     } else {
       this.isContentString = true;
     }
-    this._content = value;
+    this._zone.run(() => {
+      this._content = value;
+    });
   }
   @Input()
   get iconType(): string {
     return this._iconType;
   }
   set iconType(value: string) {
-    this._iconType = value;
+    this._zone.run(() => {
+      this._iconType = value;
+    });
   }
 
   @HostBinding('class.am-toast')
@@ -47,5 +51,5 @@ export class ToastComponent {
     return !this.mask;
   }
 
-  constructor() {}
+  constructor(private _zone: NgZone) {}
 }

components/toast/toast.service.ts

@@ -4,6 +4,7 @@ import {
   ComponentFactory,
   ApplicationRef,
   Compiler,
+  NgZone,
   ComponentFactoryResolver,
 } from '@angular/core';
 import { ToastComponent } from './toast.component';
@@ -18,11 +19,13 @@ export interface ConfigInterface {
 @Injectable()
 export class Toast {
   static timeout = null;
+  static _zone: NgZone = null;
   static compRef: ComponentRef<any> = null;
   static _toastCompFactory: ComponentFactory<ToastComponent> = null;
   static _appRef: ApplicationRef = null;
 
-  constructor(private _appRef: ApplicationRef, private _compiler: Compiler, private _cfr: ComponentFactoryResolver) {
+  constructor(private _appRef: ApplicationRef, private _compiler: Compiler, private _cfr: ComponentFactoryResolver, private _zone: NgZone) {
+    Toast._zone = this._zone;
     Toast._appRef = this._appRef;
     Toast._toastCompFactory = this._cfr.resolveComponentFactory(ToastComponent);
   }
@@ -141,7 +144,9 @@ export class Toast {
       clearTimeout(Toast.timeout);
     }
     if (Toast.compRef) {
-      Toast.compRef.destroy();
+      Toast._zone.run(() => {
+        Toast.compRef.destroy();
+      });
       Toast.compRef = null;
     }
   }