@etsoo/notificationbase 1.0.90 → 1.0.94

package/__tests__/Notification.ts

@@ -21,7 +21,7 @@ class NotificationContainerTest extends NotificationContainer<
     NotificationCallProps
 > {
     protected addRaw(
-        data: INotificaseBase<NotificationCallProps>
+        data: INotificaseBase<any, NotificationCallProps>
     ): INotification<any, NotificationCallProps> {
         throw new Error('Method not implemented.');
     }

package/lib/Notification.d.ts

@@ -100,7 +100,7 @@ export interface NotificationParameters {
 /**
  * Notification props supported for calls
  */
-export interface NotificationCallProps {
+export interface NotificationCallProps extends Record<string, unknown> {
 }
 /**
  * Notification render props
@@ -110,7 +110,7 @@ export interface NotificationRenderProps {
 /**
  * Notification base interface
  */
-export interface INotificaseBase<C extends NotificationCallProps> {
+export interface INotificaseBase<UI, C extends NotificationCallProps> {
     /**
      * Display align
      */
@@ -118,7 +118,7 @@ export interface INotificaseBase<C extends NotificationCallProps> {
     /**
      * Content
      */
-    readonly content: NotificationContent<unknown>;
+    readonly content: NotificationContent<UI>;
     /**
      * Input or control properties
      */
@@ -147,7 +147,7 @@ export interface INotificaseBase<C extends NotificationCallProps> {
     /**
      * Title
      */
-    readonly title?: NotificationContent<unknown>;
+    readonly title?: NotificationContent<UI>;
     /**
      * Type
      */
@@ -156,7 +156,7 @@ export interface INotificaseBase<C extends NotificationCallProps> {
 /**
  * Notification interface
  */
-export interface INotification<UI, C extends NotificationCallProps> extends INotificaseBase<C> {
+export interface INotification<UI, C extends NotificationCallProps> extends INotificaseBase<UI, C> {
     /**
      * Display align
      */

package/lib/NotificationContainer.d.ts

@@ -33,9 +33,10 @@ export interface INotifier<UI, C extends NotificationCallProps> {
      * Report error
      * @param error Error message
      * @param callback Callback
+     * @param type Type, default is Error
      * @param props Props
      */
-    alert(error: NotificationContent<UI>, callback?: NotificationReturn<void>, props?: C): INotification<UI, C>;
+    alert(error: NotificationContent<UI>, callback?: NotificationReturn<void>, type?: NotificationMessageType, props?: C): INotification<UI, C>;
     /**
      * Align all notification count
      * @param align Align
@@ -115,6 +116,7 @@ export interface INotifier<UI, C extends NotificationCallProps> {
 export declare abstract class NotificationContainer<UI, C extends NotificationCallProps> implements INotifier<UI, C> {
     private update;
     private lastLoading?;
+    private loadingCount;
     /**
      * Notification collection to display
      */
@@ -136,7 +138,7 @@ export declare abstract class NotificationContainer<UI, C extends NotificationCa
      * @param data Notification data definition
      * @param modal Show as modal
      */
-    protected abstract addRaw(data: INotificaseBase<C>, modal?: boolean): INotification<UI, C>;
+    protected abstract addRaw(data: INotificaseBase<UI, C>, modal?: boolean): INotification<UI, C>;
     /**
      * Add notification
      * @param notification Notification
@@ -182,9 +184,10 @@ export declare abstract class NotificationContainer<UI, C extends NotificationCa
      * Report error
      * @param error Error message
      * @param callback Callback
+     * @param type Type, default is Error
      * @param props Props
      */
-    alert(error: string, callback?: NotificationReturn<void>, props?: C): INotification<UI, C>;
+    alert(error: string, callback?: NotificationReturn<void>, type?: NotificationMessageType, props?: C): INotification<UI, C>;
     /**
      * Confirm action
      * @param message Message

package/lib/NotificationContainer.js

@@ -7,6 +7,7 @@ export class NotificationContainer {
      * Constructor
      */
     constructor(update) {
+        this.loadingCount = 0;
         // Update callback
         this.update = update;
         // Init notification collection
@@ -37,7 +38,7 @@ export class NotificationContainer {
         // Align collection
         const alignItems = this.notifications[notification.align];
         // Support dismiss action
-        const { align, timespan, onDismiss } = notification;
+        const { timespan, onDismiss } = notification;
         notification.onDismiss = () => {
             // Remove from the collection
             const index = alignItems.findIndex((item) => item.id === notification.id);
@@ -139,18 +140,19 @@ export class NotificationContainer {
      * Report error
      * @param error Error message
      * @param callback Callback
+     * @param type Type, default is Error
      * @param props Props
      */
-    alert(error, callback, props) {
+    alert(error, callback, type, props) {
         // Setup
         const n = {
             inputProps: props,
-            type: NotificationType.Error,
+            type: type !== null && type !== void 0 ? type : NotificationType.Error,
             content: error,
             onReturn: callback
         };
         // Add to the collection
-        return this.addRaw(n);
+        return this.addRaw(n, true);
     }
     /**
      * Confirm action
@@ -176,7 +178,12 @@ export class NotificationContainer {
      */
     hideLoading() {
         var _a;
-        (_a = this.lastLoading) === null || _a === void 0 ? void 0 : _a.dismiss();
+        // Deduct to count
+        this.loadingCount--;
+        if (this.loadingCount === 0) {
+            (_a = this.lastLoading) === null || _a === void 0 ? void 0 : _a.dismiss();
+            this.lastLoading = undefined;
+        }
     }
     /**
      * Show a message
@@ -226,14 +233,18 @@ export class NotificationContainer {
      * @param title Title
      */
     showLoading(title) {
-        // Setup
-        const n = {
-            type: NotificationType.Loading,
-            content: title !== null && title !== void 0 ? title : ''
-        };
-        // Add to the collection
-        // Keep the reference
-        this.lastLoading = this.addRaw(n);
+        // Add to count
+        this.loadingCount++;
+        if (this.lastLoading == null) {
+            // Setup
+            const n = {
+                type: NotificationType.Loading,
+                content: title !== null && title !== void 0 ? title : ''
+            };
+            // Add to the collection
+            // Keep the reference
+            this.lastLoading = this.addRaw(n);
+        }
     }
     /**
      * Show a success message

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/notificationbase",
-    "version": "1.0.90",
+    "version": "1.0.94",
     "description": "TypeScript notification component for extending with all features described and partially implemented",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -45,22 +45,22 @@
     },
     "homepage": "https://github.com/ETSOO/NotificationBase#readme",
     "dependencies": {
-        "@etsoo/shared": "^1.0.62"
+        "@etsoo/shared": "^1.0.75"
     },
     "devDependencies": {
-        "@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": "^5.1.0",
-        "@typescript-eslint/parser": "^5.1.0",
-        "babel-jest": "^27.3.1",
-        "eslint": "^8.1.0",
-        "eslint-config-airbnb-base": "^14.2.1",
-        "eslint-plugin-import": "^2.25.2",
-        "jest": "^27.3.1",
+        "@babel/core": "^7.16.0",
+        "@babel/plugin-transform-runtime": "^7.16.4",
+        "@babel/preset-env": "^7.16.4",
+        "@babel/runtime-corejs3": "^7.16.3",
+        "@types/jest": "^27.0.3",
+        "@typescript-eslint/eslint-plugin": "^5.5.0",
+        "@typescript-eslint/parser": "^5.5.0",
+        "babel-jest": "^27.4.2",
+        "eslint": "^8.3.0",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-plugin-import": "^2.25.3",
+        "jest": "^27.4.2",
         "ts-jest": "^27.0.7",
-        "typescript": "^4.4.4"
+        "typescript": "^4.5.2"
     }
 }

package/src/Notification.ts

@@ -110,7 +110,7 @@ export interface NotificationParameters {
 /**
  * Notification props supported for calls
  */
-export interface NotificationCallProps {}
+export interface NotificationCallProps extends Record<string, unknown> {}
 
 /**
  * Notification render props
@@ -120,7 +120,7 @@ export interface NotificationRenderProps {}
 /**
  * Notification base interface
  */
-export interface INotificaseBase<C extends NotificationCallProps> {
+export interface INotificaseBase<UI, C extends NotificationCallProps> {
     /**
      * Display align
      */
@@ -129,7 +129,7 @@ export interface INotificaseBase<C extends NotificationCallProps> {
     /**
      * Content
      */
-    readonly content: NotificationContent<unknown>;
+    readonly content: NotificationContent<UI>;
 
     /**
      * Input or control properties
@@ -165,7 +165,7 @@ export interface INotificaseBase<C extends NotificationCallProps> {
     /**
      * Title
      */
-    readonly title?: NotificationContent<unknown>;
+    readonly title?: NotificationContent<UI>;
 
     /**
      * Type
@@ -177,7 +177,7 @@ export interface INotificaseBase<C extends NotificationCallProps> {
  * Notification interface
  */
 export interface INotification<UI, C extends NotificationCallProps>
-    extends INotificaseBase<C> {
+    extends INotificaseBase<UI, C> {
     /**
      * Display align
      */

package/src/NotificationContainer.ts

@@ -50,11 +50,13 @@ export interface INotifier<UI, C extends NotificationCallProps> {
      * Report error
      * @param error Error message
      * @param callback Callback
+     * @param type Type, default is Error
      * @param props Props
      */
     alert(
         error: NotificationContent<UI>,
         callback?: NotificationReturn<void>,
+        type?: NotificationMessageType,
         props?: C
     ): INotification<UI, C>;
 
@@ -176,6 +178,7 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
 
     // Last loading
     private lastLoading?: INotification<UI, C>;
+    private loadingCount = 0;
 
     /**
      * Notification collection to display
@@ -218,7 +221,7 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
      * @param modal Show as modal
      */
     protected abstract addRaw(
-        data: INotificaseBase<C>,
+        data: INotificaseBase<UI, C>,
         modal?: boolean
     ): INotification<UI, C>;
 
@@ -232,7 +235,7 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
         const alignItems = this.notifications[notification.align];
 
         // Support dismiss action
-        const { align, timespan, onDismiss } = notification;
+        const { timespan, onDismiss } = notification;
         notification.onDismiss = () => {
             // Remove from the collection
             const index = alignItems.findIndex(
@@ -348,19 +351,25 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
      * Report error
      * @param error Error message
      * @param callback Callback
+     * @param type Type, default is Error
      * @param props Props
      */
-    alert(error: string, callback?: NotificationReturn<void>, props?: C) {
+    alert(
+        error: string,
+        callback?: NotificationReturn<void>,
+        type?: NotificationMessageType,
+        props?: C
+    ) {
         // Setup
-        const n: INotificaseBase<C> = {
+        const n: INotificaseBase<UI, C> = {
             inputProps: props,
-            type: NotificationType.Error,
+            type: type ?? NotificationType.Error,
             content: error,
             onReturn: callback
         };
 
         // Add to the collection
-        return this.addRaw(n);
+        return this.addRaw(n, true);
     }
 
     /**
@@ -377,7 +386,7 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
         props?: C
     ) {
         // Setup
-        const n: INotificaseBase<C> = {
+        const n: INotificaseBase<UI, C> = {
             type: NotificationType.Confirm,
             content: message,
             title,
@@ -393,7 +402,13 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
      * Hide loading
      */
     hideLoading() {
-        this.lastLoading?.dismiss();
+        // Deduct to count
+        this.loadingCount--;
+
+        if (this.loadingCount === 0) {
+            this.lastLoading?.dismiss();
+            this.lastLoading = undefined;
+        }
     }
 
     /**
@@ -415,7 +430,7 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
         const { align, timespan, callback, modal } = parameters ?? {};
 
         // Setup
-        const n: INotificaseBase<C> = {
+        const n: INotificaseBase<UI, C> = {
             type,
             content: message,
             title,
@@ -443,7 +458,7 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
         props?: C
     ) {
         // Setup
-        const n: INotificaseBase<C> = {
+        const n: INotificaseBase<UI, C> = {
             type: NotificationType.Prompt,
             content: message,
             title,
@@ -460,15 +475,20 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
      * @param title Title
      */
     showLoading(title?: NotificationContent<UI>) {
-        // Setup
-        const n: INotificaseBase<C> = {
-            type: NotificationType.Loading,
-            content: title ?? ''
-        };
-
-        // Add to the collection
-        // Keep the reference
-        this.lastLoading = this.addRaw(n);
+        // Add to count
+        this.loadingCount++;
+
+        if (this.lastLoading == null) {
+            // Setup
+            const n: INotificaseBase<UI, C> = {
+                type: NotificationType.Loading,
+                content: title ?? ''
+            };
+
+            // Add to the collection
+            // Keep the reference
+            this.lastLoading = this.addRaw(n);
+        }
     }
 
     /**