@etsoo/notificationbase 1.1.45 → 1.1.47

package/__tests__/Notification.ts

@@ -55,7 +55,7 @@ test('Tests for notification dismiss', () => {
     jest.runOnlyPendingTimers();
 
     // dismiss should be called 2 times
-    expect(spy).toBeCalledTimes(2);
+    expect(spy).toHaveBeenCalledTimes(2);
 });
 
 test('Tests for notification container add', () => {

package/lib/cjs/NotificationContainer.d.ts

@@ -23,6 +23,14 @@ export interface INotifier<UI, C extends NotificationCallProps> {
      * Is model window showing
      */
     readonly isModeling: boolean;
+    /**
+     * Loading count
+     */
+    readonly loadingCount: number;
+    /**
+     * Is debug mode
+     */
+    debug: boolean;
     /**
      * Add notification
      * @param notification Notification
@@ -124,7 +132,16 @@ 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;
+    private _loadingCount;
+    /**
+     * Loading count
+     */
+    get loadingCount(): number;
+    private set loadingCount(value);
+    /**
+     * Is debug mode
+     */
+    debug: boolean;
     /**
      * Notification collection to display
      */

package/lib/cjs/NotificationContainer.js

@@ -6,6 +6,15 @@ const Notification_1 = require("./Notification");
  * Notification container class
  */
 class NotificationContainer {
+    /**
+     * Loading count
+     */
+    get loadingCount() {
+        return this._loadingCount;
+    }
+    set loadingCount(value) {
+        this._loadingCount = value;
+    }
     /**
      * Is loading bar showing
      */
@@ -22,7 +31,11 @@ class NotificationContainer {
      * Constructor
      */
     constructor(update) {
-        this.loadingCount = 0;
+        this._loadingCount = 0;
+        /**
+         * Is debug mode
+         */
+        this.debug = false;
         // Update callback
         this.update = update;
         // Init notification collection
@@ -191,13 +204,23 @@ class NotificationContainer {
      * @param force Force to hide, otherwise, only the last one
      */
     hideLoading(force) {
-        // Deduct to count
-        this.loadingCount--;
-        if (force)
+        if (this.lastLoading == null) {
+            // Reset count when no loading
             this.loadingCount = 0;
-        if (this.loadingCount === 0) {
-            this.lastLoading?.dismiss();
-            this.lastLoading = undefined;
+        }
+        else {
+            // Deduct to count
+            // Avoid negative result (-1)
+            if (this.loadingCount > 0) {
+                this.loadingCount--;
+            }
+            if (force)
+                this.loadingCount = 0;
+            // Hide the loading
+            if (this.loadingCount === 0) {
+                this.lastLoading.dismiss();
+                this.lastLoading = undefined;
+            }
         }
     }
     /**

package/lib/mjs/NotificationContainer.d.ts

@@ -23,6 +23,14 @@ export interface INotifier<UI, C extends NotificationCallProps> {
      * Is model window showing
      */
     readonly isModeling: boolean;
+    /**
+     * Loading count
+     */
+    readonly loadingCount: number;
+    /**
+     * Is debug mode
+     */
+    debug: boolean;
     /**
      * Add notification
      * @param notification Notification
@@ -124,7 +132,16 @@ 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;
+    private _loadingCount;
+    /**
+     * Loading count
+     */
+    get loadingCount(): number;
+    private set loadingCount(value);
+    /**
+     * Is debug mode
+     */
+    debug: boolean;
     /**
      * Notification collection to display
      */

package/lib/mjs/NotificationContainer.js

@@ -3,6 +3,15 @@ import { NotificationAlign, NotificationMessageType, NotificationModalType, Noti
  * Notification container class
  */
 export class NotificationContainer {
+    /**
+     * Loading count
+     */
+    get loadingCount() {
+        return this._loadingCount;
+    }
+    set loadingCount(value) {
+        this._loadingCount = value;
+    }
     /**
      * Is loading bar showing
      */
@@ -19,7 +28,11 @@ export class NotificationContainer {
      * Constructor
      */
     constructor(update) {
-        this.loadingCount = 0;
+        this._loadingCount = 0;
+        /**
+         * Is debug mode
+         */
+        this.debug = false;
         // Update callback
         this.update = update;
         // Init notification collection
@@ -188,13 +201,23 @@ export class NotificationContainer {
      * @param force Force to hide, otherwise, only the last one
      */
     hideLoading(force) {
-        // Deduct to count
-        this.loadingCount--;
-        if (force)
+        if (this.lastLoading == null) {
+            // Reset count when no loading
             this.loadingCount = 0;
-        if (this.loadingCount === 0) {
-            this.lastLoading?.dismiss();
-            this.lastLoading = undefined;
+        }
+        else {
+            // Deduct to count
+            // Avoid negative result (-1)
+            if (this.loadingCount > 0) {
+                this.loadingCount--;
+            }
+            if (force)
+                this.loadingCount = 0;
+            // Hide the loading
+            if (this.loadingCount === 0) {
+                this.lastLoading.dismiss();
+                this.lastLoading = undefined;
+            }
         }
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/notificationbase",
-    "version": "1.1.45",
+    "version": "1.1.47",
     "description": "TypeScript notification component for extending with all features described and partially implemented",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/NotificationContainer.ts

@@ -39,6 +39,16 @@ export interface INotifier<UI, C extends NotificationCallProps> {
      */
     readonly isModeling: boolean;
 
+    /**
+     * Loading count
+     */
+    readonly loadingCount: number;
+
+    /**
+     * Is debug mode
+     */
+    debug: boolean;
+
     /**
      * Add notification
      * @param notification Notification
@@ -192,7 +202,23 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
 
     // Last loading
     private lastLoading?: INotification<UI, C>;
-    private loadingCount = 0;
+
+    private _loadingCount = 0;
+
+    /**
+     * Loading count
+     */
+    get loadingCount() {
+        return this._loadingCount;
+    }
+    private set loadingCount(value: number) {
+        this._loadingCount = value;
+    }
+
+    /**
+     * Is debug mode
+     */
+    debug: boolean = false;
 
     /**
      * Notification collection to display
@@ -430,14 +456,23 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
      * @param force Force to hide, otherwise, only the last one
      */
     hideLoading(force?: boolean) {
-        // Deduct to count
-        this.loadingCount--;
+        if (this.lastLoading == null) {
+            // Reset count when no loading
+            this.loadingCount = 0;
+        } else {
+            // Deduct to count
+            // Avoid negative result (-1)
+            if (this.loadingCount > 0) {
+                this.loadingCount--;
+            }
 
-        if (force) this.loadingCount = 0;
+            if (force) this.loadingCount = 0;
 
-        if (this.loadingCount === 0) {
-            this.lastLoading?.dismiss();
-            this.lastLoading = undefined;
+            // Hide the loading
+            if (this.loadingCount === 0) {
+                this.lastLoading.dismiss();
+                this.lastLoading = undefined;
+            }
         }
     }