fix(useFetch): abort before updating state (#2805)

vueuse · Mar 4, 2023 · fff4532 · fff4532
1 parent ef281cd
commit fff4532
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/packages/core/useFetch/index.ts b/packages/core/useFetch/index.ts
@@ -357,9 +357,14 @@ export function useFetch<T>(url: MaybeComputedRef<string>, ...args: any[]): UseF
   let timer: Stoppable | undefined
 
   const abort = () => {
-    if (supportsAbort && controller) {
-      controller.abort()
-      controller = undefined
+    if (supportsAbort) {
+      controller?.abort()
+      controller = new AbortController()
+      controller.signal.onabort = () => aborted.value = true
+      fetchOptions = {
+        ...fetchOptions,
+        signal: controller.signal,
+      }
     }
   }
 
@@ -372,21 +377,13 @@ export function useFetch<T>(url: MaybeComputedRef<string>, ...args: any[]): UseF
     timer = useTimeoutFn(abort, timeout, { immediate: false })
 
   const execute = async (throwOnFailed = false) => {
+    abort()
+
     loading(true)
     error.value = null
     statusCode.value = null
     aborted.value = false
 
-    if (supportsAbort) {
-      abort()
-      controller = new AbortController()
-      controller.signal.onabort = () => aborted.value = true
-      fetchOptions = {
-        ...fetchOptions,
-        signal: controller.signal,
-      }
-    }
-
     const defaultFetchOptions: RequestInit = {
       method: config.method,
       headers: {},