Updated the animation-fix to account for transitionEnter being false.
Cartas committed
Dec 6, 2013 at 15:37 UTC
7d8190f56e1501baf6b5d049a7c50ea85d270657
1 file changed
+6
-5
src/addons/transitions/ReactTransitionableChild.js
+6
-5
@@ -130,15 +130,16 @@ var ReactTransitionableChild = React.createClass({
130
if (!nextProps.children && this.props.children) {
131
this.savedChildren = this.props.children;
132
} else if (nextProps.children && !this.props.children) {
133
- // We're being told to keep this node! Better set it to enter again.
134
- if (this.props.enter && this.isMounted())
135
- {
133
+ // We're being told to re-add the child. Let's stop leaving!
134
+ if (this.isMounted()) {
135
var node = this.getDOMNode();
136
var className = this.props.name;
137
CSSCore.removeClass(node, className + '-leave');
138
CSSCore.removeClass(node, className + '-leave-active');
140
- CSSCore.addClass(node, className + '-enter');
141
- CSSCore.addClass(node, className + '-enter-active');
139
+ if (this.props.enter) {
140
+ CSSCore.addClass(node, className + '-enter');
141
+ CSSCore.addClass(node, className + '-enter-active');
142
+ }
143
}
144
}
145
},