Skip to content

Commit 21f6019

Browse files
committed
Merge pull request facebook#1301 from markijbema/patch-1
Only stop if the transition on this element ended
2 parents aa25eb8 + 5961667 commit 21f6019

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/addons/transitions/ReactCSSTransitionGroupChild.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ var ReactCSSTransitionGroupChild = React.createClass({
5656
var activeClassName = className + '-active';
5757
var noEventTimeout = null;
5858

59-
var endListener = function() {
59+
var endListener = function(e) {
60+
if (e && e.target !== node) {
61+
return;
62+
}
6063
if (__DEV__) {
6164
clearTimeout(noEventTimeout);
6265
}

0 commit comments

Comments
 (0)