From 3456d1b05e92f96e1c956351d90482614cb3327a Mon Sep 17 00:00:00 2001
From: qiang <qw13131wang@gmail.com>
Date: Mon, 4 Dec 2023 18:43:36 +0800
Subject: [PATCH] fix(useFetch): immediately modify the status after the
 request is completed (#3603)

Co-authored-by: Anthony Fu <anthonyfu117@hotmail.com>
---
 packages/core/useFetch/index.test.ts |   8 ++
 packages/core/useFetch/index.ts      | 119 +++++++++++++--------------
 2 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/packages/core/useFetch/index.test.ts b/packages/core/useFetch/index.test.ts
index 7c044b5d4bb..5e814ca71e3 100644
--- a/packages/core/useFetch/index.test.ts
+++ b/packages/core/useFetch/index.test.ts
@@ -734,4 +734,12 @@ describe.skipIf(isBelowNode18)('useFetch', () => {
       expect(fetchSpyHeaders()['Content-Type']).toBe(undefined)
     })
   })
+
+  it('should be modified the request status after the request is completed', async () => {
+    const { isFetching, isFinished, execute } = useFetch('https://example.com', { immediate: false })
+
+    await execute()
+    expect(isFetching.value).toBe(false)
+    expect(isFinished.value).toBe(true)
+  })
 })
diff --git a/packages/core/useFetch/index.ts b/packages/core/useFetch/index.ts
index a14fb6fdc59..6dde796daed 100644
--- a/packages/core/useFetch/index.ts
+++ b/packages/core/useFetch/index.ts
@@ -454,70 +454,67 @@ export function useFetch<T>(url: MaybeRefOrGetter<string>, ...args: any[]): UseF
     if (timer)
       timer.start()
 
-    return new Promise<Response | null>((resolve, reject) => {
-      fetch(
-        context.url,
-        {
-          ...defaultFetchOptions,
-          ...context.options,
-          headers: {
-            ...headersToObject(defaultFetchOptions.headers),
-            ...headersToObject(context.options?.headers),
-          },
+    return fetch(
+      context.url,
+      {
+        ...defaultFetchOptions,
+        ...context.options,
+        headers: {
+          ...headersToObject(defaultFetchOptions.headers),
+          ...headersToObject(context.options?.headers),
         },
-      )
-        .then(async (fetchResponse) => {
-          response.value = fetchResponse
-          statusCode.value = fetchResponse.status
-
-          responseData = await fetchResponse[config.type]()
-
-          // see: https://www.tjvantoll.com/2015/09/13/fetch-and-errors/
-          if (!fetchResponse.ok) {
-            data.value = initialData || null
-            throw new Error(fetchResponse.statusText)
-          }
-
-          if (options.afterFetch) {
-            ({ data: responseData } = await options.afterFetch({
-              data: responseData,
-              response: fetchResponse,
-            }))
-          }
+      },
+    )
+      .then(async (fetchResponse) => {
+        response.value = fetchResponse
+        statusCode.value = fetchResponse.status
+
+        responseData = await fetchResponse[config.type]()
+
+        // see: https://www.tjvantoll.com/2015/09/13/fetch-and-errors/
+        if (!fetchResponse.ok) {
+          data.value = initialData || null
+          throw new Error(fetchResponse.statusText)
+        }
+
+        if (options.afterFetch) {
+          ({ data: responseData } = await options.afterFetch({
+            data: responseData,
+            response: fetchResponse,
+          }))
+        }
+        data.value = responseData
+
+        responseEvent.trigger(fetchResponse)
+        return fetchResponse
+      })
+      .catch(async (fetchError) => {
+        let errorData = fetchError.message || fetchError.name
+
+        if (options.onFetchError) {
+          ({ error: errorData, data: responseData } = await options.onFetchError({
+            data: responseData,
+            error: fetchError,
+            response: response.value,
+          }))
+        }
+
+        error.value = errorData
+        if (options.updateDataOnError)
           data.value = responseData
 
-          responseEvent.trigger(fetchResponse)
-          return resolve(fetchResponse)
-        })
-        .catch(async (fetchError) => {
-          let errorData = fetchError.message || fetchError.name
-
-          if (options.onFetchError) {
-            ({ error: errorData, data: responseData } = await options.onFetchError({
-              data: responseData,
-              error: fetchError,
-              response: response.value,
-            }))
-          }
-
-          error.value = errorData
-          if (options.updateDataOnError)
-            data.value = responseData
-
-          errorEvent.trigger(fetchError)
-          if (throwOnFailed)
-            return reject(fetchError)
-
-          return resolve(null)
-        })
-        .finally(() => {
-          if (currentExecuteCounter === executeCounter)
-            loading(false)
-          if (timer)
-            timer.stop()
-          finallyEvent.trigger(null)
-        })
-    })
+        errorEvent.trigger(fetchError)
+        if (throwOnFailed)
+          throw fetchError
+        return null
+      })
+      .finally(() => {
+        if (currentExecuteCounter === executeCounter)
+          loading(false)
+        if (timer)
+          timer.stop()
+        finallyEvent.trigger(null)
+      })
   }
 
   const refetch = toRef(options.refetch)