Merge branch 'sivanova/fix-toast-margin' of github.com:IgniteUI/igniteui-angular into sivanova/fix-toast-margin

Author: simeonoff

projects/igniteui-angular/src/lib/toast/toast.component.spec.ts

@@ -1,4 +1,4 @@
-import {Component, ViewChild, ElementRef} from '@angular/core';
+import {Component, ViewChild } from '@angular/core';
 import {async, TestBed, fakeAsync, tick, ComponentFixture} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
@@ -84,13 +84,13 @@ describe('IgxToast', () => {
         toast.show();
 
         expect(toast.isVisible).toBeTruthy();
-        expect(toast._animationState).toBe('visible');
+        expect(toast.animationState).toBe('visible');
         expect(toast.autoHide).toBeTruthy();
 
         tick(1000);
 
         expect(toast.isVisible).toBeFalsy();
-        expect(toast._animationState).toBe('invisible');
+        expect(toast.animationState).toBe('invisible');
     }));
 
     it('should not auto hide after it\'s open', fakeAsync(() => {
@@ -100,13 +100,13 @@ describe('IgxToast', () => {
         toast.show();
 
         expect(toast.isVisible).toBeTruthy();
-        expect(toast._animationState).toBe('visible');
+        expect(toast.animationState).toBe('visible');
         expect(toast.autoHide).toBeFalsy();
 
         tick(1000);
 
         expect(toast.isVisible).toBeTruthy();
-        expect(toast._animationState).toBe('visible');
+        expect(toast.animationState).toBe('visible');
     }));
 
     it('visibility is updated by the toggle() method', () => {
@@ -117,7 +117,7 @@ describe('IgxToast', () => {
 
         toast.show();
         expect(toast.isVisible).toBe(true);
-        expect(toast._animationState).toBe('visible');
+        expect(toast.animationState).toBe('visible');
 
         expect(toast.onShowing.emit).toHaveBeenCalledTimes(1);
         expect(toast.onShown.emit).toHaveBeenCalledTimes(1);
@@ -126,12 +126,13 @@ describe('IgxToast', () => {
 
         toast.toggle();
         expect(toast.isVisible).toBe(false);
-        expect(toast._animationState).toBe('invisible');
+        expect(toast.animationState).toBe('invisible');
 
         expect(toast.onShowing.emit).toHaveBeenCalledTimes(1);
         expect(toast.onShown.emit).toHaveBeenCalledTimes(1);
         expect(toast.onHiding.emit).toHaveBeenCalledTimes(1);
         expect(toast.onHidden.emit).toHaveBeenCalledTimes(1);
+
     });
 });
 

projects/igniteui-angular/src/lib/toast/toast.component.ts

@@ -51,10 +51,14 @@ let NEXT_ID = 0;
     `]
 })
 export class IgxToastComponent implements IToggleView, OnInit, OnDestroy {
-    @HostBinding('@animate')
-    private _animationState = 'invisible';
     private _isVisible = false;
 
+    /**
+     * @hidden
+     */
+    @HostBinding('@animate')
+    public animationState = 'invisible';
+
     /**
      * Sets/gets the `id` of the toast.
      * If not set, the `id` will have value `"igx-toast-0"`.
@@ -230,7 +234,7 @@ export class IgxToastComponent implements IToggleView, OnInit, OnDestroy {
     /**
      * @hidden
      */
-    private timeoutId;
+    private timeoutId: number;
 
     constructor(
         private elementRef: ElementRef,
@@ -248,10 +252,10 @@ export class IgxToastComponent implements IToggleView, OnInit, OnDestroy {
         clearInterval(this.timeoutId);
         this.onShowing.emit(this);
         this.isVisible = true;
-        this._animationState = 'visible';
+        this.animationState = 'visible';
 
         if (this.autoHide) {
-            this.timeoutId = setTimeout(() => {
+            this.timeoutId = window.setTimeout(() => {
                 this.hide();
             }, this.displayTime);
         }
@@ -270,7 +274,7 @@ export class IgxToastComponent implements IToggleView, OnInit, OnDestroy {
         this.onHiding.emit(this);
         this.isVisible = false;
         this.onHidden.emit(this);
-        this._animationState = 'invisible';
+        this.animationState = 'invisible';
 
         clearInterval(this.timeoutId);
     }