Return toastId when calling toastr

bigbinary · May 7, 2024 · 9122428 · 9122428
1 parent 7837bcc
commit 9122428
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 29 deletions.
diff --git a/src/components/Toastr/index.jsx b/src/components/Toastr/index.jsx
@@ -73,27 +73,27 @@ const withUniqueCheck =
       customConfig = {},
     } = parseToastrConfig(toastrConfig);
 
+    let toastId = null;
+
     if (toastrList.add({ type, message, buttonLabel })) {
       const config = {
         ...TOAST_CONFIG,
         icon: TOAST_ICON[type],
         onClose: () => toastrList.remove({ type, message, buttonLabel }),
         ...customConfig,
       };
-      toastFunc({ message, buttonLabel, onClick, config });
+
+      toastId = toastFunc({ message, buttonLabel, onClick, config });
     }
+
+    return toastId;
   };
 
 const showSuccessToastr = withUniqueCheck(
   "success",
   ({ message, buttonLabel, onClick, config }) =>
     toast.success(
-      <Toast
-        buttonLabel={buttonLabel}
-        message={message}
-        type="success"
-        onClick={onClick}
-      />,
+      <Toast {...{ buttonLabel, message, onClick }} type="success" />,
       config
     )
 );
@@ -102,12 +102,7 @@ const showInfoToastr = withUniqueCheck(
   "info",
   ({ message, buttonLabel, onClick, config }) =>
     toast.info(
-      <Toast
-        buttonLabel={buttonLabel}
-        message={message}
-        type="info"
-        onClick={onClick}
-      />,
+      <Toast {...{ buttonLabel, message, onClick }} type="info" />,
       config
     )
 );
@@ -116,12 +111,7 @@ const showWarningToastr = withUniqueCheck(
   "warning",
   ({ message, buttonLabel, onClick, config }) =>
     toast.warning(
-      <Toast
-        buttonLabel={buttonLabel}
-        message={message}
-        type="warning"
-        onClick={onClick}
-      />,
+      <Toast {...{ buttonLabel, message, onClick }} type="warning" />,
       config
     )
 );
@@ -194,12 +184,7 @@ const withParsedErrorMsg =
 const showErrorToastr = withParsedErrorMsg(
   withUniqueCheck("error", ({ message, buttonLabel, onClick, config }) =>
     toast.error(
-      <Toast
-        buttonLabel={buttonLabel}
-        message={message}
-        type="error"
-        onClick={onClick}
-      />,
+      <Toast {...{ buttonLabel, message, onClick }} type="error" />,
       config
     )
   )

diff --git a/tests/Toastr.test.jsx b/tests/Toastr.test.jsx
@@ -15,7 +15,7 @@ const renderToastrButton = (
   render(
     <>
       <ToastContainer />
-      <Button label={`${type} Toastr`} onClick={onClick} />
+      <Button {...{ onClick }} label={`${type} Toastr`} />
     </>
   );
 
@@ -40,7 +40,7 @@ const renderCustomConfigToastrButton = type => {
   render(
     <>
       <ToastContainer />
-      <Button label={`${type} Toastr`} onClick={onClick} />
+      <Button {...{ onClick }} label={`${type} Toastr`} />
     </>
   );
 
@@ -52,7 +52,7 @@ const renderCustomMessageToastrButton = (type, message) => {
   render(
     <>
       <ToastContainer />
-      <Button label={`${type} Toastr`} onClick={onClick} />
+      <Button {...{ onClick }} label={`${type} Toastr`} />
     </>
   );
 
@@ -374,4 +374,9 @@ describe("Toastr", () => {
     const expectedMessage = "This is a Error toastr.";
     testToastrErrorMessages(errorResponse, expectedMessage);
   });
+
+  it("should return toastId when toastr is called", () => {
+    const toastId = Toastr.success("This is a success toastr.");
+    expect(toastId).toBeDefined();
+  });
 });
diff --git a/types/Toastr.d.ts b/types/Toastr.d.ts
@@ -14,7 +14,7 @@ const Toastr: {
     message: React.ReactNode | Error,
     buttonLabel?: React.ReactNode,
     onClick?: () => void
-  ) => void;
+  ) => string | null;
   warning: ToastrFunction;
 };
 export default Toastr;