make useLoading track unmounts

swyxio · Apr 28, 2019 · e4d4181 · e4d4181
1 parent 25807d6
commit e4d4181
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/index.tsx b/src/index.tsx
@@ -159,13 +159,18 @@ export function useCheckInput(
 
 export function useLoading() {
   const [isLoading, setState] = React.useState(false)
+  const mount = React.useRef(false)
+  React.useEffect(() => {
+    mount.current = true
+    return () => void (mount.current = false)
+  }, [])
   const load = (aPromise: Promise<any>) => {
     setState(true)
     return aPromise.finally(() => {
-      setState(false)
+      if (mount.current) setState(false)
     })
   }
-  return [isLoading, load] as [boolean, <T>(aPromise: Promise<T>) => Promise<T>]
+  return [isLoading, load] as const
 }
 
 export function useKeydown(key: string, handler: Function) {