nurseitaly-components 0.0.4 → 0.0.5

package/dist/common/AppToast/AppToast.js

@@ -7,75 +7,79 @@ import 'react-toastify/dist/ReactToastify.css';
 import CommonContext from '../../configs/CommonContext';
 import { messageAction } from '../../configs/sessionTypes';
 import { EMPTY_TOAST } from './ToastMessage';
+const LOADING_TOAST_ID = 'loading';
+const MESSAGE_TOAST_ID = 'app-message';
+const MESSAGE_AUTO_CLOSE_MS = 5000;
 export default function AppToast() {
     const { t } = useTranslation('common');
     const { dispatch, state } = useContext(CommonContext);
-    const handleClose = () => {
-        toast.dismiss();
+    const clearMessage = () => {
         dispatch(messageAction(EMPTY_TOAST));
     };
+    const handleClose = () => {
+        toast.dismiss(MESSAGE_TOAST_ID);
+        clearMessage();
+    };
     const handleClipboard = () => {
         navigator.clipboard.writeText(state.message.value);
     };
     const getLoading = () => (_jsxs("div", { className: "d-flex", children: [_jsx(ReactLoading, { type: "spinningBubbles", color: "blue", height: 24, width: 24 }), _jsx("span", { className: "ms-3", children: state.toastLoadingText ?? t('generic.loading') })] }));
-    const attachCloseToEscape = () => {
+    useEffect(() => {
         const closeOnEscape = (e) => {
-            if (e.keyCode === 27)
+            if (e.key === 'Escape')
                 handleClose();
         };
         window.addEventListener('keydown', closeOnEscape);
         return () => window.removeEventListener('keydown', closeOnEscape);
-    };
-    useEffect(() => {
-        attachCloseToEscape();
     }, []);
     useEffect(() => {
         if (state.toastLoading) {
             toast(getLoading(), {
-                toastId: 'loading',
+                toastId: LOADING_TOAST_ID,
                 position: 'top-right',
                 autoClose: false,
-                hideProgressBar: false,
+                hideProgressBar: true,
                 closeOnClick: false,
                 pauseOnHover: true,
                 draggable: false,
-                progress: undefined,
                 theme: 'light',
             });
         }
         else {
-            toast.dismiss();
+            toast.dismiss(LOADING_TOAST_ID);
         }
     }, [state.toastLoading, state.toastLoadingText]);
     useEffect(() => {
-        if (state.message && state.message.value !== '') {
-            switch (state.message.type) {
-                case 'error':
-                    toast.error(state.message.value, {
-                        onClose: () => handleClose(),
-                        onClick: () => handleClipboard(),
-                    });
-                    break;
-                case 'warning':
-                    toast.warning(state.message.value, {
-                        onClose: () => handleClose(),
-                    });
-                    break;
-                case 'success':
-                    toast.success(state.message.value, {
-                        onClose: () => handleClose(),
-                    });
-                    break;
-                default:
-                    toast(state.message.value, {
-                        onClose: () => handleClose(),
-                    });
-                    break;
-            }
+        if (!state.message?.value) {
+            return;
         }
-        else {
-            dispatch(messageAction(EMPTY_TOAST));
+        const baseOptions = {
+            toastId: MESSAGE_TOAST_ID,
+            autoClose: MESSAGE_AUTO_CLOSE_MS,
+            closeOnClick: true,
+            pauseOnFocusLoss: false,
+            onClose: () => clearMessage(),
+        };
+        switch (state.message.type) {
+            case 'error':
+                toast.error(state.message.value, {
+                    ...baseOptions,
+                    onClick: () => handleClipboard(),
+                });
+                break;
+            case 'warning':
+                toast.warning(state.message.value, baseOptions);
+                break;
+            case 'success':
+                toast.success(state.message.value, {
+                    ...baseOptions,
+                    onClick: () => handleClose(),
+                });
+                break;
+            default:
+                toast(state.message.value, baseOptions);
+                break;
         }
     }, [state.message]);
-    return _jsx(ToastContainer, { closeOnClick: true });
+    return (_jsx(ToastContainer, { closeOnClick: true, autoClose: MESSAGE_AUTO_CLOSE_MS, pauseOnFocusLoss: false }));
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nurseitaly-components",
   "private": false,
-  "version": "0.0.4",
+  "version": "0.0.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {