atoms-state

Simple State management for react

c8aa1af1 — Peter John

fix useAsyncStorage

Files changed (3) hide show

index.d.ts CHANGED Viewed

@@ -52,4 +52,4 @@ declare namespace Storage {
   export function unsubscribe(key: string, cb: Function): void;
 }
-export function useAsyncStorage<T>(key: string, initial: T): [T, (v: T) => void, boolean];
+export function useAsyncStorage<T>(key: string, initial: T & { loading?: boolean }): [T, (v: T) => void];

index.js CHANGED Viewed

@@ -172,8 +172,10 @@ export const Storage = {
 };
 export const useAsyncStorage = (key, initialValue) => {
-  const [loading, setLoading] = useState(true);
-  const [storedValue, setStoredValue] = useState(initialValue);
+  const [storedValue, setStoredValue] = useState({
+    ...initialValue,
+    loading: true,
+  });
   const setData = async (v) => {
     await Storage.setItem(key, v);
   };
@@ -183,14 +185,13 @@ export const useAsyncStorage = (key, initialValue) => {
         if (v) {
           setData(v);
         }
-        setLoading(false);
       })
-      .catch(() => setLoading(false));
+      .catch(() => setStoredValue({ ...storedValue, loading: false }));
     return Storage.subscribe(key, (v) => {
       setStoredValue(v);
     });
   }, [key, JSON.stringify(initialValue)]);
-  return [storedValue || initialValue, setData, loading];
+  return [storedValue, setData];
 };
 export const fields = {};

package.json CHANGED Viewed

@@ -2,7 +2,7 @@
   "name": "atoms-state",
   "author": "pyros.sh",
   "description": "State management and common hooks",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "license": "MIT",
   "type": "module",
   "main": "index.js",