@etsoo/notificationbase 1.0.75 → 1.0.79

package/__tests__/Notification.ts

@@ -3,20 +3,26 @@ import {
     INotification,
     Notification,
     NotificationAlign,
+    NotificationCallProps,
     NotificationRenderProps,
     NotificationType
 } from '../src/Notification';
 import { NotificationContainer } from '../src/NotificationContainer';
 
 // Class implementation for tests
-class NotificationTest extends Notification<any> {
+class NotificationTest extends Notification<any, NotificationCallProps> {
     render(props: NotificationRenderProps, className?: string, options?: any) {
         throw new Error('Method not implemented.');
     }
 }
 
-class NotificationContainerTest extends NotificationContainer<any> {
-    protected addRaw(data: INotificaseBase): INotification<any> {
+class NotificationContainerTest extends NotificationContainer<
+    any,
+    NotificationCallProps
+> {
+    protected addRaw(
+        data: INotificaseBase<NotificationCallProps>
+    ): INotification<any, NotificationCallProps> {
         throw new Error('Method not implemented.');
     }
 }
@@ -44,10 +50,6 @@ test('Tests for notification dismiss', () => {
     // Act
     n.dismiss(2);
 
-    // Assert
-    // setTimeout should be called 1 time
-    expect(setTimeout).toBeCalled();
-
     // Fast forward
     jest.runOnlyPendingTimers();
 

package/lib/Notification.d.ts

@@ -72,7 +72,7 @@ export interface NotifictionRenderSetup {
  * return false will prevent default action
  */
 export interface NotificationReturn<T> {
-    (value: T): boolean | void;
+    (value: T): boolean | void | PromiseLike<boolean | void>;
 }
 /**
  * Notification message parameters
@@ -99,6 +99,11 @@ export interface NotificationParameters {
      */
     top?: boolean;
 }
+/**
+ * Notification props supported for calls
+ */
+export interface NotificationCallProps {
+}
 /**
  * Notification render props
  */
@@ -107,7 +112,7 @@ export interface NotificationRenderProps {
 /**
  * Notification base interface
  */
-export interface INotificaseBase {
+export interface INotificaseBase<C extends NotificationCallProps> {
     /**
      * Display align
      */
@@ -119,7 +124,7 @@ export interface INotificaseBase {
     /**
      * Input or control properties
      */
-    inputProps?: any;
+    inputProps?: C;
     /**
      * On dismiss handling
      */
@@ -138,6 +143,7 @@ export interface INotificaseBase {
     timespan?: number;
     /**
      * Render setup / callback
+     * Add more properties
      */
     renderSetup?: NotifictionRenderSetup;
     /**
@@ -152,7 +158,7 @@ export interface INotificaseBase {
 /**
  * Notification interface
  */
-export interface INotification<UI> extends INotificaseBase {
+export interface INotification<UI, C extends NotificationCallProps> extends INotificaseBase<C> {
     /**
      * Display align
      */
@@ -201,13 +207,13 @@ export interface INotification<UI> extends INotificaseBase {
      * @param className Style class name
      * @param options Other options
      */
-    render(props: NotificationRenderProps, className?: string, options?: any): UI | undefined;
+    render(props: NotificationRenderProps, className?: string): UI | undefined;
 }
 /**
  * Notification class
  * Generic parameter UI presents UI element type
  */
-export declare abstract class Notification<UI> implements INotification<UI> {
+export declare abstract class Notification<UI, C extends NotificationCallProps> implements INotification<UI, C> {
     /**
      * Display align
      */
@@ -227,7 +233,7 @@ export declare abstract class Notification<UI> implements INotification<UI> {
     /**
      * Input or control properties
      */
-    inputProps?: any;
+    inputProps?: C;
     /**
      * Display as modal
      */
@@ -291,9 +297,8 @@ export declare abstract class Notification<UI> implements INotification<UI> {
     dispose(): void;
     /**
      * Render method
-     * @param props Props
+     * @param props Props, provider's UI props
      * @param className Style class name
-     * @param options Other options
      */
-    abstract render(props: NotificationRenderProps, className?: string, options?: any): UI | undefined;
+    abstract render(props: NotificationRenderProps, className?: string): UI | undefined;
 }

package/lib/Notification.js

@@ -96,7 +96,7 @@ export class Notification {
             return false;
         if (delaySeconds > 0) {
             this.removeTimeout();
-            this.dismissSeed = setTimeout(this.dismiss.bind(this), delaySeconds * 1000, 0 // force to dismiss
+            this.dismissSeed = window.setTimeout(this.dismiss.bind(this), delaySeconds * 1000, 0 // force to dismiss
             );
             return true;
         }

package/lib/NotificationContainer.d.ts

@@ -1,20 +1,20 @@
-import { INotificaseBase, INotification, NotificationAlign, NotificationMessageType, NotificationParameters, NotificationReturn } from './Notification';
+import { INotificaseBase, INotification, NotificationAlign, NotificationCallProps, NotificationMessageType, NotificationParameters, NotificationReturn } from './Notification';
 /**
  * Notification action
  */
-export interface NotificationAction<UI> {
-    (notification: INotification<UI>, dismiss: boolean): void;
+export interface NotificationAction<UI, C extends NotificationCallProps> {
+    (notification: INotification<UI, C>, dismiss: boolean): void;
 }
 /**
  * Notifications sorted with display align type
  */
-export declare type NotificationDictionary<UI> = {
-    [key: number]: INotification<UI>[];
+export declare type NotificationDictionary<UI, C extends NotificationCallProps> = {
+    [key: number]: INotification<UI, C>[];
 };
 /**
  * Notifier interface
  */
-export interface INotifier<UI> {
+export interface INotifier<UI, C extends NotificationCallProps> {
     /**
      * Is loading bar showing
      */
@@ -28,13 +28,14 @@ export interface INotifier<UI> {
      * @param notification Notification
      * @param top Is insert top
      */
-    add(notification: INotification<UI>, top?: boolean): void;
+    add(notification: INotification<UI, C>, top?: boolean): void;
     /**
      * Report error
      * @param error Error message
      * @param callback Callback
+     * @param props Props
      */
-    alert(error: string, callback?: NotificationReturn<void>): void;
+    alert(error: string, callback?: NotificationReturn<void>, props?: C): void;
     /**
      * Align all notification count
      * @param align Align
@@ -54,8 +55,9 @@ export interface INotifier<UI> {
      * @param message Message
      * @param title Title
      * @param callback Callback
+     * @param props Props
      */
-    confirm(message: string, title?: string, callback?: NotificationReturn<boolean>): void;
+    confirm(message: string, title?: string, callback?: NotificationReturn<boolean>, props?: C): void;
     /**
      * Dispose all notifications
      */
@@ -65,12 +67,12 @@ export interface INotifier<UI> {
      * @param align Align
      * @param id Notification id
      */
-    get(align: NotificationAlign, id: string): INotification<UI> | undefined;
+    get(align: NotificationAlign, id: string): INotification<UI, C> | undefined;
     /**
      * Get notification with id
      * @param id Notification id
      */
-    getById(id: string): INotification<UI> | undefined;
+    getById(id: string): INotification<UI, C> | undefined;
     /**
      * Hide loading
      */
@@ -81,8 +83,9 @@ export interface INotifier<UI> {
      * @param message Message
      * @param title Title
      * @param parameters Parameters
+     * @param props Props
      */
-    message(type: NotificationMessageType, message: string, title?: string, parameters?: NotificationParameters): INotification<UI>;
+    message(type: NotificationMessageType, message: string, title?: string, parameters?: NotificationParameters, props?: C): INotification<UI, C>;
     /**
      * Prompt action
      * @param message Message
@@ -90,7 +93,7 @@ export interface INotifier<UI> {
      * @param title Title
      * @param props More properties
      */
-    prompt(message: string, callback: NotificationReturn<string>, title?: string, props?: any): void;
+    prompt<T = string>(message: string, callback: NotificationReturn<T>, title?: string, props?: C): void;
     /**
      * Show loading
      * @param title Title
@@ -102,19 +105,20 @@ export interface INotifier<UI> {
      * @param title Title
      * @param callback Callback
      * @param timespan Timespan to close
+     * @param props Props
      */
-    succeed(message: string, title?: string, callback?: NotificationReturn<void>, timespan?: number): void;
+    succeed(message: string, title?: string, callback?: NotificationReturn<void>, timespan?: number, props?: C): void;
 }
 /**
  * Notification container class
  */
-export declare abstract class NotificationContainer<UI> implements INotifier<UI> {
+export declare abstract class NotificationContainer<UI, C extends NotificationCallProps> implements INotifier<UI, C> {
     private update;
     private lastLoading?;
     /**
      * Notification collection to display
      */
-    readonly notifications: NotificationDictionary<UI>;
+    readonly notifications: NotificationDictionary<UI, C>;
     /**
      * Is loading bar showing
      */
@@ -126,19 +130,19 @@ export declare abstract class NotificationContainer<UI> implements INotifier<UI>
     /**
      * Constructor
      */
-    constructor(update: NotificationAction<UI>);
+    constructor(update: NotificationAction<UI, C>);
     /**
      * Add raw definition
      * @param data Notification data definition
      * @param modal Show as modal
      */
-    protected abstract addRaw(data: INotificaseBase, modal?: boolean): INotification<UI>;
+    protected abstract addRaw(data: INotificaseBase<C>, modal?: boolean): INotification<UI, C>;
     /**
      * Add notification
      * @param notification Notification
      * @param top Is insert top
      */
-    add(notification: INotification<UI>, top?: boolean): void;
+    add(notification: INotification<UI, C>, top?: boolean): void;
     /**
      * Align all notification count
      * @param align Align
@@ -168,25 +172,27 @@ export declare abstract class NotificationContainer<UI> implements INotifier<UI>
      * @param align Align
      * @param id Notification id
      */
-    get(align: NotificationAlign, id: string): INotification<UI> | undefined;
+    get(align: NotificationAlign, id: string): INotification<UI, C> | undefined;
     /**
      * Get notification with id
      * @param id Notification id
      */
-    getById(id: string): INotification<UI> | undefined;
+    getById(id: string): INotification<UI, C> | undefined;
     /**
      * Report error
      * @param error Error message
      * @param callback Callback
+     * @param props Props
      */
-    alert(error: string, callback?: NotificationReturn<void>): void;
+    alert(error: string, callback?: NotificationReturn<void>, props?: C): void;
     /**
      * Confirm action
      * @param message Message
      * @param title Title
      * @param callback Callback
+     * @param props Props
      */
-    confirm(message: string, title?: string, callback?: NotificationReturn<boolean>): void;
+    confirm(message: string, title?: string, callback?: NotificationReturn<boolean>, props?: C): void;
     /**
      * Hide loading
      */
@@ -197,8 +203,9 @@ export declare abstract class NotificationContainer<UI> implements INotifier<UI>
      * @param message Message
      * @param title Title
      * @param parameters Parameters
+     * @param props Props
      */
-    message(type: NotificationMessageType, message: string, title?: string, parameters?: NotificationParameters): INotification<UI>;
+    message(type: NotificationMessageType, message: string, title?: string, parameters?: NotificationParameters, props?: C): INotification<UI, C>;
     /**
      * Prompt action
      * @param message Message
@@ -206,7 +213,7 @@ export declare abstract class NotificationContainer<UI> implements INotifier<UI>
      * @param title Title
      * @param props More properties
      */
-    prompt(message: string, callback: NotificationReturn<string>, title?: string, props?: any): void;
+    prompt<T>(message: string, callback: NotificationReturn<T>, title?: string, props?: C): void;
     /**
      * Show loading
      * @param title Title
@@ -218,6 +225,7 @@ export declare abstract class NotificationContainer<UI> implements INotifier<UI>
      * @param title Title
      * @param callback Callback
      * @param timespan Timespan to close
+     * @param props Props
      */
-    succeed(message: string, title?: string, callback?: NotificationReturn<void>, timespan?: number): void;
+    succeed(message: string, title?: string, callback?: NotificationReturn<void>, timespan?: number, props?: C): void;
 }

package/lib/NotificationContainer.js

@@ -149,15 +149,16 @@ export class NotificationContainer {
      * Report error
      * @param error Error message
      * @param callback Callback
+     * @param props Props
      */
-    alert(error, callback) {
+    alert(error, callback, props) {
         // Setup
         const n = {
+            inputProps: props,
             type: NotificationType.Error,
-            content: error
+            content: error,
+            onReturn: callback
         };
-        // Callback
-        n.onReturn = callback;
         // Add to the collection
         this.addRaw(n);
     }
@@ -166,16 +167,17 @@ export class NotificationContainer {
      * @param message Message
      * @param title Title
      * @param callback Callback
+     * @param props Props
      */
-    confirm(message, title, callback) {
+    confirm(message, title, callback, props) {
         // Setup
         const n = {
             type: NotificationType.Confirm,
             content: message,
-            title
+            title,
+            onReturn: callback,
+            inputProps: props
         };
-        // Callback
-        n.onReturn = callback;
         // Add to the collection
         this.addRaw(n);
     }
@@ -192,8 +194,9 @@ export class NotificationContainer {
      * @param message Message
      * @param title Title
      * @param parameters Parameters
+     * @param props Props
      */
-    message(type, message, title, parameters) {
+    message(type, message, title, parameters, props) {
         // Destruct
         const { align, timespan, callback, modal } = parameters !== null && parameters !== void 0 ? parameters : {};
         // Setup
@@ -202,10 +205,10 @@ export class NotificationContainer {
             content: message,
             title,
             align,
-            timespan
+            timespan,
+            onReturn: callback,
+            inputProps: props
         };
-        // Additional parameters
-        n.onReturn = callback;
         // Add to the collection
         return this.addRaw(n, modal);
     }
@@ -221,12 +224,10 @@ export class NotificationContainer {
         const n = {
             type: NotificationType.Prompt,
             content: message,
-            title
+            title,
+            inputProps: props,
+            onReturn: callback
         };
-        // Additional parameters
-        n.inputProps = props;
-        // Callback
-        n.onReturn = callback;
         // Add to the collection
         this.addRaw(n);
     }
@@ -250,8 +251,9 @@ export class NotificationContainer {
      * @param title Title
      * @param callback Callback
      * @param timespan Timespan to close
+     * @param props Props
      */
-    succeed(message, title, callback, timespan) {
+    succeed(message, title, callback, timespan, props) {
         // Default to zero for constant
         timespan !== null && timespan !== void 0 ? timespan : (timespan = 0);
         // Create as message
@@ -260,6 +262,6 @@ export class NotificationContainer {
             modal: true,
             timespan,
             callback
-        });
+        }, props);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/notificationbase",
-    "version": "1.0.75",
+    "version": "1.0.79",
     "description": "TypeScript notification component for extending with all features described and partially implemented",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -40,24 +40,24 @@
     },
     "homepage": "https://github.com/ETSOO/NotificationBase#readme",
     "dependencies": {
-        "@etsoo/shared": "^1.0.39"
+        "@etsoo/shared": "^1.0.46"
     },
     "devDependencies": {
-        "@babel/core": "^7.13.10",
-        "@babel/plugin-transform-runtime": "^7.13.15",
-        "@babel/preset-env": "^7.13.10",
-        "@babel/runtime-corejs3": "^7.13.10",
-        "@types/jest": "^26.0.21",
-        "@typescript-eslint/eslint-plugin": "^4.18.0",
-        "@typescript-eslint/parser": "^4.18.0",
+        "@babel/core": "^7.15.8",
+        "@babel/plugin-transform-runtime": "^7.15.8",
+        "@babel/preset-env": "^7.15.8",
+        "@babel/runtime-corejs3": "^7.15.4",
+        "@types/jest": "^27.0.2",
+        "@typescript-eslint/eslint-plugin": "^4.33.0",
+        "@typescript-eslint/parser": "^4.33.0",
         "babel-core": "^7.0.0-bridge.0",
-        "babel-jest": "^26.6.3",
-        "eslint": "^7.22.0",
+        "babel-jest": "^27.2.4",
+        "eslint": "^7.32.0",
         "eslint-config-airbnb-base": "^14.2.1",
-        "eslint-plugin-import": "^2.22.1",
-        "jest": "^26.6.3",
-        "regenerator-runtime": "^0.13.7",
-        "ts-jest": "^26.5.4",
-        "typescript": "^4.2.3"
+        "eslint-plugin-import": "^2.24.2",
+        "jest": "^27.2.4",
+        "regenerator-runtime": "^0.13.9",
+        "ts-jest": "^27.0.5",
+        "typescript": "^4.4.3"
     }
 }

package/src/Notification.ts

@@ -76,7 +76,7 @@ export interface NotifictionRenderSetup {
  * return false will prevent default action
  */
 export interface NotificationReturn<T> {
-    (value: T): boolean | void;
+    (value: T): boolean | void | PromiseLike<boolean | void>;
 }
 
 /**
@@ -109,6 +109,11 @@ export interface NotificationParameters {
     top?: boolean;
 }
 
+/**
+ * Notification props supported for calls
+ */
+export interface NotificationCallProps {}
+
 /**
  * Notification render props
  */
@@ -117,7 +122,7 @@ export interface NotificationRenderProps {}
 /**
  * Notification base interface
  */
-export interface INotificaseBase {
+export interface INotificaseBase<C extends NotificationCallProps> {
     /**
      * Display align
      */
@@ -131,7 +136,7 @@ export interface INotificaseBase {
     /**
      * Input or control properties
      */
-    inputProps?: any;
+    inputProps?: C;
 
     /**
      * On dismiss handling
@@ -155,6 +160,7 @@ export interface INotificaseBase {
 
     /**
      * Render setup / callback
+     * Add more properties
      */
     renderSetup?: NotifictionRenderSetup;
 
@@ -172,7 +178,8 @@ export interface INotificaseBase {
 /**
  * Notification interface
  */
-export interface INotification<UI> extends INotificaseBase {
+export interface INotification<UI, C extends NotificationCallProps>
+    extends INotificaseBase<C> {
     /**
      * Display align
      */
@@ -231,18 +238,16 @@ export interface INotification<UI> extends INotificaseBase {
      * @param className Style class name
      * @param options Other options
      */
-    render(
-        props: NotificationRenderProps,
-        className?: string,
-        options?: any
-    ): UI | undefined;
+    render(props: NotificationRenderProps, className?: string): UI | undefined;
 }
 
 /**
  * Notification class
  * Generic parameter UI presents UI element type
  */
-export abstract class Notification<UI> implements INotification<UI> {
+export abstract class Notification<UI, C extends NotificationCallProps>
+    implements INotification<UI, C>
+{
     /**
      * Display align
      */
@@ -266,7 +271,7 @@ export abstract class Notification<UI> implements INotification<UI> {
     /**
      * Input or control properties
      */
-    inputProps?: any;
+    inputProps?: C;
 
     /**
      * Display as modal
@@ -368,7 +373,7 @@ export abstract class Notification<UI> implements INotification<UI> {
 
         if (delaySeconds > 0) {
             this.removeTimeout();
-            this.dismissSeed = setTimeout(
+            this.dismissSeed = window.setTimeout(
                 this.dismiss.bind(this),
                 delaySeconds * 1000,
                 0 // force to dismiss
@@ -408,13 +413,11 @@ export abstract class Notification<UI> implements INotification<UI> {
 
     /**
      * Render method
-     * @param props Props
+     * @param props Props, provider's UI props
      * @param className Style class name
-     * @param options Other options
      */
     abstract render(
         props: NotificationRenderProps,
-        className?: string,
-        options?: any
+        className?: string
     ): UI | undefined;
 }

package/src/NotificationContainer.ts

@@ -2,6 +2,7 @@ import {
     INotificaseBase,
     INotification,
     NotificationAlign,
+    NotificationCallProps,
     NotificationMessageType,
     NotificationModalType,
     NotificationParameters,
@@ -12,21 +13,21 @@ import {
 /**
  * Notification action
  */
-export interface NotificationAction<UI> {
-    (notification: INotification<UI>, dismiss: boolean): void;
+export interface NotificationAction<UI, C extends NotificationCallProps> {
+    (notification: INotification<UI, C>, dismiss: boolean): void;
 }
 
 /**
  * Notifications sorted with display align type
  */
-export type NotificationDictionary<UI> = {
-    [key: number]: INotification<UI>[];
+export type NotificationDictionary<UI, C extends NotificationCallProps> = {
+    [key: number]: INotification<UI, C>[];
 };
 
 /**
  * Notifier interface
  */
-export interface INotifier<UI> {
+export interface INotifier<UI, C extends NotificationCallProps> {
     /**
      * Is loading bar showing
      */
@@ -42,14 +43,15 @@ export interface INotifier<UI> {
      * @param notification Notification
      * @param top Is insert top
      */
-    add(notification: INotification<UI>, top?: boolean): void;
+    add(notification: INotification<UI, C>, top?: boolean): void;
 
     /**
      * Report error
      * @param error Error message
      * @param callback Callback
+     * @param props Props
      */
-    alert(error: string, callback?: NotificationReturn<void>): void;
+    alert(error: string, callback?: NotificationReturn<void>, props?: C): void;
 
     /**
      * Align all notification count
@@ -73,11 +75,13 @@ export interface INotifier<UI> {
      * @param message Message
      * @param title Title
      * @param callback Callback
+     * @param props Props
      */
     confirm(
         message: string,
         title?: string,
-        callback?: NotificationReturn<boolean>
+        callback?: NotificationReturn<boolean>,
+        props?: C
     ): void;
 
     /**
@@ -90,13 +94,13 @@ export interface INotifier<UI> {
      * @param align Align
      * @param id Notification id
      */
-    get(align: NotificationAlign, id: string): INotification<UI> | undefined;
+    get(align: NotificationAlign, id: string): INotification<UI, C> | undefined;
 
     /**
      * Get notification with id
      * @param id Notification id
      */
-    getById(id: string): INotification<UI> | undefined;
+    getById(id: string): INotification<UI, C> | undefined;
 
     /**
      * Hide loading
@@ -109,13 +113,15 @@ export interface INotifier<UI> {
      * @param message Message
      * @param title Title
      * @param parameters Parameters
+     * @param props Props
      */
     message(
         type: NotificationMessageType,
         message: string,
         title?: string,
-        parameters?: NotificationParameters
-    ): INotification<UI>;
+        parameters?: NotificationParameters,
+        props?: C
+    ): INotification<UI, C>;
 
     /**
      * Prompt action
@@ -124,11 +130,11 @@ export interface INotifier<UI> {
      * @param title Title
      * @param props More properties
      */
-    prompt(
+    prompt<T = string>(
         message: string,
-        callback: NotificationReturn<string>,
+        callback: NotificationReturn<T>,
         title?: string,
-        props?: any
+        props?: C
     ): void;
 
     /**
@@ -143,29 +149,33 @@ export interface INotifier<UI> {
      * @param title Title
      * @param callback Callback
      * @param timespan Timespan to close
+     * @param props Props
      */
     succeed(
         message: string,
         title?: string,
         callback?: NotificationReturn<void>,
-        timespan?: number
+        timespan?: number,
+        props?: C
     ): void;
 }
 
 /**
  * Notification container class
  */
-export abstract class NotificationContainer<UI> implements INotifier<UI> {
+export abstract class NotificationContainer<UI, C extends NotificationCallProps>
+    implements INotifier<UI, C>
+{
     // Registered update action
-    private update: NotificationAction<UI>;
+    private update: NotificationAction<UI, C>;
 
     // Last loading
-    private lastLoading?: INotification<UI>;
+    private lastLoading?: INotification<UI, C>;
 
     /**
      * Notification collection to display
      */
-    readonly notifications: NotificationDictionary<UI>;
+    readonly notifications: NotificationDictionary<UI, C>;
 
     /**
      * Is loading bar showing
@@ -186,7 +196,7 @@ export abstract class NotificationContainer<UI> implements INotifier<UI> {
     /**
      * Constructor
      */
-    constructor(update: NotificationAction<UI>) {
+    constructor(update: NotificationAction<UI, C>) {
         // Update callback
         this.update = update;
 
@@ -203,16 +213,16 @@ export abstract class NotificationContainer<UI> implements INotifier<UI> {
      * @param modal Show as modal
      */
     protected abstract addRaw(
-        data: INotificaseBase,
+        data: INotificaseBase<C>,
         modal?: boolean
-    ): INotification<UI>;
+    ): INotification<UI, C>;
 
     /**
      * Add notification
      * @param notification Notification
      * @param top Is insert top
      */
-    add(notification: INotification<UI>, top: boolean = false): void {
+    add(notification: INotification<UI, C>, top: boolean = false): void {
         // Align collection
         const alignItems = this.notifications[notification.align];
 
@@ -308,7 +318,7 @@ export abstract class NotificationContainer<UI> implements INotifier<UI> {
      * @param id Notification id
      * @param dismiss Is dismiss
      */
-    private doRegister(item: INotification<UI>, dismiss: boolean): void {
+    private doRegister(item: INotification<UI, C>, dismiss: boolean): void {
         // Call
         this.update(item, dismiss);
     }
@@ -318,7 +328,10 @@ export abstract class NotificationContainer<UI> implements INotifier<UI> {
      * @param align Align
      * @param id Notification id
      */
-    get(align: NotificationAlign, id: string): INotification<UI> | undefined {
+    get(
+        align: NotificationAlign,
+        id: string
+    ): INotification<UI, C> | undefined {
         const items = this.notifications[align];
         return items.find((item) => item.id === id);
     }
@@ -327,7 +340,7 @@ export abstract class NotificationContainer<UI> implements INotifier<UI> {
      * Get notification with id
      * @param id Notification id
      */
-    getById(id: string): INotification<UI> | undefined {
+    getById(id: string): INotification<UI, C> | undefined {
         for (const align in Object.keys(NotificationAlign)) {
             var item = this.get(align as unknown as NotificationAlign, id);
             if (item != null) return item;
@@ -339,17 +352,17 @@ export abstract class NotificationContainer<UI> implements INotifier<UI> {
      * Report error
      * @param error Error message
      * @param callback Callback
+     * @param props Props
      */
-    alert(error: string, callback?: NotificationReturn<void>) {
+    alert(error: string, callback?: NotificationReturn<void>, props?: C) {
         // Setup
-        const n: INotificaseBase = {
+        const n: INotificaseBase<C> = {
+            inputProps: props,
             type: NotificationType.Error,
-            content: error
+            content: error,
+            onReturn: callback
         };
 
-        // Callback
-        n.onReturn = callback;
-
         // Add to the collection
         this.addRaw(n);
     }
@@ -359,22 +372,23 @@ export abstract class NotificationContainer<UI> implements INotifier<UI> {
      * @param message Message
      * @param title Title
      * @param callback Callback
+     * @param props Props
      */
     confirm(
         message: string,
         title?: string,
-        callback?: NotificationReturn<boolean>
+        callback?: NotificationReturn<boolean>,
+        props?: C
     ) {
         // Setup
-        const n: INotificaseBase = {
+        const n: INotificaseBase<C> = {
             type: NotificationType.Confirm,
             content: message,
-            title
+            title,
+            onReturn: callback,
+            inputProps: props
         };
 
-        // Callback
-        n.onReturn = callback;
-
         // Add to the collection
         this.addRaw(n);
     }
@@ -392,28 +406,29 @@ export abstract class NotificationContainer<UI> implements INotifier<UI> {
      * @param message Message
      * @param title Title
      * @param parameters Parameters
+     * @param props Props
      */
     message(
         type: NotificationMessageType,
         message: string,
         title?: string,
-        parameters?: NotificationParameters
+        parameters?: NotificationParameters,
+        props?: C
     ) {
         // Destruct
         const { align, timespan, callback, modal } = parameters ?? {};
 
         // Setup
-        const n: INotificaseBase = {
+        const n: INotificaseBase<C> = {
             type,
             content: message,
             title,
             align,
-            timespan
+            timespan,
+            onReturn: callback,
+            inputProps: props
         };
 
-        // Additional parameters
-        n.onReturn = callback;
-
         // Add to the collection
         return this.addRaw(n, modal);
     }
@@ -425,25 +440,21 @@ export abstract class NotificationContainer<UI> implements INotifier<UI> {
      * @param title Title
      * @param props More properties
      */
-    prompt(
+    prompt<T>(
         message: string,
-        callback: NotificationReturn<string>,
+        callback: NotificationReturn<T>,
         title?: string,
-        props?: any
+        props?: C
     ) {
         // Setup
-        const n: INotificaseBase = {
+        const n: INotificaseBase<C> = {
             type: NotificationType.Prompt,
             content: message,
-            title
+            title,
+            inputProps: props,
+            onReturn: callback
         };
 
-        // Additional parameters
-        n.inputProps = props;
-
-        // Callback
-        n.onReturn = callback;
-
         // Add to the collection
         this.addRaw(n);
     }
@@ -454,7 +465,7 @@ export abstract class NotificationContainer<UI> implements INotifier<UI> {
      */
     showLoading(title?: string) {
         // Setup
-        const n: INotificaseBase = {
+        const n: INotificaseBase<C> = {
             type: NotificationType.Loading,
             content: title ?? ''
         };
@@ -470,22 +481,30 @@ export abstract class NotificationContainer<UI> implements INotifier<UI> {
      * @param title Title
      * @param callback Callback
      * @param timespan Timespan to close
+     * @param props Props
      */
     succeed(
         message: string,
         title?: string,
         callback?: NotificationReturn<void>,
-        timespan?: number
+        timespan?: number,
+        props?: C
     ) {
         // Default to zero for constant
         timespan ??= 0;
 
         // Create as message
-        this.message(NotificationMessageType.Success, message, title, {
-            align: NotificationAlign.Center,
-            modal: true,
-            timespan,
-            callback
-        });
+        this.message(
+            NotificationMessageType.Success,
+            message,
+            title,
+            {
+                align: NotificationAlign.Center,
+                modal: true,
+                timespan,
+                callback
+            },
+            props
+        );
     }
 }