@etsoo/notificationbase 1.1.24 → 1.1.26

package/lib/Notification.d.ts

@@ -200,9 +200,10 @@ export interface INotification<UI, C extends NotificationCallProps> extends INot
     /**
      * Dismiss it
      * @param delaySeconds Delay seconds
+     * @param noTrigger No onReturn trigger
      * @returns Is delayed or not
      */
-    dismiss(delaySeconds?: number): boolean;
+    dismiss(delaySeconds?: number, noTrigger?: boolean): boolean;
     /**
      * Dispose it
      */
@@ -300,9 +301,10 @@ export declare abstract class Notification<UI, C extends NotificationCallProps>
     /**
      * Dismiss it
      * @param delaySeconds Delay seconds
+     * @param noTrigger No onReturn trigger
      * @returns Is delayed or not
      */
-    dismiss(delaySeconds?: number): boolean;
+    dismiss(delaySeconds?: number, noTrigger?: boolean): boolean;
     private removeTimeout;
     /**
      * Dispose it

package/lib/Notification.js

@@ -88,9 +88,10 @@ export class Notification {
     /**
      * Dismiss it
      * @param delaySeconds Delay seconds
+     * @param noTrigger No onReturn trigger
      * @returns Is delayed or not
      */
-    dismiss(delaySeconds = 0) {
+    dismiss(delaySeconds = 0, noTrigger = false) {
         // If it's closed, return
         if (!this._open)
             return false;
@@ -101,7 +102,9 @@ export class Notification {
             return true;
         }
         // For message, call onReturn
-        if (this.onReturn != null && this.type in NotificationMessageType) {
+        if (!noTrigger &&
+            this.onReturn != null &&
+            this.type in NotificationMessageType) {
             this.onReturn(undefined);
         }
         // Indicate closed
@@ -136,6 +139,6 @@ export class Notification {
             if (result === false)
                 return;
         }
-        this.dismiss();
+        this.dismiss(0, true);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/notificationbase",
-    "version": "1.1.24",
+    "version": "1.1.26",
     "description": "TypeScript notification component for extending with all features described and partially implemented",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -45,18 +45,18 @@
     },
     "homepage": "https://github.com/ETSOO/NotificationBase#readme",
     "dependencies": {
-        "@etsoo/shared": "^1.1.89"
+        "@etsoo/shared": "^1.2.8"
     },
     "devDependencies": {
-        "@babel/core": "^7.21.0",
-        "@babel/plugin-transform-runtime": "^7.21.0",
-        "@babel/preset-env": "^7.20.2",
-        "@babel/runtime-corejs3": "^7.21.0",
-        "@types/jest": "^29.4.0",
-        "babel-jest": "^29.4.3",
-        "jest": "^29.4.3",
-        "jest-environment-jsdom": "^29.4.3",
-        "ts-jest": "^29.0.5",
-        "typescript": "^4.9.5"
+        "@babel/core": "^7.22.10",
+        "@babel/plugin-transform-runtime": "^7.22.10",
+        "@babel/preset-env": "^7.22.10",
+        "@babel/runtime-corejs3": "^7.22.10",
+        "@types/jest": "^29.5.3",
+        "babel-jest": "^29.6.2",
+        "jest": "^29.6.2",
+        "jest-environment-jsdom": "^29.6.2",
+        "ts-jest": "^29.1.1",
+        "typescript": "^5.1.6"
     }
 }

package/src/Notification.ts

@@ -232,9 +232,10 @@ export interface INotification<UI, C extends NotificationCallProps>
     /**
      * Dismiss it
      * @param delaySeconds Delay seconds
+     * @param noTrigger No onReturn trigger
      * @returns Is delayed or not
      */
-    dismiss(delaySeconds?: number): boolean;
+    dismiss(delaySeconds?: number, noTrigger?: boolean): boolean;
 
     /**
      * Dispose it
@@ -382,9 +383,10 @@ export abstract class Notification<UI, C extends NotificationCallProps>
     /**
      * Dismiss it
      * @param delaySeconds Delay seconds
+     * @param noTrigger No onReturn trigger
      * @returns Is delayed or not
      */
-    dismiss(delaySeconds: number = 0): boolean {
+    dismiss(delaySeconds: number = 0, noTrigger: boolean = false): boolean {
         // If it's closed, return
         if (!this._open) return false;
 
@@ -399,7 +401,11 @@ export abstract class Notification<UI, C extends NotificationCallProps>
         }
 
         // For message, call onReturn
-        if (this.onReturn != null && this.type in NotificationMessageType) {
+        if (
+            !noTrigger &&
+            this.onReturn != null &&
+            this.type in NotificationMessageType
+        ) {
             this.onReturn(undefined);
         }
 
@@ -449,6 +455,6 @@ export abstract class Notification<UI, C extends NotificationCallProps>
             const result = await this.onReturn(value);
             if (result === false) return;
         }
-        this.dismiss();
+        this.dismiss(0, true);
     }
 }