Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/use-dataloader/src/DataLoaderProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ const DataLoaderProvider = ({
setTimeout(() => {
Object.keys(requestsRef.current).forEach(key => {
if (requestsRef.current[key].getObserversCount() === 0) {
// Worst case there is a memleak
// eslint-disable-next-line @typescript-eslint/no-floating-promises
requestsRef.current[key].destroy()
delete requestsRef.current[key]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ describe('DataLoaderProvider', () => {
expect(testRequest).toBeDefined()
expect(testRequest?.status).toBe(StatusEnum.IDLE)
act(() => {
// launch should never throw
// eslint-disable-next-line @typescript-eslint/no-floating-promises
testRequest?.launch()
})
expect(method).toBeCalledTimes(1)
Expand Down Expand Up @@ -88,6 +90,8 @@ describe('DataLoaderProvider', () => {
expect(testRequest).toBeDefined()
expect(testRequest?.status).toBe(StatusEnum.IDLE)
act(() => {
// launch should never throw
// eslint-disable-next-line @typescript-eslint/no-floating-promises
testRequest?.launch()
})
expect(method).toBeCalledTimes(1)
Expand Down
4 changes: 2 additions & 2 deletions packages/use-dataloader/src/__tests__/dataloader.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe('Dataloader class', () => {
expect(method).toBeCalledTimes(0)
await instance.load()
expect(method).toBeCalledTimes(1)
instance.destroy()
await instance.destroy()
instance.clearData()
})

Expand Down Expand Up @@ -207,7 +207,7 @@ describe('Dataloader class', () => {
await new Promise(resolve => { setTimeout(resolve) })
expect(method).toBeCalledTimes(6)
instance.setPollingInterval(PROMISE_TIMEOUT * 4)
instance.destroy()
await instance.destroy()
})

test('should update outdated data', async () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/use-dataloader/src/dataloader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ class DataLoader<T = unknown> {
this.notifyChanges()
}

public destroy(): void {
this.cancel?.()
public async destroy(): Promise<void> {
await this.cancel?.()
if (this.timeout) {
clearTimeout(this.timeout)
}
Expand Down
2 changes: 2 additions & 0 deletions packages/use-dataloader/src/useDataLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ const useDataLoader = <T>(

useEffect(() => {
if (enabled && isIdle) {
// launch should never throw
// eslint-disable-next-line @typescript-eslint/no-floating-promises
request.launch?.()
}
}, [request, enabled, isIdle])
Expand Down