Skip to content

feat(fetchData): no undefined when unmounted #777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simoneb merged 2 commits into from
Feb 2, 2022
Merged

feat(fetchData): no undefined when unmounted #777

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2d1947
feat(fetchData): no undefined when unmounted
csorfab Jan 27, 2022
72285e7
Merge branch 'master' into feat/fetch-data-no-undefined
simoneb Feb 2, 2022
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
13 changes: 12 additions & 1 deletion packages/graphql-hooks/src/useClientRequest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ function useClientRequest(query, initialOpts = {}) {
// arguments to fetchData override the useClientRequest arguments
const fetchData = useDeepCompareCallback(
newOpts => {
if (!isMounted.current) return Promise.resolve()
const revisedOpts = {
...initialOpts,
...newOpts
Expand All @@ -145,6 +144,18 @@ function useClientRequest(query, initialOpts = {}) {
operationName: revisedOpts.operationName
}

if (!isMounted.current) {
return Promise.resolve({
error: {
fetchError: new Error(
'fetchData should not be called after hook unmounted'
)
},
loading: false,
cacheHit: false
})
}

const revisedCacheKey = client.getCacheKey(revisedOperation, revisedOpts)

// NOTE: There is a possibility of a race condition whereby
Expand Down
14 changes: 11 additions & 3 deletions packages/graphql-hooks/test/unit/useClientRequest.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ describe('useClientRequest', () => {
expect(state).toEqual({ cacheHit: false, loading: true })
})

it('returns undefined instantly if not mounted', async () => {
it('returns result with error instantly if not mounted', async () => {
let fetchData, state
const { unmount } = renderHook(
() =>
Expand All @@ -487,8 +487,16 @@ describe('useClientRequest', () => {
)

unmount()
const result = await act(fetchData)
expect(result).toBe(undefined)

let result
await act(async () => {
result = await fetchData()
})

expect(result.data).toBe(undefined)
expect(result.loading).toBe(false)
expect(result.cacheHit).toBe(false)
expect(result.error.fetchError).toBeInstanceOf(Error)
expect(mockClient.request).not.toHaveBeenCalled()
expect(state).toEqual({ cacheHit: false, loading: true })
})
Expand Down