Skip to content

Commit

Permalink
Reuse latest selected state on selector re-run (reduxjs#1654)
Browse files Browse the repository at this point in the history
  • Loading branch information
otakustay committed Nov 7, 2020
1 parent 94fcab6 commit 878271f
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/hooks/useSelector.js
Expand Up @@ -33,7 +33,16 @@ function useSelectorWithStoreAndSubscription(
storeState !== latestStoreState.current ||
latestSubscriptionCallbackError.current
) {
selectedState = selector(storeState)
const newSelectedState = selector(storeState)
// ensure latest selected state is reused so that a curtom equality function can result in identical references
if (
latestSelectedState.current === undefined ||
!equalityFn(newSelectedState, latestSelectedState.current)
) {
selectedState = newSelectedState
} else {
selectedState = latestSelectedState.current
}
} else {
selectedState = latestSelectedState.current
}
Expand Down
29 changes: 29 additions & 0 deletions test/hooks/useSelector.spec.js
Expand Up @@ -412,6 +412,35 @@ describe('React', () => {

spy.mockRestore()
})

it('reuse latest selected state on selector re-run', () => {
store = createStore(({ count } = { count: -1 }) => ({
count: count + 1,
}))

const alwaysEqual = () => true

const Comp = () => {
// triggers render on store change
useSelector((s) => s.count)
const array = useSelector(() => [1, 2, 3], alwaysEqual)
renderedItems.push(array)
return <div />
}

rtl.render(
<ProviderMock store={store}>
<Comp />
</ProviderMock>
)

expect(renderedItems.length).toBe(1)

store.dispatch({ type: '' })

expect(renderedItems.length).toBe(2)
expect(renderedItems[0]).toBe(renderedItems[1])
})
})

describe('error handling for invalid arguments', () => {
Expand Down

0 comments on commit 878271f

Please sign in to comment.