mirror of
https://github.com/facebook/react.git
synced 2025-11-01 09:12:30 +00:00
Actually fix transitioning to null
Test Plan: grunt fasttest
This commit is contained in:
@@ -119,7 +119,7 @@ var ReactTransitionGroup = React.createClass({
|
||||
this.props.children
|
||||
);
|
||||
|
||||
if (!currentChildMapping.hasOwnProperty(key)) {
|
||||
if (!currentChildMapping || !currentChildMapping.hasOwnProperty(key)) {
|
||||
// This was removed before it had fully entered. Remove it.
|
||||
this.performLeave(key);
|
||||
}
|
||||
@@ -152,7 +152,7 @@ var ReactTransitionGroup = React.createClass({
|
||||
this.props.children
|
||||
);
|
||||
|
||||
if (currentChildMapping.hasOwnProperty(key)) {
|
||||
if (currentChildMapping && currentChildMapping.hasOwnProperty(key)) {
|
||||
// This entered again before it fully left. Add it again.
|
||||
this.performEnter(key);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user