Skip to content
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

Jump to bottom

fix stale props being passed to promiseFn when using watchFn #181

Merged
merged 4 commits into from
Nov 11, 2019
Merged

fix stale props being passed to promiseFn when using watchFn #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
059b1d6
update tests pertaining to watch/watchFn to ensure new props are bein…
salolivares Oct 17, 2019
d5681a9
Pass options into promiseFn instead of lastOptions
salolivares Oct 21, 2019
85ca6a3
alternate solution: set lastOptions.current on watchfn
salolivares Oct 31, 2019
dffd39f
bring in latest typescript changes
salolivares Nov 10, 2019
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
30 changes: 27 additions & 3 deletions packages/react-async/src/specs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ export const withPromiseFn = (Async, abortCtrl) => () => {
expect(abortCtrl.abort).toHaveBeenCalledTimes(1)
})

test("re-runs the promise when the value of `watch` changes", () => {
test("re-runs the promise with new props when the value of `watch` changes", () => {
class Counter extends React.Component {
constructor(props) {
super(props)
Expand All @@ -304,19 +304,31 @@ export const withPromiseFn = (Async, abortCtrl) => () => {
}
const promiseFn = jest.fn().mockReturnValue(resolveTo())
const { getByText } = render(
<Counter>{count => <Async promiseFn={promiseFn} watch={count} />}</Counter>
<Counter>{count => <Async promiseFn={promiseFn} watch={count} count={count} />}</Counter>
)
expect(promiseFn).toHaveBeenCalledTimes(1)
expect(promiseFn).toHaveBeenLastCalledWith(
expect.objectContaining({ count: 0 }),
expect.any(Object)
)
fireEvent.click(getByText("increment"))
expect(promiseFn).toHaveBeenCalledTimes(2)
expect(promiseFn).toHaveBeenLastCalledWith(
expect.objectContaining({ count: 1 }),
expect.any(Object)
)
expect(abortCtrl.abort).toHaveBeenCalled()
abortCtrl.abort.mockClear()
fireEvent.click(getByText("increment"))
expect(promiseFn).toHaveBeenCalledTimes(3)
expect(promiseFn).toHaveBeenLastCalledWith(
expect.objectContaining({ count: 2 }),
expect.any(Object)
)
expect(abortCtrl.abort).toHaveBeenCalled()
})

test("re-runs the promise when `watchFn` returns truthy", () => {
test("re-runs the promise with new props when `watchFn` returns truthy", () => {
class Counter extends React.Component {
constructor(props) {
super(props)
Expand All @@ -338,11 +350,23 @@ export const withPromiseFn = (Async, abortCtrl) => () => {
<Counter>{count => <Async promiseFn={promiseFn} watchFn={watchFn} count={count} />}</Counter>
)
expect(promiseFn).toHaveBeenCalledTimes(1)
expect(promiseFn).toHaveBeenLastCalledWith(
expect.objectContaining({ count: 0 }),
expect.any(Object)
)
fireEvent.click(getByText("increment"))
expect(promiseFn).toHaveBeenCalledTimes(1)
expect(promiseFn).toHaveBeenLastCalledWith(
expect.objectContaining({ count: 0 }),
expect.any(Object)
)
expect(abortCtrl.abort).not.toHaveBeenCalled()
fireEvent.click(getByText("increment"))
expect(promiseFn).toHaveBeenCalledTimes(2)
expect(promiseFn).toHaveBeenLastCalledWith(
expect.objectContaining({ count: 2 }),
expect.any(Object)
)
expect(abortCtrl.abort).toHaveBeenCalled()
})

Expand Down
5 changes: 4 additions & 1 deletion packages/react-async/src/useAsync.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,10 @@ function useAsync<T extends {}>(
/* eslint-disable react-hooks/exhaustive-deps */
const { watch, watchFn } = options
useEffect(() => {
if (watchFn && lastOptions.current && watchFn(options, lastOptions.current)) load()
if (watchFn && lastOptions.current && watchFn(options, lastOptions.current)) {
lastOptions.current = options
load()
}
})
useEffect(() => {
lastOptions.current = options
Expand Down