react-query-firebase 2.0.0-rc8 → 2.0.2

package/package.json

@@ -73,5 +73,5 @@
         "docs:build": "vitepress build docs",
         "docs:preview": "vitepress preview docs"
     },
-    "version": "2.0.0-rc8"
+    "version": "2.0.2"
 }

package/react-native/analytics/useLogEvent.js

@@ -14,7 +14,7 @@ export const useLogEvent = ({ eventName, eventParams }) => {
         if (analytics) {
             logEvent(analytics, eventName, eventParams);
         }
-    }, [eventName, eventParams]);
+    }, [eventName, eventParams, analytics]);
     return useMemo(() => ({
         logEvent: logEventCallback
     }), [logEventCallback]);

package/react-native/analytics/useLogEvent.ts

@@ -23,7 +23,7 @@ export const useLogEvent = ({ eventName, eventParams }: UseLogEventOptions) => {
         if (analytics) {
             logEvent(analytics, eventName, eventParams);
         }
-    }, [eventName, eventParams]);
+    }, [eventName, eventParams, analytics]);
 
     return useMemo(
         () => ({

package/react-native/analytics/useSetAnalyticsCollectionEnabled.js

@@ -12,5 +12,5 @@ export const useSetAnalyticsCollectionEnabled = ({ enabled = false }) => {
         if (analytics) {
             setAnalyticsCollectionEnabled(analytics, enabled);
         }
-    }, [analytics]);
+    }, [analytics, enabled]);
 };

package/react-native/analytics/useSetAnalyticsCollectionEnabled.ts

@@ -18,5 +18,5 @@ export const useSetAnalyticsCollectionEnabled = ({ enabled = false }: UseSetAnal
         if (analytics) {
             setAnalyticsCollectionEnabled(analytics, enabled);
         }
-    }, [analytics]);
+    }, [analytics, enabled]);
 };

package/react-native/auth/useIdToken.js

@@ -35,17 +35,17 @@ export const useIdToken = () => {
         }
         const idToken = await currentUser.getIdToken();
         setIdToken(idToken);
