Merge pull request #92 from gunnartorfis/revert-91-revert-89-fix/toas…

…t-dot-promise-rejected Revert "Revert "fix: await the promise to be able to catch its error and a toast"" 🙃
gunnartorfis · Sep 14, 2024 · b8a2554 · b8a2554
2 parents 278944d + 1d962fc
commit b8a2554
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 29 deletions.
diff --git a/example/src/ToastDemo.tsx b/example/src/ToastDemo.tsx
@@ -97,13 +97,30 @@ export const ToastDemo: React.FC = () => {
       />
       <Button title="Show outside of a React component" onPress={handleToast} />
       <Button
-        title="Toast with a promise"
+        title="Toast with a successful promise"
         onPress={() => {
           toast.promise(
             new Promise((resolve) => {
               setTimeout(() => {
                 resolve('Promise resolved');
-              }, 7000);
+              }, 2000);
+            }),
+            {
+              loading: 'Loading...',
+              success: (result: string) => `Promise resolved: ${result}`,
+              error: 'Promise failed',
+            }
+          );
+        }}
+      />
+      <Button
+        title="Toast with a failed promise"
+        onPress={() => {
+          toast.promise(
+            new Promise((_, reject) => {
+              setTimeout(() => {
+                reject('Promise rejected');
+              }, 2000);
             }),
             {
               loading: 'Loading...',

diff --git a/src/toast.tsx b/src/toast.tsx
@@ -189,44 +189,49 @@ export const Toast = React.forwardRef<ToastRef, ToastProps>(
     );
 
     React.useEffect(() => {
-      if (isResolvingPromise.current) {
-        return;
-      }
+      const handlePromise = async () => {
+        if (isResolvingPromise.current) {
+          return;
+        }
 
-      if (promiseOptions?.promise) {
-        try {
+        if (promiseOptions?.promise) {
           isResolvingPromise.current = true;
-          promiseOptions.promise.then((data) => {
+
+          try {
+            await promiseOptions.promise.then((data) => {
+              addToast({
+                title: promiseOptions.success(data) ?? 'Success',
+                id,
+                variant: 'success',
+                promiseOptions: undefined,
+              });
+            });
+          } catch (error) {
             addToast({
-              title: promiseOptions.success(data) ?? 'Success',
+              title: promiseOptions.error ?? 'Error',
               id,
-              variant: 'success',
+              variant: 'error',
               promiseOptions: undefined,
             });
+          } finally {
             isResolvingPromise.current = false;
-          });
-        } catch (error) {
-          addToast({
-            title: promiseOptions.error ?? 'Error',
-            id,
-            variant: 'error',
-            promiseOptions: undefined,
-          });
-          isResolvingPromise.current = false;
+          }
+
+          return;
         }
 
-        return;
-      }
+        if (duration === Infinity) {
+          return;
+        }
 
-      if (duration === Infinity) {
-        return;
-      }
+        // Start the timer only if it hasn't been started yet
+        if (!timerStart.current) {
+          timerStart.current = Date.now();
+          startTimer();
+        }
+      };
 
-      // Start the timer only if it hasn't been started yet
-      if (!timerStart.current) {
-        timerStart.current = Date.now();
-        startTimer();
-      }
+      handlePromise();
     }, [
       duration,
       id,