@majoo-ui/react 1.60.37-rc.2 → 1.60.37-rc.4

package/index.esm.js

@@ -7101,7 +7101,7 @@ const ToastProvider = ({
   translations
 }) => {
   console.warn({
-    translations
+    providerTranslations: translations
   });
   const isOnline = useNavigatorOnLine();
   const [toasts, setToasts] = useState([]);
@@ -7109,10 +7109,10 @@ const ToastProvider = ({
     t,
     i18n
   } = useTranslation(['MajooUI/toast', 'translation']);
-  const catchError$1 = useCallback((e, values) => {
+  const catchError$1 = useCallback((e, values, trans) => {
     let errorMsg = catchError(e);
-    if (translations && translations[errorMsg]) {
-      errorMsg = translations[errorMsg][i18n.language];
+    if (trans && trans[errorMsg]) {
+      errorMsg = trans[errorMsg][i18n.language];
     }
     if (values) {
       Object.keys(values).forEach(key => {
@@ -7120,13 +7120,13 @@ const ToastProvider = ({
       });
     }
     console.warn({
-      translations,
+      trans,
       e,
       errorMsg
     });
     return errorMsg;
   }, [translations, i18n.language]);
-  const createToastInstance = useCallback(toast => {
+  const createToastInstance = useCallback((toast, trans) => {
     const {
         id,
         disabledOfflineIntercept
@@ -7147,17 +7147,20 @@ const ToastProvider = ({
     console.warn({
       toast,
       isValidElement: /*#__PURE__*/React.isValidElement(toast.description),
-      translations
+      trans
     });
     return Object.assign({
       id: toastId,
       position: TOP_RIGHT_POSITION
     }, rest, {
-      description: /*#__PURE__*/React.isValidElement(toast.description) ? toast.description : catchError$1(toast.description, toast.values)
+      description: /*#__PURE__*/React.isValidElement(toast.description) ? toast.description : catchError$1(toast.description, toast.values, trans)
     }, !isOnline && !disabledOfflineIntercept && offlineInstance);
   }, [isOnline, t, translations, i18n.language]);
   const addToast = React.useCallback(toast => {
-    const toastInstance = createToastInstance(toast);
+    console.warn({
+      addToastTranslations: translations
+    });
+    const toastInstance = createToastInstance(toast, translations);
     setToasts(toastItems => {
       if (!toastItems.some(currToast => toast.id === currToast.id) || !toast.preventDuplicate) {
         return [...toastItems, toastInstance];
@@ -7165,7 +7168,7 @@ const ToastProvider = ({
       return toastItems;
     });
     return toastInstance;
-  }, [createToastInstance]);
+  }, [createToastInstance, translations]);
   const removeToast = React.useCallback(id => {
     setToasts(toastItems => toastItems.filter(t => t.id !== id));
   }, [setToasts]);
@@ -7177,7 +7180,7 @@ const ToastProvider = ({
     __self: undefined,
     __source: {
       fileName: _jsxFileName$R,
-      lineNumber: 85,
+      lineNumber: 86,
       columnNumber: 5
     }
   }, children, /*#__PURE__*/React.createElement(ToastContainer, {
@@ -7186,7 +7189,7 @@ const ToastProvider = ({
     __self: undefined,
     __source: {
       fileName: _jsxFileName$R,
-      lineNumber: 87,
+      lineNumber: 88,
       columnNumber: 7
     }
   }), /*#__PURE__*/React.createElement(ToastContainer, {
@@ -7195,7 +7198,7 @@ const ToastProvider = ({
     __self: undefined,
     __source: {
       fileName: _jsxFileName$R,
-      lineNumber: 91,
+      lineNumber: 92,
       columnNumber: 7
     }
   }), /*#__PURE__*/React.createElement(ToastContainer, {
@@ -7204,7 +7207,7 @@ const ToastProvider = ({
     __self: undefined,
     __source: {
       fileName: _jsxFileName$R,
-      lineNumber: 95,
+      lineNumber: 96,
       columnNumber: 7
     }
   }), /*#__PURE__*/React.createElement(ToastContainer, {
@@ -7213,7 +7216,7 @@ const ToastProvider = ({
     __self: undefined,
     __source: {
       fileName: _jsxFileName$R,
-      lineNumber: 99,
+      lineNumber: 100,
       columnNumber: 7
     }
   }));

package/index.umd.js

@@ -7193,7 +7193,7 @@
     translations
   }) => {
     console.warn({
-      translations
+      providerTranslations: translations
     });
     const isOnline = useNavigatorOnLine();
     const [toasts, setToasts] = React.useState([]);
@@ -7201,10 +7201,10 @@
       t,
       i18n
     } = reactI18next.useTranslation(['MajooUI/toast', 'translation']);
-    const catchError$1 = React.useCallback((e, values) => {
+    const catchError$1 = React.useCallback((e, values, trans) => {
       let errorMsg = catchError(e);
-      if (translations && translations[errorMsg]) {
-        errorMsg = translations[errorMsg][i18n.language];
+      if (trans && trans[errorMsg]) {
+        errorMsg = trans[errorMsg][i18n.language];
       }
       if (values) {
         Object.keys(values).forEach(key => {
@@ -7212,13 +7212,13 @@
         });
       }
       console.warn({
-        translations,
+        trans,
         e,
         errorMsg
       });
       return errorMsg;
     }, [translations, i18n.language]);
-    const createToastInstance = React.useCallback(toast => {
+    const createToastInstance = React.useCallback((toast, trans) => {
       const {
           id,
           disabledOfflineIntercept
@@ -7239,17 +7239,20 @@
       console.warn({
         toast,
         isValidElement: /*#__PURE__*/React__namespace.isValidElement(toast.description),
-        translations
+        trans
       });
       return Object.assign({
         id: toastId,
         position: TOP_RIGHT_POSITION
       }, rest, {
-        description: /*#__PURE__*/React__namespace.isValidElement(toast.description) ? toast.description : catchError$1(toast.description, toast.values)
+        description: /*#__PURE__*/React__namespace.isValidElement(toast.description) ? toast.description : catchError$1(toast.description, toast.values, trans)
       }, !isOnline && !disabledOfflineIntercept && offlineInstance);
     }, [isOnline, t, translations, i18n.language]);
     const addToast = React__namespace.useCallback(toast => {
-      const toastInstance = createToastInstance(toast);
+      console.warn({
+        addToastTranslations: translations
+      });
+      const toastInstance = createToastInstance(toast, translations);
       setToasts(toastItems => {
         if (!toastItems.some(currToast => toast.id === currToast.id) || !toast.preventDuplicate) {
           return [...toastItems, toastInstance];
@@ -7257,7 +7260,7 @@
         return toastItems;
       });
       return toastInstance;
-    }, [createToastInstance]);
+    }, [createToastInstance, translations]);
     const removeToast = React__namespace.useCallback(id => {
       setToasts(toastItems => toastItems.filter(t => t.id !== id));
     }, [setToasts]);
@@ -7269,7 +7272,7 @@
       __self: undefined,
       __source: {
         fileName: _jsxFileName$R,
-        lineNumber: 85,
+        lineNumber: 86,
         columnNumber: 5
       }
     }, children, /*#__PURE__*/React__namespace.createElement(ToastContainer, {
@@ -7278,7 +7281,7 @@
       __self: undefined,
       __source: {
         fileName: _jsxFileName$R,
-        lineNumber: 87,
+        lineNumber: 88,
         columnNumber: 7
       }
     }), /*#__PURE__*/React__namespace.createElement(ToastContainer, {
@@ -7287,7 +7290,7 @@
       __self: undefined,
       __source: {
         fileName: _jsxFileName$R,
-        lineNumber: 91,
+        lineNumber: 92,
         columnNumber: 7
       }
     }), /*#__PURE__*/React__namespace.createElement(ToastContainer, {
@@ -7296,7 +7299,7 @@
       __self: undefined,
       __source: {
         fileName: _jsxFileName$R,
-        lineNumber: 95,
+        lineNumber: 96,
         columnNumber: 7
       }
     }), /*#__PURE__*/React__namespace.createElement(ToastContainer, {
@@ -7305,7 +7308,7 @@
       __self: undefined,
       __source: {
         fileName: _jsxFileName$R,
-        lineNumber: 99,
+        lineNumber: 100,
         columnNumber: 7
       }
     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@majoo-ui/react",
-  "version": "1.60.37-rc.2",
+  "version": "1.60.37-rc.4",
   "dependencies": {
     "@majoo-ui/core": "^1.31.3",
     "@majoo-ui/helpers": "^1.30.5",