-    }, [currentUser, idToken]);
+    }, [currentUser]);
     const refresh = useCallback(async () => {
         if (!currentUser) {
             return;
         }
         const idToken = await currentUser.getIdToken(true);
         return idToken;
-    }, [currentUser, idToken]);
+    }, [currentUser]);
     useEffect(() => {
         callback();
-    }, [currentUser?.uid ?? ""]);
+    }, [callback]);
     useEffect(() => {
         const unsubscribe = onIdTokenChanged(auth, (user) => {
             if (user) {
@@ -58,7 +58,7 @@ export const useIdToken = () => {
             }
         });
         return () => unsubscribe();
-    }, [idToken]);
+    }, [auth]);
     return {
         idToken,
         refresh

package/react-native/auth/useIdToken.ts

@@ -47,7 +47,7 @@ export const useIdToken = (): UseIdTokenResult => {
 
         const idToken = await currentUser.getIdToken();
         setIdToken(idToken);
-    }, [currentUser, idToken]);
+    }, [currentUser]);
 
     const refresh = useCallback(async () => {
         if (!currentUser) {
@@ -56,11 +56,11 @@ export const useIdToken = (): UseIdTokenResult => {
 
         const idToken = await currentUser.getIdToken(true);
         return idToken;
-    }, [currentUser, idToken]);
+    }, [currentUser]);
 
     useEffect(() => {
         callback();
-    }, [currentUser?.uid ?? ""]);
+    }, [callback]);
 
     useEffect(() => {
         const unsubscribe = onIdTokenChanged(auth, (user: FirebaseAuthTypes.User) => {
@@ -74,7 +74,7 @@ export const useIdToken = (): UseIdTokenResult => {
         });
 
         return () => unsubscribe();
-    }, [idToken]);
+    }, [auth]);
 
     return {
         idToken,

package/react-native/context/FirebaseContext.d.ts

@@ -1,5 +1,5 @@
 import { firebase } from "@react-native-firebase/auth";
-type FirebaseContextValue = {
+export type FirebaseContextValue = {
     auth: ReturnType<typeof firebase.auth>;
     analytics: ReturnType<typeof firebase.analytics>;
     firebase: ReturnType<typeof firebase.app>;
@@ -12,4 +12,3 @@ type FirebaseContextValue = {
  * @internal
  */
 export declare const FirebaseContext: import("react").Context<FirebaseContextValue>;
-export {};

package/react-native/context/FirebaseContext.ts

@@ -4,7 +4,7 @@ import { createContext } from "react";
 
 import { firebase } from "@react-native-firebase/auth";
 
-type FirebaseContextValue = {
+export type FirebaseContextValue = {
     auth: ReturnType<typeof firebase.auth>;
     analytics: ReturnType<typeof firebase.analytics>;
     firebase: ReturnType<typeof firebase.app>;

package/react-native/context/FirebaseContextProvider.js

@@ -3,7 +3,7 @@ import { FirebaseContext } from "./FirebaseContext";
 import { connectAuthEmulator } from "@react-native-firebase/auth";
 import { setAnalyticsCollectionEnabled, setConsent } from "@react-native-firebase/analytics";
 import { connectFirestoreEmulator } from "@react-native-firebase/firestore";
-import firebase, { initializeApp } from "@react-native-firebase/app";
+import firebase from "@react-native-firebase/app";
 /**
  * FirebaseContextProvider component configures and provides Firebase services to its children.
  * Initializes Firebase app and enables optional Firebase services such as Firestore, Auth, Analytics,
@@ -27,10 +27,8 @@ import firebase, { initializeApp } from "@react-native-firebase/app";
  * };
  * ```
  */
-export const FirebaseContextProvider = ({ platform, emulators, options, children, authEnabled = true, firestoreEnabled = true, analyticsEnabled = true, consentSettings = {}, remoteConfigEnabled = true, remoteConfigSettings, remoteConfigDefaults = {}, firestoreSettings }) => {
-    const internalFirebase = useMemo(() => {
-        return platform === "Web" ? initializeApp(options) : firebase;
-    }, [options]);
+export const FirebaseContextProvider = ({ emulators, options, children, authEnabled = true, firestoreEnabled = true, analyticsEnabled = true, consentSettings = {}, remoteConfigEnabled = true, remoteConfigSettings, remoteConfigDefaults = {}, firestoreSettings }) => {
+    const internalFirebase = useMemo(() => firebase, []);
     useEffect(() => {
         setConsent(firebase.analytics(), {
             ad_personalization: false,
@@ -42,16 +40,20 @@ export const FirebaseContextProvider = ({ platform, emulators, options, children
             security_storage: false,
             ...consentSettings
         });
-    }, [consentSettings, firebase]);
+    }, [consentSettings]);
     const internalFirestore = useMemo(() => {
         if (firestoreEnabled) {
             if (emulators?.firestore?.host && emulators?.firestore?.port) {
                 connectFirestoreEmulator(internalFirebase.firestore(), emulators.firestore.host, emulators.firestore.port);
             }
-            return internalFirebase.firestore();
+            const localFirestore = internalFirebase.firestore();
+            if (firestoreSettings) {
+                localFirestore.settings(firestoreSettings);
+            }
+            return localFirestore;
         }
         return null;
-    }, [firestoreSettings, emulators?.firestore, firestoreEnabled, internalFirebase]);
+    }, [emulators?.firestore, firestoreEnabled, internalFirebase, firestoreSettings]);
     const internalAuth = useMemo(() => {
         if (authEnabled) {
             const localAuth = internalFirebase.auth();
@@ -65,15 +67,13 @@ export const FirebaseContextProvider = ({ platform, emulators, options, children
         return null;
     }, [emulators?.auth, authEnabled, internalFirebase]);
     const internalAnalytics = useMemo(() => {
-        if (analyticsEnabled &&
-            options.measurementId &&
-            (typeof window !== "undefined" || platform === "ReactNative")) {
+        if (analyticsEnabled && options.measurementId) {
             return internalFirebase.analytics();
         }
         return null;
     }, [analyticsEnabled, options.measurementId, internalFirebase]);
     const internalRemoteConfig = useMemo(() => {
-        if (remoteConfigEnabled && (typeof window !== "undefined" || platform === "ReactNative")) {
+        if (remoteConfigEnabled) {
             const localRemoteConfig = internalFirebase.remoteConfig();
             if (remoteConfigSettings) {
                 localRemoteConfig.settings.fetchTimeMillis = remoteConfigSettings.fetchTimeMillis;
@@ -83,7 +83,7 @@ export const FirebaseContextProvider = ({ platform, emulators, options, children
             return localRemoteConfig;
         }
         return null;
-    }, [remoteConfigEnabled, remoteConfigSettings, internalFirebase]);
+    }, [remoteConfigEnabled, remoteConfigSettings, internalFirebase, remoteConfigDefaults]);
     const contextValue = useMemo(() => ({
         firebase: internalFirebase,
         auth: internalAuth,
@@ -95,6 +95,6 @@ export const FirebaseContextProvider = ({ platform, emulators, options, children
         if (contextValue.analytics) {
             setAnalyticsCollectionEnabled(contextValue.analytics, !!consentSettings?.analytics_storage);
         }
-    }, [consentSettings]);
+    }, [consentSettings, contextValue.analytics]);
     return (React.createElement(FirebaseContext.Provider, { value: contextValue }, children));
 };

package/react-native/context/FirebaseContextProvider.tsx

@@ -1,10 +1,10 @@
 import React, { PropsWithChildren, useEffect, useMemo } from "react";
-import { FirebaseContext } from "./FirebaseContext";
+import { FirebaseContext, FirebaseContextValue } from "./FirebaseContext";
 import { connectAuthEmulator } from "@react-native-firebase/auth";
 import { FirebaseAnalyticsTypes, setAnalyticsCollectionEnabled, setConsent } from "@react-native-firebase/analytics";
 import { FirebaseRemoteConfigTypes } from "@react-native-firebase/remote-config";
 import { connectFirestoreEmulator } from "@react-native-firebase/firestore";
-import firebase, { ReactNativeFirebase, initializeApp } from "@react-native-firebase/app";
+import firebase, { ReactNativeFirebase } from "@react-native-firebase/app";
 
 /**
  * @inline
@@ -150,7 +150,6 @@ export type FirebaseContextProviderProps = PropsWithChildren & {
  * ```
  */
 export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = ({
-    platform,
     emulators,
     options,
     children,
@@ -163,9 +162,7 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
     remoteConfigDefaults = {},
     firestoreSettings
 }) => {
-    const internalFirebase = useMemo(() => {
-        return platform === "Web" ? initializeApp(options) : firebase;
-    }, [options]);
+    const internalFirebase = useMemo(() => firebase, []);
 
     useEffect(() => {
         setConsent(firebase.analytics(), {
@@ -178,7 +175,7 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
             security_storage: false,
             ...consentSettings
         });
-    }, [consentSettings, firebase]);
+    }, [consentSettings]);
 
     const internalFirestore = useMemo(() => {
         if (firestoreEnabled) {
@@ -190,11 +187,15 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
                 );
             }
 
-            return internalFirebase.firestore();
+            const localFirestore = internalFirebase.firestore();
+            if (firestoreSettings) {
+                localFirestore.settings(firestoreSettings);
+            }
+            return localFirestore;
         }
 
         return null;
-    }, [firestoreSettings, emulators?.firestore, firestoreEnabled, internalFirebase]);
+    }, [emulators?.firestore, firestoreEnabled, internalFirebase, firestoreSettings]);
 
     const internalAuth = useMemo(() => {
         if (authEnabled) {
@@ -210,18 +211,14 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
     }, [emulators?.auth, authEnabled, internalFirebase]);
 
     const internalAnalytics = useMemo(() => {
-        if (
-            analyticsEnabled &&
-            options.measurementId &&
-            (typeof window !== "undefined" || platform === "ReactNative")
-        ) {
+        if (analyticsEnabled && options.measurementId) {
             return internalFirebase.analytics();
         }
         return null;
     }, [analyticsEnabled, options.measurementId, internalFirebase]);
 
     const internalRemoteConfig = useMemo(() => {
-        if (remoteConfigEnabled && (typeof window !== "undefined" || platform === "ReactNative")) {
+        if (remoteConfigEnabled) {
             const localRemoteConfig = internalFirebase.remoteConfig();
             if (remoteConfigSettings) {
                 localRemoteConfig.settings.fetchTimeMillis = remoteConfigSettings.fetchTimeMillis;
@@ -231,7 +228,7 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
             return localRemoteConfig;
         }
         return null;
-    }, [remoteConfigEnabled, remoteConfigSettings, internalFirebase]);
+    }, [remoteConfigEnabled, remoteConfigSettings, internalFirebase, remoteConfigDefaults]);
 
     const contextValue = useMemo(
         () => ({
@@ -248,10 +245,10 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
         if (contextValue.analytics) {
             setAnalyticsCollectionEnabled(contextValue.analytics, !!consentSettings?.analytics_storage);
         }
-    }, [consentSettings]);
+    }, [consentSettings, contextValue.analytics]);
 
     return (
-        <FirebaseContext.Provider value={contextValue as React.ContextType<typeof FirebaseContext>}>
+        <FirebaseContext.Provider value={contextValue as unknown as FirebaseContextValue}>
             {children}
         </FirebaseContext.Provider>
     );

package/react-native/firestore/useCompositeFilter.d.ts

@@ -1,6 +1,7 @@
 import { FirebaseFirestoreTypes } from "@react-native-firebase/firestore";
 type CompositeFilterDocumentData = FirebaseFirestoreTypes.DocumentData;
-export type QueryElement<DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData> = Partial<FirebaseFirestoreTypes.QueryCompositeFilterConstraint> & {
+export type QueryElement<DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData> = {
+    operator: "OR" | "AND";
     children?: QueryElement[];
     field?: keyof (DbModelType & {
         documentId?: string[];
@@ -9,7 +10,7 @@ export type QueryElement<DbModelType extends CompositeFilterDocumentData = Compo
     op?: FirebaseFirestoreTypes.WhereFilterOp;
 };
 export type CompositeFilter<DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData> = {
-    operator: FirebaseFirestoreTypes.QueryFilterType;
+    operator: "OR" | "AND";
     children: QueryElement<DbModelType & {
         documentId?: string[];
     }>[];

package/react-native/firestore/useCompositeFilter.js

@@ -9,19 +9,15 @@ import { useMemo } from "react";
  */
 const buildCompositeQuery = (query) => {
     if (query.children) {
-        const queryConstraints = query.children
-            .map((subQuery) => {
-            if (subQuery.field && subQuery.op) {
-                return where(query.field === "documentId" ? firebase.FieldPath.documentId() : query.field, subQuery.op, query.value);
-            }
-            return buildCompositeQuery(subQuery);
-        })
-            .filter((constraint) => !!constraint);
+        const queryConstraints = query.children.map(buildCompositeQuery).filter((constraint) => !!constraint);
         if (queryConstraints.length <= 0) {
             return null;
         }
         return query.operator === "OR" ? or(...queryConstraints) : and(...queryConstraints);
     }
+    if (query.field && query.op) {
+        return where(query.field === "documentId" ? firebase.FieldPath.documentId() : query.field, query.op, query.value);
+    }
     return null;
 };
 /**

package/react-native/firestore/useCompositeFilter.ts

@@ -3,16 +3,16 @@ import { useMemo } from "react";
 
 type CompositeFilterDocumentData = FirebaseFirestoreTypes.DocumentData;
 
-export type QueryElement<DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData> =
-    Partial<FirebaseFirestoreTypes.QueryCompositeFilterConstraint> & {
-        children?: QueryElement[];
-        field?: keyof (DbModelType & { documentId?: string[] });
-        value?: DbModelType[keyof DbModelType];
-        op?: FirebaseFirestoreTypes.WhereFilterOp;
-    };
+export type QueryElement<DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData> = {
+    operator: "OR" | "AND";
+    children?: QueryElement[];
+    field?: keyof (DbModelType & { documentId?: string[] });
+    value?: DbModelType[keyof DbModelType];
+    op?: FirebaseFirestoreTypes.WhereFilterOp;
+};
 
 export type CompositeFilter<DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData> = {
-    operator: FirebaseFirestoreTypes.QueryFilterType;
+    operator: "OR" | "AND";
     children: QueryElement<DbModelType & { documentId?: string[] }>[];
 };
 
@@ -30,20 +30,9 @@ export type UseCompositeFilter<DbModelType extends CompositeFilterDocumentData =
 
 const buildCompositeQuery = <DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData>(
     query: QueryElement<DbModelType>
-): FirebaseFirestoreTypes.QueryFieldFilterConstraint | FirebaseFirestoreTypes.QueryCompositeFilterConstraint | null => {
+): FirebaseFirestoreTypes.QueryFilterConstraint | null => {
     if (query.children) {
-        const queryConstraints = query.children
-            .map((subQuery) => {
-                if (subQuery.field && subQuery.op) {
-                    return where(
-                        query.field === "documentId" ? firebase.FieldPath.documentId() : (query.field as string),
-                        subQuery.op,
-                        query.value
-                    );
-                }
-                return buildCompositeQuery(subQuery);
-            })
-            .filter((constraint) => !!constraint);
+        const queryConstraints = query.children.map(buildCompositeQuery).filter((constraint) => !!constraint);
 
         if (queryConstraints.length <= 0) {
             return null;
@@ -52,6 +41,14 @@ const buildCompositeQuery = <DbModelType extends CompositeFilterDocumentData = C
         return (query as CompositeFilter).operator === "OR" ? or(...queryConstraints) : and(...queryConstraints);
     }
 
+    if (query.field && query.op) {
+        return where(
+            query.field === "documentId" ? firebase.FieldPath.documentId() : (query.field as string),
+            query.op,
+            query.value
+        ) as unknown as FirebaseFirestoreTypes.QueryFilterConstraint;
+    }
+
     return null;
 };
 

package/react-native/firestore/useDocReferences.js

@@ -25,5 +25,5 @@ export const useDocReferences = (references) => {
                 ? doc(db, path || "", ...(pathSegments || []))
                 : doc(reference, path, ...(pathSegments || [])));
         });
-    }, [references]);
+    }, [references, db]);
 };

package/react-native/firestore/useDocReferences.ts

@@ -44,5 +44,5 @@ export const useDocReferences = <
                     : doc(reference, path, ...(pathSegments || []))
             ) as FirebaseFirestoreTypes.DocumentReference<AppModelType>;
         });
-    }, [references]);
+    }, [references, db]);
 };

package/react-native/firestore/useGetRealtimeDocData.js

@@ -52,5 +52,5 @@ export const useGetRealtimeDocData = ({ path, pathSegments, reference, onError }
         isError,
         isFetching,
         error
-    }), [doc, isError, error]);
+    }), [doc, isError, error, isFetching]);
 };

package/react-native/firestore/useGetRealtimeDocData.ts

@@ -105,6 +105,6 @@ export const useGetRealtimeDocData = <
             isFetching,
             error
         }),
-        [doc, isError, error]
+        [doc, isError, error, isFetching]
     );
 };

package/react-native/remoteConfig/useFetchAndActivate.js

@@ -23,7 +23,7 @@ export const useFetchAndActivate = () => {
             setIsFetched(true);
             console.log(`Cannot read remote config: ${e?.message}`);
         }
-    }, [isFetched]);
+    }, [remoteConfig]);
     return useMemo(() => ({
         fetchAndActivate: fetchAndActivateCallback,
         isFetched

package/react-native/remoteConfig/useFetchAndActivate.ts

@@ -24,7 +24,7 @@ export const useFetchAndActivate = () => {
             setIsFetched(true);
             console.log(`Cannot read remote config: ${(e as Error)?.message}`);
         }
-    }, [isFetched]);
+    }, [remoteConfig]);
 
     return useMemo(
         () => ({

package/react-native/remoteConfig/useGetValue.js

@@ -11,5 +11,5 @@ export const useGetValue = (key) => {
     const remoteConfig = useRemoteConfig();
     return useMemo(() => {
         return remoteConfig ? getValue(remoteConfig, key) : null;
-    }, [remoteConfig?.lastFetchStatus, key]);
+    }, [remoteConfig, key]);
 };

package/react-native/remoteConfig/useGetValue.ts

@@ -12,5 +12,5 @@ export const useGetValue = (key: string) => {
     const remoteConfig = useRemoteConfig();
     return useMemo(() => {
         return remoteConfig ? getValue(remoteConfig, key) : null;
-    }, [remoteConfig?.lastFetchStatus, key]);
+    }, [remoteConfig, key]);
 };

package/web/analytics/useLogEvent.js

@@ -14,7 +14,7 @@ export const useLogEvent = ({ eventName, eventParams }) => {
         if (analytics) {
             logEvent(analytics, eventName, eventParams);
         }
-    }, [eventName, eventParams]);
+    }, [eventName, eventParams, analytics]);
     return useMemo(() => ({
         logEvent: logEventCallback
     }), [logEventCallback]);

package/web/analytics/useLogEvent.ts

@@ -23,7 +23,7 @@ export const useLogEvent = ({ eventName, eventParams }: UseLogEventOptions) => {
         if (analytics) {
             logEvent(analytics, eventName, eventParams);
         }
-    }, [eventName, eventParams]);
+    }, [eventName, eventParams, analytics]);
 
     return useMemo(
         () => ({

package/web/analytics/useSetAnalyticsCollectionEnabled.js

@@ -12,5 +12,5 @@ export const useSetAnalyticsCollectionEnabled = ({ enabled = false }) => {
         if (analytics) {
             setAnalyticsCollectionEnabled(analytics, enabled);
         }
-    }, [analytics]);
+    }, [analytics, enabled]);
 };

package/web/analytics/useSetAnalyticsCollectionEnabled.ts

@@ -18,5 +18,5 @@ export const useSetAnalyticsCollectionEnabled = ({ enabled = false }: UseSetAnal
         if (analytics) {
             setAnalyticsCollectionEnabled(analytics, enabled);
         }
-    }, [analytics]);
+    }, [analytics, enabled]);
 };

package/web/auth/useAuthStateReady.js

@@ -11,7 +11,7 @@ export const useAuthStateReady = () => {
     const callback = useCallback(async () => {
         await firebaseAuth.authStateReady();
         setIsAuthStateReady(true);
-    }, [isAuthStateReady]);
+    }, [firebaseAuth]);
     useEffect(() => {
         callback();
     }, [callback]);

package/web/auth/useAuthStateReady.ts

@@ -14,7 +14,7 @@ export const useAuthStateReady = () => {
     const callback = useCallback(async () => {
         await firebaseAuth.authStateReady();
         setIsAuthStateReady(true);
-    }, [isAuthStateReady]);
+    }, [firebaseAuth]);
 
     useEffect(() => {
         callback();

package/web/auth/useCurrentUser.js

@@ -15,6 +15,6 @@ export const useCurrentUser = () => {
         return () => {
             unsubscribe();
         };
-    }, [currentUser?.uid ?? ""]);
+    }, [currentUser?.uid, firebaseAuth]);
     return currentUser;
 };

package/web/auth/useCurrentUser.ts

@@ -18,7 +18,7 @@ export const useCurrentUser = () => {
         return () => {
             unsubscribe();
         };
-    }, [currentUser?.uid ?? ""]);
+    }, [currentUser?.uid, firebaseAuth]);
 
     return currentUser;
 };

package/web/auth/useIdToken.js

@@ -35,17 +35,17 @@ export const useIdToken = () => {
         }
         const idToken = await currentUser.getIdToken();
         setIdToken(idToken);
-    }, [currentUser, idToken]);
+    }, [currentUser]);
     const refresh = useCallback(async () => {
         if (!currentUser) {
             return;
         }
         const idToken = await currentUser.getIdToken(true);
         return idToken;
-    }, [currentUser, idToken]);
+    }, [currentUser]);
     useEffect(() => {
         callback();
-    }, [currentUser?.uid ?? ""]);
+    }, [callback]);
     useEffect(() => {
         const unsubscribe = onIdTokenChanged(auth, (user) => {
             if (user) {
@@ -58,7 +58,7 @@ export const useIdToken = () => {
             }
         });
         return () => unsubscribe();
-    }, [idToken]);
+    }, [setIdToken, auth]);
     return {
         idToken,
         refresh

package/web/auth/useIdToken.ts

@@ -47,7 +47,7 @@ export const useIdToken = (): UseIdTokenResult => {
 
         const idToken = await currentUser.getIdToken();
         setIdToken(idToken);
-    }, [currentUser, idToken]);
+    }, [currentUser]);
 
     const refresh = useCallback(async () => {
         if (!currentUser) {
@@ -56,11 +56,11 @@ export const useIdToken = (): UseIdTokenResult => {
 
         const idToken = await currentUser.getIdToken(true);
         return idToken;
-    }, [currentUser, idToken]);
+    }, [currentUser]);
 
     useEffect(() => {
         callback();
-    }, [currentUser?.uid ?? ""]);
+    }, [callback]);
 
     useEffect(() => {
         const unsubscribe = onIdTokenChanged(auth, (user) => {
@@ -74,7 +74,7 @@ export const useIdToken = (): UseIdTokenResult => {
         });
 
         return () => unsubscribe();
-    }, [idToken]);
+    }, [setIdToken, auth]);
 
     return {
         idToken,

package/web/context/FirebaseContextProvider.js

@@ -53,7 +53,7 @@ export const FirebaseContextProvider = ({ emulators, options, children, authEnab
             return localFirestore;
         }
         return null;
-    }, [firestoreSettings, emulators?.firestore, firestoreEnabled]);
+    }, [firestoreSettings, emulators?.firestore, firestoreEnabled, firebase]);
     const auth = useMemo(() => {
         if (authEnabled) {
             const localAuth = getAuth(firebase);
@@ -65,13 +65,13 @@ export const FirebaseContextProvider = ({ emulators, options, children, authEnab
             return localAuth;
         }
         return null;
-    }, [emulators?.auth, authEnabled]);
+    }, [emulators?.auth, authEnabled, firebase]);
     const analytics = useMemo(() => {
         if (analyticsEnabled && options.measurementId && typeof window !== "undefined") {
             return getAnalytics(firebase);
         }
         return null;
-    }, [analyticsEnabled, options.measurementId]);
+    }, [analyticsEnabled, options.measurementId, firebase]);
     const remoteConfig = useMemo(() => {
         if (remoteConfigEnabled && typeof window !== "undefined") {
             const localRemoteConfig = getRemoteConfig(firebase);
@@ -83,7 +83,7 @@ export const FirebaseContextProvider = ({ emulators, options, children, authEnab
             return localRemoteConfig;
         }
         return null;
-    }, [remoteConfigEnabled]);
+    }, [remoteConfigEnabled, firebase, remoteConfigDefaults, remoteConfigSettings]);
     const contextValue = useMemo(() => ({
         firebase,
         auth,
@@ -95,6 +95,6 @@ export const FirebaseContextProvider = ({ emulators, options, children, authEnab
         if (contextValue.analytics) {
             setAnalyticsCollectionEnabled(contextValue.analytics, consentSettings?.analytics_storage === "granted");
         }
-    }, [consentSettings]);
+    }, [consentSettings?.analytics_storage, contextValue.analytics]);
     return (React.createElement(FirebaseContext.Provider, { value: contextValue }, children));
 };

package/web/context/FirebaseContextProvider.tsx

@@ -171,7 +171,7 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
         }
 
         return null;
-    }, [firestoreSettings, emulators?.firestore, firestoreEnabled]);
+    }, [firestoreSettings, emulators?.firestore, firestoreEnabled, firebase]);
 
     const auth = useMemo(() => {
         if (authEnabled) {
@@ -184,14 +184,14 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
             return localAuth;
         }
         return null;
-    }, [emulators?.auth, authEnabled]);
+    }, [emulators?.auth, authEnabled, firebase]);
 
     const analytics = useMemo(() => {
         if (analyticsEnabled && options.measurementId && typeof window !== "undefined") {
             return getAnalytics(firebase);
         }
         return null;
-    }, [analyticsEnabled, options.measurementId]);
+    }, [analyticsEnabled, options.measurementId, firebase]);
 
     const remoteConfig = useMemo(() => {
         if (remoteConfigEnabled && typeof window !== "undefined") {
@@ -204,7 +204,7 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
             return localRemoteConfig;
         }
         return null;
-    }, [remoteConfigEnabled]);
+    }, [remoteConfigEnabled, firebase, remoteConfigDefaults, remoteConfigSettings]);
 
     const contextValue = useMemo(
         () => ({
@@ -221,7 +221,7 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
         if (contextValue.analytics) {
             setAnalyticsCollectionEnabled(contextValue.analytics, consentSettings?.analytics_storage === "granted");
         }
-    }, [consentSettings]);
+    }, [consentSettings?.analytics_storage, contextValue.analytics]);
 
     return (
         <FirebaseContext.Provider value={contextValue as React.ContextType<typeof FirebaseContext>}>

package/web/firestore/useCollectionReference.js

@@ -20,5 +20,5 @@ export const useCollectionReference = ({ path, reference, pathSegments }) => {
             : reference.type === "collection"
                 ? collection(reference, path, ...(pathSegments || []))
                 : collection(reference, path, ...(pathSegments || []));
-    }, [path, reference?.path, pathSegments]);
+    }, [path, reference, pathSegments, db]);
 };

package/web/firestore/useCollectionReference.ts

@@ -33,5 +33,5 @@ export const useCollectionReference = <AppModelType, DbModelType extends Documen
             : reference.type === "collection"
               ? collection(reference, path, ...(pathSegments || []))
               : collection(reference, path, ...(pathSegments || []));
-    }, [path, reference?.path, pathSegments]);
+    }, [path, reference, pathSegments, db]);
 };

package/web/firestore/useCompositeFilter.d.ts

@@ -1,6 +1,7 @@
-import { DocumentData, WhereFilterOp, QueryCompositeFilterConstraint } from "firebase/firestore";
+import { DocumentData, WhereFilterOp } from "firebase/firestore";
 type CompositeFilterDocumentData = DocumentData;
-export type QueryElement<DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData> = Partial<QueryCompositeFilterConstraint> & {
+export type QueryElement<DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData> = {
+    operator: "OR" | "AND";
     children?: QueryElement[];
     field?: keyof (DbModelType & {
         documentId?: string[];
@@ -27,5 +28,5 @@ export type UseCompositeFilter<DbModelType extends CompositeFilterDocumentData =
  *
  * @returns {(Function|undefined)} A composite query filter constraint function formed by combining subqueries or undefined if there are no valid constraints.
  */
-export declare const useCompositeFilter: <DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData>({ query }: UseCompositeFilter<DbModelType>) => QueryCompositeFilterConstraint | undefined;
+export declare const useCompositeFilter: <DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData>({ query }: UseCompositeFilter<DbModelType>) => import("@firebase/firestore").QueryCompositeFilterConstraint | undefined;
 export {};

package/web/firestore/useCompositeFilter.js

@@ -9,19 +9,15 @@ import { useMemo } from "react";
  */
 const buildCompositeQuery = (query) => {
     if (query.children) {
-        const queryConstraints = query.children
-            .map((subQuery) => {
-            if (subQuery.field && subQuery.op) {
-                return where(query.field === "documentId" ? documentId() : query.field, subQuery.op, query.value);
-            }
-            return buildCompositeQuery(subQuery);
-        })
-            .filter((constraint) => !!constraint);
+        const queryConstraints = query.children.map(buildCompositeQuery).filter((constraint) => !!constraint);
         if (queryConstraints.length <= 0) {
             return null;
         }
         return query.operator === "OR" ? or(...queryConstraints) : and(...queryConstraints);
     }
+    if (query.field && query.op) {
+        return where(query.field === "documentId" ? documentId() : query.field, query.op, query.value);
+    }
     return null;
 };
 /**

package/web/firestore/useCompositeFilter.ts

@@ -1,25 +1,15 @@
-import {
-    DocumentData,
-    QueryFilterConstraint,
-    QueryFieldFilterConstraint,
-    WhereFilterOp,
-    QueryCompositeFilterConstraint,
-    documentId,
-    and,
-    or,
-    where
-} from "firebase/firestore";
+import { DocumentData, QueryFilterConstraint, WhereFilterOp, documentId, and, or, where } from "firebase/firestore";
 import { useMemo } from "react";
 
 type CompositeFilterDocumentData = DocumentData;
 
-export type QueryElement<DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData> =
-    Partial<QueryCompositeFilterConstraint> & {
-        children?: QueryElement[];
-        field?: keyof (DbModelType & { documentId?: string[] });
-        value?: DbModelType[keyof DbModelType];
-        op?: WhereFilterOp;
-    };
+export type QueryElement<DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData> = {
+    operator: "OR" | "AND";
+    children?: QueryElement[];
+    field?: keyof (DbModelType & { documentId?: string[] });
+    value?: DbModelType[keyof DbModelType];
+    op?: WhereFilterOp;
+};
 
 export type CompositeFilter<DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData> = {
     operator: "OR" | "AND";
@@ -40,20 +30,9 @@ export type UseCompositeFilter<DbModelType extends CompositeFilterDocumentData =
 
 const buildCompositeQuery = <DbModelType extends CompositeFilterDocumentData = CompositeFilterDocumentData>(
     query: QueryElement<DbModelType>
-): QueryFieldFilterConstraint | QueryCompositeFilterConstraint | null => {
+): QueryFilterConstraint | null => {
     if (query.children) {
-        const queryConstraints = query.children
-            .map((subQuery) => {
-                if (subQuery.field && subQuery.op) {
-                    return where(
-                        query.field === "documentId" ? documentId() : (query.field as string),
-                        subQuery.op,
-                        query.value
-                    );
-                }
-                return buildCompositeQuery(subQuery);
-            })
-            .filter((constraint) => !!constraint);
+        const queryConstraints = query.children.map(buildCompositeQuery).filter((constraint) => !!constraint);
 
         if (queryConstraints.length <= 0) {
             return null;
@@ -62,6 +41,10 @@ const buildCompositeQuery = <DbModelType extends CompositeFilterDocumentData = C
         return (query as CompositeFilter).operator === "OR" ? or(...queryConstraints) : and(...queryConstraints);
     }
 
+    if (query.field && query.op) {
+        return where(query.field === "documentId" ? documentId() : (query.field as string), query.op, query.value);
+    }
+
     return null;
 };
 

package/web/firestore/useDocReference.js

@@ -40,6 +40,6 @@ export const useDocReference = ({ path, reference, pathSegments }) => {
     const ref = useRef(getDocReference(db, { path, pathSegments, reference }));
     useEffect(() => {
         ref.current = getDocReference(db, { path, pathSegments, reference });
-    }, [path, reference, pathSegments]);
+    }, [path, reference, pathSegments, db]);
     return ref.current;
 };

package/web/firestore/useDocReference.ts

@@ -62,7 +62,7 @@ export const useDocReference = <AppModelType, DbModelType extends DocumentData =
 
     useEffect(() => {
         ref.current = getDocReference(db, { path, pathSegments, reference });
-    }, [path, reference, pathSegments]);
+    }, [path, reference, pathSegments, db]);
 
     return ref.current;
 };

package/web/firestore/useDocReferences.js

@@ -27,5 +27,5 @@ export const useDocReferences = (references) => {
                     ? doc(reference, path, ...(pathSegments || []))
                     : doc(reference, path, ...(pathSegments || [])));
         });
-    }, [references]);
+    }, [references, db]);
 };

package/web/firestore/useDocReferences.ts

@@ -40,5 +40,5 @@ export const useDocReferences = <AppModelType, DbModelType extends DocumentData
                       : doc(reference, path, ...(pathSegments || []))
             ) as DocumentReference<AppModelType, DbModelType>;
         });
-    }, [references]);
+    }, [references, db]);
 };

package/web/firestore/useGetRealtimeDocData.js

@@ -52,5 +52,5 @@ export const useGetRealtimeDocData = ({ path, pathSegments, reference, onError }
         isError,
         isFetching,
         error
-    }), [doc, isError, error]);
+    }), [doc, isError, error, isFetching]);
 };

package/web/firestore/useGetRealtimeDocData.ts

@@ -99,6 +99,6 @@ export const useGetRealtimeDocData = <AppModelType, DbModelType extends Document
             isFetching,
             error
         }),
-        [doc, isError, error]
+        [doc, isError, error, isFetching]
     );
 };

package/web/remoteConfig/useFetchAndActivate.js

@@ -23,7 +23,7 @@ export const useFetchAndActivate = () => {
             setIsFetched(true);
             console.log(`Cannot read remote config: ${e?.message}`);
         }
-    }, [isFetched]);
+    }, [remoteConfig]);
     return useMemo(() => ({
         fetchAndActivate: fetchAndActivateCallback,
         isFetched

package/web/remoteConfig/useFetchAndActivate.ts

@@ -24,7 +24,7 @@ export const useFetchAndActivate = () => {
             setIsFetched(true);
             console.log(`Cannot read remote config: ${(e as Error)?.message}`);
         }
-    }, [isFetched]);
+    }, [remoteConfig]);
 
     return useMemo(
         () => ({

package/web/remoteConfig/useGetValue.js

@@ -11,5 +11,5 @@ export const useGetValue = (key) => {
     const remoteConfig = useRemoteConfig();
     return useMemo(() => {
         return remoteConfig ? getValue(remoteConfig, key) : null;
-    }, [remoteConfig?.lastFetchStatus, key]);
+    }, [key, remoteConfig]);
 };

package/web/remoteConfig/useGetValue.ts

@@ -12,5 +12,5 @@ export const useGetValue = (key: string) => {
     const remoteConfig = useRemoteConfig();
     return useMemo(() => {
         return remoteConfig ? getValue(remoteConfig, key) : null;
-    }, [remoteConfig?.lastFetchStatus, key]);
+    }, [key, remoteConfig]);
 };