Skip to content

Update shallowCompare to accept nextContext #6661

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
jimfb merged 4 commits into from
May 17, 2016
Merged

Update shallowCompare to accept nextContext #6661

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
d0e8746
Update shallowCompare to accept nextContext
tony99nyr Apr 29, 2016
4312387
Merge pull request #1 from tony99nyr/shallowCompare-context
tony99nyr Apr 29, 2016
a989be4
Remove the undefined check
tony99nyr May 16, 2016
8f410c7
Add nextContext
tony99nyr May 16, 2016
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
4 changes: 2 additions & 2 deletions src/addons/ReactComponentWithPureRenderMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ var shallowCompare = require('shallowCompare');
* use `forceUpdate()` when you know deep data structures have changed.
*/
var ReactComponentWithPureRenderMixin = {
shouldComponentUpdate: function(nextProps, nextState) {
return shallowCompare(this, nextProps, nextState);
shouldComponentUpdate: function(nextProps, nextState, nextContext) {
return shallowCompare(this, nextProps, nextState, nextContext);
},
};

Expand Down
5 changes: 3 additions & 2 deletions src/addons/shallowCompare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ var shallowEqual = require('shallowEqual');
* Does a shallow comparison for props and state.
* See ReactComponentWithPureRenderMixin
*/
function shallowCompare(instance, nextProps, nextState) {
function shallowCompare(instance, nextProps, nextState, nextContext) {
return (
!shallowEqual(instance.props, nextProps) ||
!shallowEqual(instance.state, nextState)
!shallowEqual(instance.state, nextState) ||
!shallowEqual(instance.context, nextContext)
);
}

Expand Down