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.

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

Guard against a null node #4170

Merged
merged 1 commit into from
Jun 20, 2015
Merged

Guard against a null node #4170

merged 1 commit into from
Jun 20, 2015

Conversation

johanneslumpe
Copy link
Contributor

This could fix #2619

@sophiebits
Copy link
Collaborator

It's not super obvious what should happen with events if a component switches away from null during the would-be transition time or if it switches to null while transitioning, but I guess this is an improvement either way.

Can you squash your commits together?

@johanneslumpe
Copy link
Contributor Author

@spicyj embarrassing, but I don't know how to squash. Maybe you can provide me with a small exaple snippet so I know it once and for all? :)

@sophiebits
Copy link
Collaborator

No worries. On your patch-1 branch, you'll want to run an interactive rebase by doing

git rebase -i master

meaning you want to edit the changes you've made since the top of the master branch. You'll get a text editor, hopefully with two lines corresponding to your two commits. If you change the second "pick" to a "f" or "fixup" then save the file, git will amend the second commit to the first (and throw away its message). You'll then want to do a git push -f to overwrite the branch you currently have on GitHub with the new, altered commit.

@johanneslumpe
Copy link
Contributor Author

@spicyj I think that worked :)

sophiebits added a commit that referenced this pull request Jun 20, 2015
@sophiebits sophiebits merged commit 64b5f04 into facebook:master Jun 20, 2015
@sophiebits
Copy link
Collaborator

Thanks @johanneslumpe!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CSSTransitionGroup throws when a child returns null from render
3 participants