@etsoo/notificationbase 1.0.91 → 1.0.95

package/README.md

@@ -164,8 +164,9 @@ Methods:
 
     /**
      * Hide loading
+     * @param force Force to hide, otherwise, only the last one
      */
-    hideLoading(): void;
+    hideLoading(force?: boolean): void;
 
     /**
      * Show a message

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

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
@@ -75,8 +76,9 @@ export interface INotifier<UI, C extends NotificationCallProps> {
     getById(id: string): INotification<UI, C> | undefined;
     /**
      * Hide loading
+     * @param force Force to hide, otherwise, only the last one
      */
-    hideLoading(): void;
+    hideLoading(force?: boolean): void;
     /**
      * Show a message
      * @param type Message type
@@ -115,6 +117,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
      */
@@ -182,9 +185,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
@@ -195,8 +199,9 @@ export declare abstract class NotificationContainer<UI, C extends NotificationCa
     confirm(message: NotificationContent<UI>, title?: NotificationContent<UI>, callback?: NotificationReturn<boolean>, props?: C): INotification<UI, C>;
     /**
      * Hide loading
+     * @param force Force to hide, otherwise, only the last one
      */
-    hideLoading(): void;
+    hideLoading(force?: boolean): void;
     /**
      * Show a message
      * @param type Message type

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
@@ -173,10 +175,18 @@ export class NotificationContainer {
     }
     /**
      * Hide loading
+     * @param force Force to hide, otherwise, only the last one
      */
-    hideLoading() {
+    hideLoading(force) {
         var _a;
-        (_a = this.lastLoading) === null || _a === void 0 ? void 0 : _a.dismiss();
+        // Deduct to count
+        this.loadingCount--;
+        if (force)
+            this.loadingCount = 0;
+        if (this.loadingCount === 0) {
+            (_a = this.lastLoading) === null || _a === void 0 ? void 0 : _a.dismiss();
+            this.lastLoading = undefined;
+        }
     }
     /**
      * Show a message
@@ -226,14 +236,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.91",
+    "version": "1.0.95",
     "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.79"
     },
     "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",
-        "ts-jest": "^27.0.7",
-        "typescript": "^4.4.4"
+        "@babel/core": "^7.16.5",
+        "@babel/plugin-transform-runtime": "^7.16.5",
+        "@babel/preset-env": "^7.16.5",
+        "@babel/runtime-corejs3": "^7.16.5",
+        "@types/jest": "^27.0.3",
+        "@typescript-eslint/eslint-plugin": "^5.8.0",
+        "@typescript-eslint/parser": "^5.8.0",
+        "babel-jest": "^27.4.5",
+        "eslint": "^8.5.0",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-plugin-import": "^2.25.3",
+        "jest": "^27.4.5",
+        "ts-jest": "^27.1.2",
+        "typescript": "^4.5.4"
     }
 }

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

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>;
 
@@ -109,8 +111,9 @@ export interface INotifier<UI, C extends NotificationCallProps> {
 
     /**
      * Hide loading
+     * @param force Force to hide, otherwise, only the last one
      */
-    hideLoading(): void;
+    hideLoading(force?: boolean): void;
 
     /**
      * Show a message
@@ -176,6 +179,7 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
 
     // Last loading
     private lastLoading?: INotification<UI, C>;
+    private loadingCount = 0;
 
     /**
      * Notification collection to display
@@ -232,7 +236,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 +352,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<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);
     }
 
     /**
@@ -391,9 +401,18 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
 
     /**
      * Hide loading
+     * @param force Force to hide, otherwise, only the last one
      */
-    hideLoading() {
-        this.lastLoading?.dismiss();
+    hideLoading(force?: boolean) {
+        // Deduct to count
+        this.loadingCount--;
+
+        if (force) this.loadingCount = 0;
+
+        if (this.loadingCount === 0) {
+            this.lastLoading?.dismiss();
+            this.lastLoading = undefined;
+        }
     }
 
     /**
@@ -460,15 +479,20 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
      * @param title Title
      */
     showLoading(title?: NotificationContent<UI>) {
-        // Setup
-        const n: INotificaseBase<UI, 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);
+        }
     }
 
     /**