chore: don't call cancel if there's no promise

pikax · Aug 15, 2020 · df560fc · df560fc
1 parent 75955ac
commit df560fc
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/packages/vue-composable/__tests__/web/fetch.spec.ts b/packages/vue-composable/__tests__/web/fetch.spec.ts
@@ -362,4 +362,22 @@ describe("fetch", () => {
     destroy();
     expect(isCancelled.value).toBe(true);
   });
+
+  it("should not cancel on unmount if there's no promise", () => {
+    let isCancelled: Ref<boolean> = undefined as any;
+
+    const { mount, destroy } = createVue({
+      template: `<div></div>`,
+      setup() {
+        isCancelled = useFetch().isCancelled;
+      }
+    });
+
+    mount();
+
+    expect(isCancelled.value).toBe(false);
+
+    destroy();
+    expect(isCancelled.value).toBe(false);
+  });
 });
diff --git a/packages/vue-composable/src/web/fetch.ts b/packages/vue-composable/src/web/fetch.ts
@@ -172,7 +172,11 @@ export function useFetch<T = any>(
   }
 
   if (unmountCancel && getCurrentInstance()) {
-    onUnmounted(() => cancel("unmounted"));
+    onUnmounted(() => {
+      if (abortController) {
+        cancel("unmounted");
+      }
+    });
   }
 
   return {