Address some firestore typing issues. Fixes #120

Author: chrisbianca

firestore/useCollection.ts

@@ -13,44 +13,44 @@ import {
 import { useIsEqualRef, useLoadingValue } from '../util';
 
 export const useCollection = <T = firebase.firestore.DocumentData>(
-  query?: firebase.firestore.Query<T> | null,
+  query?: firebase.firestore.Query | null,
   options?: Options
 ): CollectionHook<T> => {
-  return useCollectionInternal(true, query, options);
+  return useCollectionInternal<T>(true, query, options);
 };
 
 export const useCollectionOnce = <T = firebase.firestore.DocumentData>(
   query?: firebase.firestore.Query<T> | null,
   options?: OnceOptions
 ): CollectionHook<T> => {
-  return useCollectionInternal(false, query, options);
+  return useCollectionInternal<T>(false, query, options);
 };
 
 export const useCollectionData = <
   T = firebase.firestore.DocumentData,
   IDField extends string = '',
   RefField extends string = ''
 >(
-  query?: firebase.firestore.Query<T> | null,
+  query?: firebase.firestore.Query | null,
   options?: DataOptions<T>
 ): CollectionDataHook<T, IDField, RefField> => {
-  return useCollectionDataInternal(true, query, options);
+  return useCollectionDataInternal<T, IDField, RefField>(true, query, options);
 };
 
 export const useCollectionDataOnce = <
   T = firebase.firestore.DocumentData,
   IDField extends string = '',
   RefField extends string = ''
 >(
-  query?: firebase.firestore.Query<T> | null,
+  query?: firebase.firestore.Query | null,
   options?: OnceDataOptions<T>
 ): CollectionDataHook<T, IDField, RefField> => {
-  return useCollectionDataInternal(false, query, options);
+  return useCollectionDataInternal<T, IDField, RefField>(false, query, options);
 };
 
 const useCollectionInternal = <T = firebase.firestore.DocumentData>(
   listen: boolean,
-  query?: firebase.firestore.Query<T> | null,
+  query?: firebase.firestore.Query | null,
   options?: Options & OnceOptions
 ) => {
   const { error, loading, reset, setError, setValue, value } = useLoadingValue<
@@ -99,7 +99,7 @@ const useCollectionDataInternal = <
   RefField extends string = ''
 >(
   listen: boolean,
-  query?: firebase.firestore.Query<T> | null,
+  query?: firebase.firestore.Query | null,
   options?: DataOptions<T> & OnceDataOptions<T>
 ): CollectionDataHook<T, IDField, RefField> => {
   const idField = options ? options.idField : undefined;

firestore/useDocument.ts

@@ -1,5 +1,5 @@
 import firebase from 'firebase/app';
-import { useEffect, useMemo } from 'react';
+import { Ref, useEffect, useMemo } from 'react';
 import { snapshotToData } from './helpers';
 import {
   Data,
@@ -13,44 +13,44 @@ import {
 import { useIsEqualRef, useLoadingValue } from '../util';
 
 export const useDocument = <T = firebase.firestore.DocumentData>(
-  docRef?: firebase.firestore.DocumentReference<T> | null,
+  docRef?: firebase.firestore.DocumentReference | null,
   options?: Options
 ): DocumentHook<T> => {
-  return useDocumentInternal(true, docRef, options);
+  return useDocumentInternal<T>(true, docRef, options);
 };
 
 export const useDocumentOnce = <T = firebase.firestore.DocumentData>(
-  docRef?: firebase.firestore.DocumentReference<T> | null,
+  docRef?: firebase.firestore.DocumentReference | null,
   options?: OnceOptions
 ): DocumentHook<T> => {
-  return useDocumentInternal(false, docRef, options);
+  return useDocumentInternal<T>(false, docRef, options);
 };
 
 export const useDocumentData = <
   T = firebase.firestore.DocumentData,
   IDField extends string = '',
   RefField extends string = ''
 >(
-  docRef?: firebase.firestore.DocumentReference<T> | null,
+  docRef?: firebase.firestore.DocumentReference | null,
   options?: DataOptions<T>
 ): DocumentDataHook<T, IDField, RefField> => {
-  return useDocumentDataInternal(true, docRef, options);
+  return useDocumentDataInternal<T, IDField, RefField>(true, docRef, options);
 };
 
 export const useDocumentDataOnce = <
   T = firebase.firestore.DocumentData,
   IDField extends string = '',
   RefField extends string = ''
 >(
-  docRef?: firebase.firestore.DocumentReference<T> | null,
+  docRef?: firebase.firestore.DocumentReference | null,
   options?: OnceDataOptions<T>
 ): DocumentDataHook<T, IDField, RefField> => {
-  return useDocumentDataInternal(false, docRef, options);
+  return useDocumentDataInternal<T, IDField, RefField>(false, docRef, options);
 };
 
 const useDocumentInternal = <T = firebase.firestore.DocumentData>(
   listen: boolean,
-  docRef?: firebase.firestore.DocumentReference<T> | null,
+  docRef?: firebase.firestore.DocumentReference | null,
   options?: Options & OnceOptions
 ): DocumentHook<T> => {
   const { error, loading, reset, setError, setValue, value } = useLoadingValue<
@@ -99,7 +99,7 @@ const useDocumentDataInternal = <
   RefField extends string = ''
 >(
   listen: boolean,
-  docRef?: firebase.firestore.DocumentReference<T> | null,
+  docRef?: firebase.firestore.DocumentReference | null,
   options?: DataOptions<T>
 ): DocumentDataHook<T, IDField, RefField> => {
   const idField = options ? options.idField : undefined;