Add support for autoHide delay per type #9

dominique-mueller · Apr 30, 2019 · ef9a302 · ef9a302
1 parent 1bff46d
commit ef9a302
Show file tree

Hide file tree

Showing 5 changed files with 731 additions and 644 deletions.
diff --git a/README.md b/README.md
@@ -324,7 +324,8 @@ behaviour: {
 
   /**
    * Defines whether each notification will hide itself automatically after a timeout passes
-   * @type {number | false}
+   * support and object with a key per type defaulting to default key.
+   * @type {number | false | [{key: string]: number | false}}
    */
   autoHide: 5000,
 
@@ -510,7 +511,7 @@ const notifierDefaultOptions: NotifierOptions = {
   },
   theme: 'material',
   behaviour: {
-    autoHide: 5000,
+  autoHide: {default: 5000, info: 3000, error: false},
     onClick: false,
     onMouseover: 'pauseAutoHide',
     showDismissButton: true,

diff --git a/src/demo/app.module.ts b/src/demo/app.module.ts
@@ -1,67 +1,67 @@
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-
-import { NotifierModule, NotifierOptions } from './../lib/index';
-
-import { AppComponent } from './app.component';
-
-/**
- * Custom angular notifier options
- */
-const customNotifierOptions: NotifierOptions = {
-	position: {
-		horizontal: {
-			position: 'left',
-			distance: 12
-		},
-		vertical: {
-			position: 'bottom',
-			distance: 12,
-			gap: 10
-		}
-	},
-	theme: 'material',
-	behaviour: {
-		autoHide: false,
-		onClick: false,
-		onMouseover: 'pauseAutoHide',
-		showDismissButton: true,
-		stacking: 4
-	},
-	animations: {
-		enabled: true,
-		show: {
-			preset: 'slide',
-			speed: 300,
-			easing: 'ease'
-		},
-		hide: {
-			preset: 'fade',
-			speed: 300,
-			easing: 'ease',
-			offset: 50
-		},
-		shift: {
-			speed: 300,
-			easing: 'ease'
-		},
-		overlap: 150
-	}
-};
-
-/**
- * App module
- */
-@NgModule( {
-	bootstrap: [
-		AppComponent
-	],
-	declarations: [
-		AppComponent
-	],
-	imports: [
-		BrowserModule,
-		NotifierModule.withConfig( customNotifierOptions )
-	]
-} )
-export class AppModule {}
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+
+import { NotifierModule, NotifierOptions } from './../lib/index';
+
+import { AppComponent } from './app.component';
+
+/**
+ * Custom angular notifier options
+ */
+const customNotifierOptions: NotifierOptions = {
+	position: {
+		horizontal: {
+			position: 'left',
+			distance: 12
+		},
+		vertical: {
+			position: 'bottom',
+			distance: 12,
+			gap: 10
+		}
+	},
+	theme: 'material',
+	behaviour: {
+		autoHide: {default: 5000, info: 2000, success: 10000, error: false},
+		onClick: false,
+		onMouseover: 'pauseAutoHide',
+		showDismissButton: true,
+		stacking: 4
+	},
+	animations: {
+		enabled: true,
+		show: {
+			preset: 'slide',
+			speed: 300,
+			easing: 'ease'
+		},
+		hide: {
+			preset: 'fade',
+			speed: 300,
+			easing: 'ease',
+			offset: 50
+		},
+		shift: {
+			speed: 300,
+			easing: 'ease'
+		},
+		overlap: 150
+	}
+};
+
+/**
+ * App module
+ */
+@NgModule( {
+	bootstrap: [
+		AppComponent
+	],
+	declarations: [
+		AppComponent
+	],
+	imports: [
+		BrowserModule,
+		NotifierModule.withConfig( customNotifierOptions )
+	]
+} )
+export class AppModule {}
diff --git a/src/lib/src/components/notifier-notification.component.spec.ts b/src/lib/src/components/notifier-notification.component.spec.ts
@@ -948,6 +948,68 @@ describe( 'Notifier Notification Component', () => {
 
 		} ) );
 
+		it( 'should extract autoHide values from key', fakeAsync( () => {
+
+			// Setup test module
+			beforeEachWithConfig( new NotifierConfig( {
+				animations: {
+					enabled: false
+				},
+				behaviour: {
+					autoHide: {[testNotification.type]: 787, default: 989}
+					onMouseover: 'pauseAutoHide'
+				}
+			} ) );
+
+			componentInstance.notification = testNotification;
+			componentFixture.detectChanges();
+			jest.spyOn(timerService, 'start');
+			componentInstance.show({type: 'info', message: 'test'});
+
+			expect( timerService.start ).toHaveBeenCalledWith(787);
+		} ) );
+
+		it( 'should extract autoHide values from default', fakeAsync( () => {
+
+			// Setup test module
+			beforeEachWithConfig( new NotifierConfig( {
+				animations: {
+					enabled: false
+				},
+				behaviour: {
+					autoHide: {default: 989}
+					onMouseover: 'pauseAutoHide'
+				}
+			} ) );
+
+			componentInstance.notification = testNotification;
+			componentFixture.detectChanges();
+			jest.spyOn(timerService, 'start');
+			componentInstance.show({type: 'info', message: 'test'});
+
+			expect( timerService.start ).toHaveBeenCalledWith(989);
+		} ) );
+
+		it( 'should extract autoHide values from fallback', fakeAsync( () => {
+
+			// Setup test module
+			beforeEachWithConfig( new NotifierConfig( {
+				animations: {
+					enabled: false
+				},
+				behaviour: {
+					autoHide: {}
+					onMouseover: 'pauseAutoHide'
+				}
+			} ) );
+
+			componentInstance.notification = testNotification;
+			componentFixture.detectChanges();
+			jest.spyOn(timerService, 'start');
+			componentInstance.show({type: 'info', message: 'test'});
+
+			expect( timerService.start ).not.toHaveBeenCalled();
+		} ) );
 	} );
 
 	/**