Skip to content

Commit d4fa95c

Browse files
committed
fix(angular-query): used effect onCleanup instead of destroy ref
1 parent a864815 commit d4fa95c

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

packages/angular-query-experimental/src/create-base-query.ts

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {
2-
DestroyRef,
32
Injector,
43
NgZone,
54
computed,
@@ -45,7 +44,6 @@ export function createBaseQuery<
4544
const injector = inject(Injector)
4645
return lazyInit(() => {
4746
const ngZone = injector.get(NgZone)
48-
const destroyRef = injector.get(DestroyRef)
4947
const queryClient = injector.get(QueryClient)
5048
const isRestoring = injectIsRestoring(injector)
5149

@@ -94,11 +92,10 @@ export function createBaseQuery<
9492
)
9593

9694
effect(
97-
() => {
95+
(onCleanup) => {
9896
const _isRestoring = isRestoring()
99-
100-
untracked(() => {
101-
const unsubscribe = _isRestoring
97+
const cleanup = untracked(() =>
98+
_isRestoring
10299
? () => undefined
103100
: ngZone.runOutsideAngular(() =>
104101
// observer.trackResult is not used as this optimization is not needed for Angular
@@ -121,9 +118,9 @@ export function createBaseQuery<
121118
},
122119
),
123120
),
124-
)
125-
destroyRef.onDestroy(unsubscribe)
126-
})
121+
),
122+
)
123+
onCleanup(cleanup)
127124
},
128125
{
129126
injector,

0 commit comments

Comments
 (0)