alternate solution: set lastOptions.current on watchfn

async-library · Oct 31, 2019 · 2f2e572 · 2f2e572
1 parent 17e2d54
commit 2f2e572
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/packages/react-async/src/useAsync.js b/packages/react-async/src/useAsync.js
@@ -97,11 +97,11 @@ const useAsync = (arg1, arg2) => {
         .then(handleResolve(counter.current))
         .catch(handleReject(counter.current))
     } else if (promiseFn && !isPreInitialized) {
-      start(() => promiseFn(options, abortController.current))
+      start(() => promiseFn(lastOptions.current, abortController.current))
         .then(handleResolve(counter.current))
         .catch(handleReject(counter.current))
     }
-  }, [initialValue, promise, promiseFn, start, handleResolve, handleReject, options])
+  }, [start, promise, promiseFn, initialValue, handleResolve, handleReject])
 
   const { deferFn } = options
   const run = useCallback(
@@ -132,7 +132,10 @@ const useAsync = (arg1, arg2) => {
   /* eslint-disable react-hooks/exhaustive-deps */
   const { watch, watchFn } = options
   useEffect(() => {
-    if (watchFn && lastOptions.current && watchFn(options, lastOptions.current)) load()
+    if (watchFn && lastOptions.current && watchFn(options, lastOptions.current)) {
+      lastOptions.current = options
+      load()
+    }
   })
   useEffect(() => {
     lastOptions.current = options