Skip to content

Commit 798e05e

Browse files
authored
fix(react-native): use methods exported by modularized build to get instances of different DB modules (#58)
1 parent 15c87d4 commit 798e05e

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

react-native/context/FirebaseContextProvider.tsx

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import React, { PropsWithChildren, useEffect, useMemo } from "react";
22
import { FirebaseContext, FirebaseContextValue } from "./FirebaseContext";
3-
import { connectAuthEmulator } from "@react-native-firebase/auth";
4-
import { FirebaseAnalyticsTypes, setAnalyticsCollectionEnabled, setConsent } from "@react-native-firebase/analytics";
5-
import { FirebaseRemoteConfigTypes } from "@react-native-firebase/remote-config";
6-
import { connectFirestoreEmulator } from "@react-native-firebase/firestore";
3+
import auth, { connectAuthEmulator } from "@react-native-firebase/auth";
4+
import analytics, {
5+
FirebaseAnalyticsTypes,
6+
setAnalyticsCollectionEnabled,
7+
setConsent
8+
} from "@react-native-firebase/analytics";
9+
import remoteConfig, { FirebaseRemoteConfigTypes } from "@react-native-firebase/remote-config";
10+
import firestore, { connectFirestoreEmulator } from "@react-native-firebase/firestore";
711
import firebase, { ReactNativeFirebase } from "@react-native-firebase/app";
812

913
/**
@@ -163,7 +167,7 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
163167
const internalFirebase = useMemo(() => firebase, []);
164168

165169
useEffect(() => {
166-
setConsent(firebase.analytics(), {
170+
setConsent(analytics(), {
167171
ad_personalization: false,
168172
ad_storage: false,
169173
ad_user_data: false,
@@ -178,26 +182,22 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
178182
const internalFirestore = useMemo(() => {
179183
if (firestoreEnabled) {
180184
if (emulators?.firestore?.host && emulators?.firestore?.port) {
181-
connectFirestoreEmulator(
182-
internalFirebase.firestore(),
183-
emulators.firestore.host,
184-
emulators.firestore.port
185-
);
185+
connectFirestoreEmulator(firestore(), emulators.firestore.host, emulators.firestore.port);
186186
}
187187

188-
const localFirestore = internalFirebase.firestore();
188+
const localFirestore = firestore();
189189
if (firestoreSettings) {
190190
localFirestore.settings(firestoreSettings);
191191
}
192192
return localFirestore;
193193
}
194194

195195
return null;
196-
}, [emulators?.firestore, firestoreEnabled, internalFirebase, firestoreSettings]);
196+
}, [emulators?.firestore, firestoreEnabled, firestoreSettings]);
197197

198198
const internalAuth = useMemo(() => {
199199
if (authEnabled) {
200-
const localAuth = internalFirebase.auth();
200+
const localAuth = auth();
201201
if (emulators?.auth?.host) {
202202
connectAuthEmulator(localAuth, emulators?.auth?.host, {
203203
disableWarnings: true
@@ -206,18 +206,18 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
206206
return localAuth;
207207
}
208208
return null;
209-
}, [emulators?.auth, authEnabled, internalFirebase]);
209+
}, [emulators?.auth, authEnabled]);
210210

211211
const internalAnalytics = useMemo(() => {
212212
if (analyticsEnabled) {
213-
return internalFirebase.analytics();
213+
return analytics();
214214
}
215215
return null;
216-
}, [analyticsEnabled, internalFirebase]);
216+
}, [analyticsEnabled]);
217217

218218
const internalRemoteConfig = useMemo(() => {
219219
if (remoteConfigEnabled) {
220-
const localRemoteConfig = internalFirebase.remoteConfig();
220+
const localRemoteConfig = remoteConfig();
221221
if (remoteConfigSettings) {
222222
localRemoteConfig.settings.fetchTimeMillis = remoteConfigSettings.fetchTimeMillis;
223223
localRemoteConfig.settings.minimumFetchIntervalMillis = remoteConfigSettings.minimumFetchIntervalMillis;
@@ -226,7 +226,7 @@ export const FirebaseContextProvider: React.FC<FirebaseContextProviderProps> = (
226226
return localRemoteConfig;
227227
}
228228
return null;
229-
}, [remoteConfigEnabled, remoteConfigSettings, internalFirebase, remoteConfigDefaults]);
229+
}, [remoteConfigEnabled, remoteConfigSettings, remoteConfigDefaults]);
230230

231231
const contextValue = useMemo(
232232
() => ({

0 commit comments

Comments
 (0)