11/* eslint-disable @typescript-eslint/ban-ts-comment */
22import {
33Injectable ,
4+ Injector ,
45NgZone ,
56PendingTasks ,
67inject
@@ -97,7 +98,7 @@ const zoneWrapFn = (
9798) => {
9899return ( ...args :any [ ] ) => {
99100if ( taskDone ) {
100- setTimeout ( taskDone , 10 ) ;
101+ setTimeout ( taskDone , 0 ) ;
101102}
102103return run ( ( ) => it . apply ( this , args ) ) ;
103104} ;
@@ -108,12 +109,22 @@ export const ɵzoneWrap = <T= unknown>(it: T, blockUntilFirst: boolean): T => {
108109return function ( ) {
109110let taskDone :VoidFunction | undefined ;
110111const _arguments = arguments ;
112+ let schedulers :ɵAngularFireSchedulers ;
113+ let pendingTasks :PendingTasks ;
114+ let injector :Injector ;
115+ try {
116+ schedulers = getSchedulers ( ) ;
117+ pendingTasks = inject ( PendingTasks ) ;
118+ injector = inject ( Injector ) ;
119+ } catch ( e ) {
120+ return ( it as any ) . apply ( this , _arguments ) ;
121+ }
111122// if this is a callback function, e.g, onSnapshot, we should create a pending task and complete it
112123// only once one of the callback functions is tripped.
113124for ( let i = 0 ; i < arguments . length ; i ++ ) {
114125if ( typeof _arguments [ i ] === 'function' ) {
115126if ( blockUntilFirst ) {
116- taskDone ||= run ( ( ) => inject ( PendingTasks ) . add ( ) ) ;
127+ taskDone ||= run ( ( ) => pendingTasks . add ( ) ) ;
117128}
118129// TODO create a microtask to track callback functions
119130_arguments [ i ] = zoneWrapFn ( _arguments [ i ] , taskDone ) ;
@@ -122,7 +133,6 @@ export const ɵzoneWrap = <T= unknown>(it: T, blockUntilFirst: boolean): T => {
122133const ret = runOutsideAngular ( ( ) => ( it as any ) . apply ( this , _arguments ) ) ;
123134if ( ! blockUntilFirst ) {
124135if ( ret instanceof Observable ) {
125- const schedulers = getSchedulers ( ) ;
126136return ret . pipe (
127137subscribeOn ( schedulers . outsideAngular ) ,
128138observeOn ( schedulers . insideAngular ) ,
@@ -132,18 +142,17 @@ export const ɵzoneWrap = <T= unknown>(it: T, blockUntilFirst: boolean): T => {
132142}
133143}
134144if ( ret instanceof Observable ) {
135- const schedulers = getSchedulers ( ) ;
136145return ret . pipe (
137146subscribeOn ( schedulers . outsideAngular ) ,
138147observeOn ( schedulers . insideAngular ) ,
139- pendingUntilEvent ( ) ,
148+ pendingUntilEvent ( injector ) ,
140149) ;
141150} else if ( ret instanceof Promise ) {
142151// eslint-disable-next-line @typescript-eslint/no-misused-promises
143152return run (
144153( ) =>
145154new Promise ( ( resolve , reject ) => {
146- inject ( PendingTasks ) . run ( ( ) => ret ) . then (
155+ pendingTasks . run ( ( ) => ret ) . then (
147156( it ) => run ( ( ) => resolve ( it ) ) ,
148157( reason ) => run ( ( ) => reject ( reason ) )
149158) ;
@@ -153,7 +162,7 @@ export const ɵzoneWrap = <T= unknown>(it: T, blockUntilFirst: boolean): T => {
153162// Handle unsubscribe
154163// function() is needed for the arguments object
155164return function ( ) {
156- setTimeout ( taskDone , 10 ) ;
165+ setTimeout ( taskDone , 0 ) ;
157166return ret . apply ( this , arguments ) ;
158167} ;
159168} else {