Skip to content

Commit 6146d27

Browse files
committed
bug(cssTransition): pass 'appearing' param from Transition to CSSTransition
1 parent 8968fd6 commit 6146d27

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

src/CSSTransition.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ class CSSTransition extends React.Component {
160160
const { className } = this.getClassNames(appearing ? 'appear' : 'enter')
161161

162162
this.removeClasses(node, 'exit');
163-
addClass(node, className)
163+
addClass(node, className);
164164

165165
if (this.props.onEnter) {
166-
this.props.onEnter(node)
166+
this.props.onEnter(node, appearing);
167167
}
168168
}
169169

@@ -172,18 +172,18 @@ class CSSTransition extends React.Component {
172172
appearing ? 'appear' : 'enter'
173173
);
174174

175-
this.reflowAndAddClass(node, activeClassName)
175+
this.reflowAndAddClass(node, activeClassName);
176176

177177
if (this.props.onEntering) {
178-
this.props.onEntering(node)
178+
this.props.onEntering(node, appearing);
179179
}
180180
}
181181

182182
onEntered = (node, appearing) => {
183183
this.removeClasses(node, appearing ? 'appear' : 'enter');
184184

185185
if (this.props.onEntered) {
186-
this.props.onEntered(node)
186+
this.props.onEntered(node, appearing);
187187
}
188188
}
189189

test/CSSTransition-test.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,22 @@ describe('CSSTransition', () => {
9595
instance.props({
9696
in: true,
9797

98-
onEnter(node){
98+
onEnter(node, appearing){
9999
count++;
100100
expect(node.className).toEqual('custom');
101+
expect(appearing).toBe(false);
101102
},
102103

103-
onEntering(node){
104+
onEntering(node, appearing){
104105
count++;
105106
expect(node.className).toEqual('custom custom-super-active');
107+
expect(appearing).toBe(false);
106108
},
107109

108-
onEntered(node){
110+
onEntered(node, appearing){
109111
expect(node.className).toEqual('');
110112
expect(count).toEqual(2);
113+
expect(appearing).toBe(false);
111114
done();
112115
}
113116
});

0 commit comments

Comments
 (0)