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

Fix to call a setState callback after finishing the the render #1453

Merged
merged 6 commits into from
Jan 6, 2018
Merged

Fix to call a setState callback after finishing the the render #1453

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04076f6
Fix to call a setState callback after finishing the the render
koba04 Dec 26, 2017
ba82e1d
Implement adapter.invokeSetStateCallback
koba04 Jan 4, 2018
30b4556
Add comments for an argument of setState callback
koba04 Jan 4, 2018
50d7720
Make the version check logic more robust
koba04 Jan 6, 2018
d8fa20c
Use super.invokeSetStateCallback
koba04 Jan 6, 2018
751b1f7
Fix tests; use ifReact in the 15.4 adapter
ljharb Jan 6, 2018
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
Prev Previous commit
Next Next commit
Add comments for an argument of setState callback
  • Loading branch information
@koba04 @ljharb
koba04 authored and ljharb committed Jan 4, 2018
commit 30b4556add8908f7bf632ea4622f14f8b3f6b1ff
4 changes: 2 additions & 2 deletions packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
} from 'enzyme-adapter-utils';

const MINOR_VERSION = React.version.split('.')[1];
const CALLING_SETSTATE_CALLBACK_WITH_UNDEFINED = MINOR_VERSION >= 4;

function compositeTypeToNodeType(type) {
switch (type) {
Expand Down Expand Up @@ -257,7 +256,8 @@ class ReactFifteenFourAdapter extends EnzymeAdapter {
}

invokeSetStateCallback(instance, callback) {
if (CALLING_SETSTATE_CALLBACK_WITH_UNDEFINED) {
// React in <= 15.3, and >= 16 pass undefined to a setState callback
if (MINOR_VERSION >= 4) {
callback.call(instance, undefined);
} else {
callback.call(instance);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe this could do super.invokeSetStateCallback(instance, callback)?

Expand Down
1 change: 1 addition & 0 deletions packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ class ReactFifteenAdapter extends EnzymeAdapter {
}

invokeSetStateCallback(instance, callback) {
// React in <= 15.3, and >= 16 pass undefined to a setState callback
callback.call(instance, undefined);
}
}
Expand Down