-
-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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.
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
add deps
to useSelector
to allow controlling stability of selector
#1251
Merged
markerikson
merged 2 commits into
reduxjs:v7-hooks-alpha
from
MrWolfZ:use-selector-deps
Apr 22, 2019
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/*eslint-disable react/prop-types*/ | ||
|
||
import React from 'react' | ||
import React, { useReducer } from 'react' | ||
import { createStore } from 'redux' | ||
import * as rtl from 'react-testing-library' | ||
import { Provider as ProviderMock, useSelector } from '../../src/index.js' | ||
|
@@ -165,15 +165,40 @@ describe('React', () => { | |
|
||
expect(renderedItems.length).toBe(1) | ||
}) | ||
|
||
it('re-uses the selector if deps do not change', () => { | ||
let selectorId = 0 | ||
let forceRender | ||
|
||
const Comp = () => { | ||
const [, f] = useReducer(c => c + 1, 0) | ||
forceRender = f | ||
const renderedSelectorId = selectorId++ | ||
const value = useSelector(() => renderedSelectorId, []) | ||
renderedItems.push(value) | ||
return <div /> | ||
} | ||
|
||
rtl.render( | ||
<ProviderMock store={store}> | ||
<Comp /> | ||
</ProviderMock> | ||
) | ||
|
||
rtl.act(forceRender) | ||
|
||
// this line verifies the susbcription callback uses the same memoized selector and therefore | ||
// does not cause a re-render | ||
store.dispatch({ type: '' }) | ||
|
||
expect(renderedItems).toEqual([0, 0]) | ||
}) | ||
}) | ||
|
||
describe('edge cases', () => { | ||
it('ignores transient errors in selector (e.g. due to stale props)', () => { | ||
// TODO Not sure this test is really testing what we want. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This test was correct in what it tested. In fact, it failing showed an error in the implementation. |
||
// TODO The parent re-renders, which causes the child to re-run the selector anyway and throw the error. | ||
// TODO Had to flip the assertion for now. Probably needs to be rethought. | ||
|
||
const spy = jest.spyOn(console, 'error').mockImplementation(() => {}) | ||
|
||
const Parent = () => { | ||
const count = useSelector(s => s.count) | ||
return <Child parentCount={count} /> | ||
|
@@ -197,9 +222,7 @@ describe('React', () => { | |
</ProviderMock> | ||
) | ||
|
||
expect(() => store.dispatch({ type: '' })).toThrowError( | ||
/while selecting the store state/ | ||
) | ||
expect(() => store.dispatch({ type: '' })).not.toThrowError() | ||
|
||
spy.mockRestore() | ||
}) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
using
latestSelector.current
was wrong, since it was a stale selector. This change fixes that issue, which makes the test for stale props succeed.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hah, nice catch :)