@etsoo/notificationbase 1.1.46 → 1.1.48

package/lib/cjs/NotificationContainer.js

@@ -204,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.js

@@ -201,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.46",
+    "version": "1.1.48",
     "description": "TypeScript notification component for extending with all features described and partially implemented",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,18 +52,18 @@
     },
     "homepage": "https://github.com/ETSOO/NotificationBase#readme",
     "dependencies": {
-        "@etsoo/shared": "^1.2.44"
+        "@etsoo/shared": "^1.2.46"
     },
     "devDependencies": {
-        "@babel/core": "^7.25.2",
-        "@babel/plugin-transform-runtime": "^7.24.7",
-        "@babel/preset-env": "^7.25.3",
-        "@babel/runtime-corejs3": "^7.25.0",
-        "@types/jest": "^29.5.12",
+        "@babel/core": "^7.25.7",
+        "@babel/plugin-transform-runtime": "^7.25.7",
+        "@babel/preset-env": "^7.25.7",
+        "@babel/runtime-corejs3": "^7.25.7",
+        "@types/jest": "^29.5.13",
         "babel-jest": "^29.7.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "ts-jest": "^29.2.4",
-        "typescript": "^5.5.4"
+        "ts-jest": "^29.2.5",
+        "typescript": "^5.6.2"
     }
 }

package/src/NotificationContainer.ts

@@ -456,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;
+            }
         }
     }