Actually fix transitioning to null
Test Plan: grunt fasttest
Ben Alpert committed
Apr 28, 2014 at 22:16 UTC
4b51708ed2db6dd454bfa4ef2467402019f40842
1 file changed
+2
-2
src/addons/transitions/ReactTransitionGroup.js
+2
-2
@@ -119,7 +119,7 @@ var ReactTransitionGroup = React.createClass({
119
this.props.children
120
);
121
122
- if (!currentChildMapping.hasOwnProperty(key)) {
122
+ if (!currentChildMapping || !currentChildMapping.hasOwnProperty(key)) {
123
// This was removed before it had fully entered. Remove it.
124
this.performLeave(key);
125
}
@@ -152,7 +152,7 @@ var ReactTransitionGroup = React.createClass({
152
this.props.children
153
);
154
155
- if (currentChildMapping.hasOwnProperty(key)) {
155
+ if (currentChildMapping && currentChildMapping.hasOwnProperty(key)) {
156
// This entered again before it fully left. Add it again.
157
this.performEnter(key);
158
} else {