Skip to content

SwitchTransition children may be equal if both keys are null #526

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

SwitchTransition children may be equal if both keys are null #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd18278
Update SwitchTransition-test.js
AdrianFleming Jul 25, 2019
4419643
Update SwitchTransition.js
AdrianFleming Jul 25, 2019
f3cc433
Update SwitchTransition-test.js
AdrianFleming Jul 25, 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
3 changes: 1 addition & 2 deletions src/SwitchTransition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ function areChildrenDifferent(oldChildren, newChildren) {
if (
React.isValidElement(oldChildren) &&
React.isValidElement(newChildren) &&
oldChildren.key != null &&
oldChildren.key === newChildren.key
((oldChildren.key == null && newChildren.key == null) || oldChildren.key === newChildren.key)
Copy link
Member

Choose a reason for hiding this comment

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

Why would we want to treat null and undefined the same here?

Copy link
Author

Choose a reason for hiding this comment

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

@taion, OK. This is how I initially coded it but decided it would be better handled in the component. I'll close the fork therefore.

) {
return false;
}
Expand Down
12 changes: 12 additions & 0 deletions test/SwitchTransition-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,18 @@ describe('SwitchTransition', () => {
expect(wrapper.state('status')).toBe(ENTERED);
});

it('should have default status ENTERED', () => {
const wrapper = mount(
<SwitchTransition>
<Transition timeout={0} key={null}>
<span />
</Transition>
</SwitchTransition>
);

expect(wrapper.state('status')).toBe(ENTERED);
});

it('should have default mode: out-in', () => {
const wrapper = mount(
<SwitchTransition>
Expand Down