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
9 changes: 5 additions & 4 deletions packages/use-dataloader/src/__tests__/dataloader.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,21 +189,22 @@ describe('Dataloader class', () => {
const instance = new DataLoader({
key: 'test',
method,
pollingInterval: PROMISE_TIMEOUT,
pollingInterval: PROMISE_TIMEOUT * 2,
})
await instance.load()
expect(method).toBeCalledTimes(1)
await new Promise(resolve => setTimeout(resolve, PROMISE_TIMEOUT * 2))
await new Promise(resolve => setTimeout(resolve, PROMISE_TIMEOUT * 3))
expect(method).toBeCalledTimes(2)
await new Promise(resolve => setTimeout(resolve, PROMISE_TIMEOUT * 2))
await new Promise(resolve => setTimeout(resolve, PROMISE_TIMEOUT * 3))
expect(method).toBeCalledTimes(3)
await instance.load()
await instance.load()
await instance.load()
await new Promise(resolve => setTimeout(resolve))
expect(method).toBeCalledTimes(4)
await instance.load()
await instance.load()
await instance.load(true)
await new Promise(resolve => setTimeout(resolve))
expect(method).toBeCalledTimes(6)
instance.destroy()
})
Expand Down
40 changes: 40 additions & 0 deletions packages/use-dataloader/src/__tests__/useDataLoader.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,46 @@ describe('useDataLoader', () => {
expect(result.current.data).toBe(true)
})

test('should render correctly without requets enabled then enable it', async () => {
const method = jest.fn(
() =>
new Promise(resolve => {
setTimeout(() => resolve(true), PROMISE_TIMEOUT)
}),
)
let enabled = false
const { rerender, result, waitForNextUpdate } = renderHook<
UseDataLoaderHookProps,
UseDataLoaderResult
>(
props =>
useDataLoader(props.key, props.method, {
enabled,
}),
{
initialProps: {
...initialProps,
key: 'test-not-enabled-then-reload',
method,
},
wrapper,
},
)
expect(result.current.data).toBe(undefined)
expect(result.current.isLoading).toBe(false)
expect(method).toBeCalledTimes(0)
enabled = true
rerender()
expect(method).toBeCalledTimes(1)
expect(result.current.data).toBe(undefined)
expect(result.current.isLoading).toBe(true)
await waitForNextUpdate()
expect(result.current.isLoading).toBe(false)
expect(result.current.isSuccess).toBe(true)
expect(result.current.previousData).toBe(undefined)
expect(result.current.data).toBe(true)
})

test('should render correctly without valid key', () => {
const { result } = renderHook<UseDataLoaderHookProps, UseDataLoaderResult>(
props => useDataLoader(props.key, props.method),
Expand Down
6 changes: 6 additions & 0 deletions packages/use-dataloader/src/useDataLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ const useDataLoader = <T>(
[isSuccess, isLoading, enabled, pollingInterval],
)

useEffect(() => {
if (enabled && isIdle) {
request.launch?.()
}
}, [request, enabled, isIdle])

useEffect(() => {
isFetchingRef.current = isLoading || isPolling
}, [isLoading, isPolling])
Expand Down