@etsoo/notificationbase 1.0.92 → 1.0.96

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

@@ -72,6 +72,14 @@ export interface NotifictionRenderSetup {
 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>;
+}
 /**
  * Notification message parameters
  */
@@ -100,7 +108,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

@@ -1,4 +1,4 @@
-import { INotificaseBase, INotification, NotificationAlign, NotificationCallProps, NotificationContent, NotificationMessageType, NotificationParameters, NotificationReturn } from './Notification';
+import { INotificaseBase, INotification, NotificationAlign, NotificationCallProps, NotificationContent, NotificationMessageType, NotificationParameters, NotificationPromptReturn, NotificationReturn } from './Notification';
 /**
  * Notification action
  */
@@ -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
@@ -93,7 +95,7 @@ export interface INotifier<UI, C extends NotificationCallProps> {
      * @param title Title
      * @param props More properties
      */
-    prompt<T = string>(message: NotificationContent<UI>, callback: NotificationReturn<T>, title?: NotificationContent<UI>, props?: C): INotification<UI, C>;
+    prompt<T = string>(message: NotificationContent<UI>, callback: NotificationPromptReturn<T>, title?: NotificationContent<UI>, props?: C): INotification<UI, C>;
     /**
      * Show loading
      * @param title Title
@@ -183,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
@@ -196,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
@@ -214,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: NotificationReturn<T>, title?: string, props?: C): INotification<UI, C>;
+    prompt<T>(message: NotificationContent<UI>, callback: NotificationPromptReturn<T>, title?: string, props?: C): INotification<UI, C>;
     /**
      * Show loading
      * @param title Title

package/lib/NotificationContainer.js

@@ -38,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);
@@ -140,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
@@ -174,11 +175,14 @@ export class NotificationContainer {
     }
     /**
      * Hide loading
+     * @param force Force to hide, otherwise, only the last one
      */
-    hideLoading() {
+    hideLoading(force) {
         var _a;
         // 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;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/notificationbase",
-    "version": "1.0.92",
+    "version": "1.0.96",
     "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.65"
+        "@etsoo/shared": "^1.0.97"
     },
     "devDependencies": {
-        "@babel/core": "^7.16.0",
-        "@babel/plugin-transform-runtime": "^7.16.0",
-        "@babel/preset-env": "^7.16.0",
-        "@babel/runtime-corejs3": "^7.16.0",
-        "@types/jest": "^27.0.2",
-        "@typescript-eslint/eslint-plugin": "^5.2.0",
-        "@typescript-eslint/parser": "^5.2.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.7",
+        "@babel/plugin-transform-runtime": "^7.16.7",
+        "@babel/preset-env": "^7.16.7",
+        "@babel/runtime-corejs3": "^7.16.7",
+        "@types/jest": "^27.4.0",
+        "@typescript-eslint/eslint-plugin": "^5.8.1",
+        "@typescript-eslint/parser": "^5.8.1",
+        "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

@@ -77,6 +77,19 @@ 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>;
+}
+
 /**
  * Notification message parameters
  */
@@ -110,7 +123,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

@@ -7,6 +7,7 @@ import {
     NotificationMessageType,
     NotificationModalType,
     NotificationParameters,
+    NotificationPromptReturn,
     NotificationReturn,
     NotificationType
 } from './Notification';
@@ -50,11 +51,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 +112,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
@@ -137,7 +141,7 @@ export interface INotifier<UI, C extends NotificationCallProps> {
      */
     prompt<T = string>(
         message: NotificationContent<UI>,
-        callback: NotificationReturn<T>,
+        callback: NotificationPromptReturn<T>,
         title?: NotificationContent<UI>,
         props?: C
     ): INotification<UI, C>;
@@ -233,7 +237,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(
@@ -349,19 +353,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);
     }
 
     /**
@@ -392,11 +402,14 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
 
     /**
      * Hide loading
+     * @param force Force to hide, otherwise, only the last one
      */
-    hideLoading() {
+    hideLoading(force?: boolean) {
         // Deduct to count
         this.loadingCount--;
 
+        if (force) this.loadingCount = 0;
+
         if (this.loadingCount === 0) {
             this.lastLoading?.dismiss();
             this.lastLoading = undefined;
@@ -445,7 +458,7 @@ export abstract class NotificationContainer<UI, C extends NotificationCallProps>
      */
     prompt<T>(
         message: NotificationContent<UI>,
-        callback: NotificationReturn<T>,
+        callback: NotificationPromptReturn<T>,
         title?: string,
         props?: C
     ) {