Merge pull request #943 from alibaba/fix/use-request-hrm

fix: useRequest support hrm
alibaba · May 8, 2021 · 6ccad56 · 6ccad56
2 parents f659b78 + bc901e2
commit 6ccad56
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/packages/use-request/src/useAsync.ts b/packages/use-request/src/useAsync.ts
@@ -31,9 +31,6 @@ class Fetch<R, P extends any[]> {
   // 请求时序
   count = 0;
 
-  // 是否卸载
-  unmountedFlag = false;
-
   // visible 后，是否继续轮询
   pollingWhenVisibleFlag = false;
 
@@ -133,7 +130,7 @@ class Fetch<R, P extends any[]> {
 
     return this.service(...args)
       .then((res) => {
-        if (this.unmountedFlag || currentCount !== this.count) {
+        if (currentCount !== this.count) {
           // prevent run.then when request is canceled
           return new Promise(() => {});
         }
@@ -152,7 +149,7 @@ class Fetch<R, P extends any[]> {
         return formattedResult;
       })
       .catch((error) => {
-        if (this.unmountedFlag || currentCount !== this.count) {
+        if (currentCount !== this.count) {
           // prevent run.then when request is canceled
           return new Promise(() => {});
         }
@@ -179,7 +176,7 @@ class Fetch<R, P extends any[]> {
         );
       })
       .finally(() => {
-        if (!this.unmountedFlag && currentCount === this.count) {
+        if (currentCount === this.count) {
           if (this.config.pollingInterval) {
             // 如果屏幕隐藏，并且 !pollingWhenHidden, 则停止轮询，并记录 flag，等 visible 时，继续轮询
             if (!isDocumentVisible() && !this.config.pollingWhenHidden) {
@@ -253,7 +250,6 @@ class Fetch<R, P extends any[]> {
   }
 
   unmount() {
-    this.unmountedFlag = true;
     this.cancel();
     this.unsubscribe.forEach((s) => {
       s();

diff --git a/packages/use-request/src/utils/useUpdateEffect.ts b/packages/use-request/src/utils/useUpdateEffect.ts
@@ -3,6 +3,12 @@ import { useEffect, useRef } from 'react';
 const useUpdateEffect: typeof useEffect = (effect, deps) => {
   const isMounted = useRef(false);
 
+  useEffect(() => {
+    return () => {
+      isMounted.current = false;
+    };
+  }, []);
+
   useEffect(() => {
     if (!isMounted.current) {
       isMounted.current = true;