npm - @etsoo/notificationbase - Versions diffs - 1.0.96 → 1.1.0 - Mend

@etsoo/notificationbase 1.0.96 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/lib/Notification.d.ts +4 -10
package/lib/NotificationContainer.d.ts +3 -3
package/package.json +1 -1
package/src/Notification.ts +4 -15
package/src/NotificationContainer.ts +4 -5

package/lib/Notification.d.ts CHANGED Viewed

@@ -67,18 +67,12 @@ export interface NotifictionRenderSetup {
 }
 /**
  * On return callback
+ * T = string | undefined, Undefined value means cancel
  * return false will prevent default action
+ * return string is the error message to show
  */
 export interface NotificationReturn<T> {
-    (value: T): boolean | void | PromiseLike<boolean | void>;
-}
-/**
- * On prompt return callback
- * return false will prevent default action
- * return tuple second parameter is the error message to show
- */
-export interface NotificationPromptReturn<T> extends NotificationReturn<T> {
-    (value: T): boolean | [boolean, string?] | void | PromiseLike<boolean | [boolean, string?] | void>;
+    (value: T): boolean | string | void | PromiseLike<boolean | string | void>;
 }
 /**
  * Notification message parameters
@@ -251,7 +245,7 @@ export declare abstract class Notification<UI, C extends NotificationCallProps>
     /**
      * On return value
      */
-    onReturn?: NotificationReturn<any>;
+    onReturn?: NotificationReturn<unknown>;
     private _open;
     /**
      * Is open or not

package/lib/NotificationContainer.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { INotificaseBase, INotification, NotificationAlign, NotificationCallProps, NotificationContent, NotificationMessageType, NotificationParameters, NotificationPromptReturn, NotificationReturn } from './Notification';
+import { INotificaseBase, INotification, NotificationAlign, NotificationCallProps, NotificationContent, NotificationMessageType, NotificationParameters, NotificationReturn } from './Notification';
 /**
  * Notification action
  */
@@ -95,7 +95,7 @@ export interface INotifier<UI, C extends NotificationCallProps> {
      * @param title Title
      * @param props More properties
      */
-    prompt<T = string>(message: NotificationContent<UI>, callback: NotificationPromptReturn<T>, title?: NotificationContent<UI>, props?: C): INotification<UI, C>;
+    prompt<T = string | undefined>(message: NotificationContent<UI>, callback: NotificationReturn<T>, title?: NotificationContent<UI>, props?: C): INotification<UI, C>;
     /**
      * Show loading
      * @param title Title
@@ -218,7 +218,7 @@ export declare abstract class NotificationContainer<UI, C extends NotificationCa
      * @param title Title
      * @param props More properties
      */
-    prompt<T>(message: NotificationContent<UI>, callback: NotificationPromptReturn<T>, title?: string, props?: C): INotification<UI, C>;
+    prompt<T = string | undefined>(message: NotificationContent<UI>, callback: NotificationReturn<T>, title?: string, props?: C): INotification<UI, C>;
     /**
      * Show loading
      * @param title Title

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/notificationbase",
-    "version": "1.0.96",
+    "version": "1.1.0",
     "description": "TypeScript notification component for extending with all features described and partially implemented",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/Notification.ts CHANGED Viewed

@@ -71,23 +71,12 @@ export interface NotifictionRenderSetup {
 /**
  * On return callback
+ * T = string | undefined, Undefined value means cancel
  * return false will prevent default action
+ * return string is the error message to show
  */
 export interface NotificationReturn<T> {
-    (value: T): boolean | void | PromiseLike<boolean | void>;
-}
-/**
- * On prompt return callback
- * return false will prevent default action
- * return tuple second parameter is the error message to show
- */
-export interface NotificationPromptReturn<T> extends NotificationReturn<T> {
-    (value: T):
-        | boolean
-        | [boolean, string?]
-        | void
-        | PromiseLike<boolean | [boolean, string?] | void>;
+    (value: T): boolean | string | void | PromiseLike<boolean | string | void>;
 }
 /**
@@ -297,7 +286,7 @@ export abstract class Notification<UI, C extends NotificationCallProps>
     /**
      * On return value
      */
-    onReturn?: NotificationReturn<any>;
+    onReturn?: NotificationReturn<unknown>;
     private _open: boolean = true;
     /**

package/src/NotificationContainer.ts CHANGED Viewed

@@ -7,7 +7,6 @@ import {
     NotificationMessageType,
     NotificationModalType,
     NotificationParameters,
-    NotificationPromptReturn,
     NotificationReturn,
     NotificationType
 } from './Notification';
@@ -139,9 +138,9 @@ export interface INotifier<UI, C extends NotificationCallProps> {
      * @param title Title
      * @param props More properties
      */
-    prompt<T = string>(
+    prompt<T = string | undefined>(
         message: NotificationContent<UI>,
-        callback: NotificationPromptReturn<T>,
+        callback: NotificationReturn<T>,
         title?: NotificationContent<UI>,
         props?: C
     ): INotification<UI, C>;
@@ -456,9 +455,9 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
      * @param title Title
      * @param props More properties
      */
-    prompt<T>(
+    prompt<T = string | undefined>(
         message: NotificationContent<UI>,
-        callback: NotificationPromptReturn<T>,
+        callback: NotificationReturn<T>,
         title?: string,
         props?: C
     ) {