fix infinit loop if map is used in useResult

tcastelly · Aug 27, 2024 · ac2d774 · ac2d774
1 parent 8215deb
commit ac2d774
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-use-async",
-  "version": "1.8.6",
+  "version": "1.8.7",
   "description": "Xhr and async helpers",
   "repository": {
     "type": "git",

diff --git a/src/useResult.ts b/src/useResult.ts
@@ -37,11 +37,15 @@ export default function <T, Z extends T, U = Res<T, Z>>(
     _res.value = map(defaultRes as Res<T, Z>);
   }
 
+  // prevent infinite loop because of _res/res changes
+  let disableWatch = false;
+
   watchEffect(() => {
     if (res) {
       const unWrapRes = unref<any>(res);
 
       if (unWrapRes !== undefined) {
+        disableWatch = true;
         _res.value = map?.(unWrapRes);
       }
     }
@@ -50,14 +54,17 @@ export default function <T, Z extends T, U = Res<T, Z>>(
   watch(
     () => _res.value,
     (v) => {
-      if (res.value === undefined) {
+      if (v === undefined || res.value === undefined) {
         return;
       }
 
-      if (v !== res.value) {
-        // @ts-ignore
-        res.value = new Result(v);
+      if (disableWatch) {
+        disableWatch = false;
+        return;
       }
+
+      // @ts-ignore
+      res.value = new Result(v);
     },
   );