feat: Add generic for payload in IndividualConfig (#980)

scttcper · Mar 3, 2023 · 815e1dd · 815e1dd
1 parent efaf809
commit 815e1dd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/src/lib/toastr/toast.component.ts b/src/lib/toastr/toast.component.ts
@@ -53,10 +53,10 @@ import { ToastrService } from './toastr.service';
   ],
   preserveWhitespaces: false
 })
-export class Toast implements OnDestroy {
+export class Toast<ConfigPayload = any> implements OnDestroy {
   message?: string | null;
   title?: string;
-  options: IndividualConfig;
+  options: IndividualConfig<ConfigPayload>;
   duplicatesCount!: number;
   originalTimeout: number;
   /** width of progress bar */

diff --git a/src/lib/toastr/toastr-config.ts b/src/lib/toastr/toastr-config.ts
@@ -11,7 +11,7 @@ export type DisableTimoutType = boolean | 'timeOut' | 'extendedTimeOut';
 /**
  * Configuration for an individual toast.
  */
-export interface IndividualConfig {
+export interface IndividualConfig<ConfigPayload = any> {
   /**
    * disable both timeOut and extendedTimeOut
    * default: false
@@ -101,10 +101,9 @@ export interface IndividualConfig {
   newestOnTop: boolean;
 
   /**
-   * payload to pass to the toastComponent
-   * default: null
+   * Payload to pass to the toast component
    */
-  payload: any;
+  payload?: ConfigPayload;
 }
 
 export interface ToastrIconClasses {
@@ -157,13 +156,13 @@ export interface GlobalConfig extends IndividualConfig {
 /**
  * Everything a toast needs to launch
  */
-export class ToastPackage {
+export class ToastPackage<ConfigPayload = any> {
   private _onTap = new Subject<void>();
   private _onAction = new Subject<any>();
 
   constructor(
     public toastId: number,
-    public config: IndividualConfig,
+    public config: IndividualConfig<ConfigPayload>,
     public message: string | null | undefined,
     public title: string | undefined,
     public toastType: string,
@@ -237,8 +236,6 @@ export const DefaultNoComponentGlobalConfig: GlobalConfig = {
   tapToDismiss: true,
   onActivateTick: false,
   progressAnimation: 'decreasing',
-
-  payload: null
 };
 
 export interface ToastToken {

diff --git a/src/lib/toastr/toastr.service.ts b/src/lib/toastr/toastr.service.ts
@@ -64,26 +64,26 @@ export class ToastrService {
     }
   }
   /** show toast */
-  show(message?: string, title?: string, override: Partial<IndividualConfig> = {}, type = '') {
+  show<ConfigPayload = any>(message?: string, title?: string, override: Partial<IndividualConfig<ConfigPayload>> = {}, type = '') {
     return this._preBuildNotification(type, message, title, this.applyConfig(override));
   }
   /** show successful toast */
-  success(message?: string, title?: string, override: Partial<IndividualConfig> = {}) {
+  success<ConfigPayload = any>(message?: string, title?: string, override: Partial<IndividualConfig<ConfigPayload>> = {}) {
     const type = this.toastrConfig.iconClasses.success || '';
     return this._preBuildNotification(type, message, title, this.applyConfig(override));
   }
   /** show error toast */
-  error(message?: string, title?: string, override: Partial<IndividualConfig> = {}) {
+  error<ConfigPayload = any>(message?: string, title?: string, override: Partial<IndividualConfig<ConfigPayload>> = {}) {
     const type = this.toastrConfig.iconClasses.error || '';
     return this._preBuildNotification(type, message, title, this.applyConfig(override));
   }
   /** show info toast */
-  info(message?: string, title?: string, override: Partial<IndividualConfig> = {}) {
+  info<ConfigPayload = any>(message?: string, title?: string, override: Partial<IndividualConfig<ConfigPayload>> = {}) {
     const type = this.toastrConfig.iconClasses.info || '';
     return this._preBuildNotification(type, message, title, this.applyConfig(override));
   }
   /** show warning toast */
-  warning(message?: string, title?: string, override: Partial<IndividualConfig> = {}) {
+  warning<ConfigPayload = any>(message?: string, title?: string, override: Partial<IndividualConfig<ConfigPayload>> = {}) {
     const type = this.toastrConfig.iconClasses.warning || '';
     return this._preBuildNotification(type, message, title, this.applyConfig(override));
   }