@sohanemon/utils 5.2.4 → 5.2.5

package/dist/hooks/async.d.ts

@@ -26,5 +26,5 @@ interface UseAsyncReturn<TData, TError extends Error = Error> {
  * @param options - Configuration options including callbacks
  * @returns Object with data, error, status and helper methods
  */
-export declare function useAsync<TData, TError extends Error = Error>(asyncFn: () => Promise<TData>, options?: UseAsyncOptions<TData, TError>): UseAsyncReturn<TData, TError>;
+export declare function useAsync<TData, TError extends Error = Error>(asyncFn: (signal: AbortSignal) => Promise<TData>, options?: UseAsyncOptions<TData, TError>): UseAsyncReturn<TData, TError>;
 export {};

package/dist/hooks/async.js

@@ -11,7 +11,7 @@ export function useAsync(asyncFn, options = {}) {
     const [data, setData] = React.useState(undefined);
     const [error, setError] = React.useState(undefined);
     const [status, setStatus] = React.useState('idle');
-    const isMountedRef = React.useRef(true);
+    const abortControllerRef = React.useRef(null);
     const memoizedOnSuccess = React.useCallback(onSuccess || (() => { }), [
         onSuccess,
     ]);
@@ -20,11 +20,16 @@ export function useAsync(asyncFn, options = {}) {
         onSettled,
     ]);
     const execute = React.useCallback(async () => {
+        if (abortControllerRef.current) {
+            abortControllerRef.current.abort();
+        }
+        abortControllerRef.current = new AbortController();
+        const signal = abortControllerRef.current.signal;
         setStatus('pending');
         setError(undefined);
         try {
-            const result = await asyncFn();
-            if (isMountedRef.current) {
+            const result = await asyncFn(signal);
+            if (!signal.aborted) {
                 setData(result);
                 setStatus('success');
                 await memoizedOnSuccess(result);
@@ -33,9 +38,12 @@ export function useAsync(asyncFn, options = {}) {
             return result;
         }
         catch (err) {
+            if (err instanceof Error && err.name === 'AbortError') {
+                return undefined;
+            }
             const error = err instanceof Error ? err : new Error(String(err));
             const typedError = error;
-            if (isMountedRef.current) {
+            if (!signal.aborted) {
                 setError(typedError);
                 setStatus('error');
                 await memoizedOnError(typedError);
@@ -45,20 +53,22 @@ export function useAsync(asyncFn, options = {}) {
         }
     }, [asyncFn, memoizedOnSuccess, memoizedOnError, memoizedOnSettled]);
     React.useEffect(() => {
-        if (mode === 'auto') {
+        if (mode === 'auto' && !deps) {
             execute();
         }
-    }, [asyncFn, mode, execute]);
-    React.useEffect(() => {
-        return () => {
-            isMountedRef.current = false;
-        };
-    }, []);
+    }, [asyncFn, mode, execute, deps]);
     React.useEffect(() => {
         if (deps && mode === 'auto') {
             execute();
         }
     }, deps ? deps : []);
+    React.useEffect(() => {
+        return () => {
+            if (abortControllerRef.current) {
+                abortControllerRef.current.abort();
+            }
+        };
+    }, []);
     return {
         data,
         error,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sohanemon/utils",
-  "version": "5.2.4",
+  "version": "5.2.5",
   "author": "Sohan Emon <sohanemon@outlook.com>",
   "description": "",
   "type": "module",