Merge pull request #68 from CSFrequency/revert-55-loasing-state-empty-query

Revert "Preserve loading state"

Author: chrisbianca

firestore/useCollection.ts

@@ -18,24 +18,27 @@ export const useCollection = (
   >();
   const ref = useIsEqualRef(query, reset);
 
-  useEffect(() => {
-    if (!ref.current) {
-      reset();
-      return;
-    }
-    const listener =
-      options && options.snapshotListenOptions
-        ? ref.current.onSnapshot(
-            options.snapshotListenOptions,
-            setValue,
-            setError
-          )
-        : ref.current.onSnapshot(setValue, setError);
+  useEffect(
+    () => {
+      if (!ref.current) {
+        setValue(undefined);
+        return;
+      }
+      const listener =
+        options && options.snapshotListenOptions
+          ? ref.current.onSnapshot(
+              options.snapshotListenOptions,
+              setValue,
+              setError
+            )
+          : ref.current.onSnapshot(setValue, setError);
 
-    return () => {
-      listener();
-    };
-  }, [ref.current]);
+      return () => {
+        listener();
+      };
+    },
+    [ref.current]
+  );
 
   return [value, loading, error];
 };

firestore/useCollectionOnce.ts

@@ -18,16 +18,19 @@ export const useCollectionOnce = (
   >();
   const ref = useIsEqualRef(query, reset);
 
-  useEffect(() => {
-    if (!ref.current) {
-      reset();
-      return;
-    }
-    ref.current
-      .get(options ? options.getOptions : undefined)
-      .then(setValue)
-      .catch(setError);
-  }, [ref.current]);
+  useEffect(
+    () => {
+      if (!ref.current) {
+        setValue(undefined);
+        return;
+      }
+      ref.current
+        .get(options ? options.getOptions : undefined)
+        .then(setValue)
+        .catch(setError);
+    },
+    [ref.current]
+  );
 
   return [value, loading, error];
 };

firestore/useDocument.ts

@@ -18,24 +18,27 @@ export const useDocument = (
   >();
   const ref = useIsEqualRef(docRef, reset);
 
-  useEffect(() => {
-    if (!ref.current) {
-      reset();
-      return;
-    }
-    const listener =
-      options && options.snapshotListenOptions
-        ? ref.current.onSnapshot(
-            options.snapshotListenOptions,
-            setValue,
-            setError
-          )
-        : ref.current.onSnapshot(setValue, setError);
+  useEffect(
+    () => {
+      if (!ref.current) {
+        setValue(undefined);
+        return;
+      }
+      const listener =
+        options && options.snapshotListenOptions
+          ? ref.current.onSnapshot(
+              options.snapshotListenOptions,
+              setValue,
+              setError
+            )
+          : ref.current.onSnapshot(setValue, setError);
 
-    return () => {
-      listener();
-    };
-  }, [ref.current]);
+      return () => {
+        listener();
+      };
+    },
+    [ref.current]
+  );
 
   return [value, loading, error];
 };

firestore/useDocumentOnce.ts

@@ -18,16 +18,19 @@ export const useDocumentOnce = (
   >();
   const ref = useIsEqualRef(docRef, reset);
 
-  useEffect(() => {
-    if (!ref.current) {
-      reset();
-      return;
-    }
-    ref.current
-      .get(options ? options.getOptions : undefined)
-      .then(setValue)
-      .catch(setError);
-  }, [ref.current]);
+  useEffect(
+    () => {
+      if (!ref.current) {
+        setValue(undefined);
+        return;
+      }
+      ref.current
+        .get(options ? options.getOptions : undefined)
+        .then(setValue)
+        .catch(setError);
+    },
+    [ref.current]
+  );
 
   return [value, loading, error];
 };