Skip to content

Commit 7364b44

Browse files
committed
fix: run inject in angular injection context
1 parent bc926a8 commit 7364b44

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/compat/firestore/firestore.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { isPlatformServer } from '@angular/common';
2-
import { Inject, Injectable, InjectionToken, NgZone, Optional, PLATFORM_ID, inject } from '@angular/core';
2+
import { EnvironmentInjector, Inject, Injectable, InjectionToken, NgZone, Optional, PLATFORM_ID, inject, runInInjectionContext } from '@angular/core';
33
import { ɵAngularFireSchedulers } from '@angular/fire';
44
import { AppCheckInstances } from '@angular/fire/app-check';
55
import { FIREBASE_APP_NAME, FIREBASE_OPTIONS, ɵcacheInstance, ɵfirebaseAppFactory } from '@angular/fire/compat';
@@ -121,6 +121,7 @@ export function associateQuery<T>(collectionRef: CollectionReference<T>, queryFn
121121
export class AngularFirestore {
122122
public readonly firestore: firebase.firestore.Firestore;
123123
public readonly persistenceEnabled$: Observable<boolean>;
124+
private readonly injector = inject(EnvironmentInjector);
124125

125126
/**
126127
* Each Feature of AngularFire has a FirebaseApp injected. This way we
@@ -197,7 +198,7 @@ export class AngularFirestore {
197198
collectionRef = pathOrRef;
198199
}
199200
const { ref, query } = associateQuery<T>(collectionRef, queryFn);
200-
const refInZone = inject(NgZone).run(() => ref);
201+
const refInZone = runInInjectionContext(this.injector, () => inject(NgZone).run(() => ref));
201202
return new AngularFirestoreCollection<T>(refInZone, query, this);
202203
}
203204

@@ -227,7 +228,7 @@ export class AngularFirestore {
227228
} else {
228229
ref = pathOrRef;
229230
}
230-
const refInZone = inject(NgZone).run(() => ref);
231+
const refInZone = runInInjectionContext(this.injector, () => inject(NgZone).run(() => ref));
231232
return new AngularFirestoreDocument<T>(refInZone, this);
232233
}
233234

0 commit comments

Comments
 (0)