Fix up style in #4719
Ben Alpert committed
Sep 9, 2015 at 08:35 UTC
324bec17e3cd451f78590a6500d318572f0635a6
2 files changed
+17
-24
src/addons/transitions/ReactCSSTransitionGroup.js
+8
-13
@@ -16,12 +16,8 @@ var React = require('React');
16
17
var assign = require('Object.assign');
18
19
-var ReactTransitionGroup = React.createFactory(
20
- require('ReactTransitionGroup')
21
-);
22
-var ReactCSSTransitionGroupChild = React.createFactory(
23
- require('ReactCSSTransitionGroupChild')
24
-);
19
+var ReactTransitionGroup = require('ReactTransitionGroup');
20
+var ReactCSSTransitionGroupChild = require('ReactCSSTransitionGroupChild');
21
22
function createTransitionTimeoutPropValidator(transitionType) {
23
var timeoutPropName = 'transition' + transitionType + 'Timeout';
@@ -52,8 +48,7 @@ var ReactCSSTransitionGroup = React.createClass({
48
displayName: 'ReactCSSTransitionGroup',
49
50
propTypes: {
55
- // Re-require to access the raw class rather than the factory
56
- transitionName: require('ReactCSSTransitionGroupChild').propTypes.name,
51
+ transitionName: ReactCSSTransitionGroupChild.propTypes.name,
52
53
transitionAppear: React.PropTypes.bool,
54
transitionEnter: React.PropTypes.bool,
@@ -75,7 +70,8 @@ var ReactCSSTransitionGroup = React.createClass({
70
// We need to provide this childFactory so that
71
// ReactCSSTransitionGroupChild can receive updates to name, enter, and
72
// leave while it is leaving.
78
- return ReactCSSTransitionGroupChild(
73
+ return React.createElement(
74
+ ReactCSSTransitionGroupChild,
75
{
76
name: this.props.transitionName,
77
appear: this.props.transitionAppear,
@@ -90,10 +86,9 @@ var ReactCSSTransitionGroup = React.createClass({
86
},
87
88
render: function() {
93
- return (
94
- ReactTransitionGroup(
95
- assign({}, this.props, {childFactory: this._wrapChild})
96
- )
89
+ return React.createElement(
90
+ ReactTransitionGroup,
91
+ assign({}, this.props, {childFactory: this._wrapChild})
92
);
93
},
94
});
src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js
+9
-11
@@ -11,14 +11,12 @@
11
12
'use strict';
13
14
+var CSSCore = require('CSSCore');
15
+
16
var React;
17
var ReactDOM;
18
var ReactCSSTransitionGroup;
19
18
-function hasClassName(domNode, className) {
19
- return domNode.className.indexOf(className) > 0;
20
-}
21
-
20
// Most of the real functionality is covered in other unit tests, this just
21
// makes sure we're wired up correctly.
22
describe('ReactCSSTransitionGroup', function() {
@@ -211,7 +209,7 @@ describe('ReactCSSTransitionGroup', function() {
209
210
var a = ReactDOM.render(
211
<ReactCSSTransitionGroup
214
- transitionName={ customTransitionNames }
212
+ transitionName={customTransitionNames}
213
transitionEnterTimeout={1}
214
transitionLeaveTimeout={1}
215
>
@@ -224,7 +222,7 @@ describe('ReactCSSTransitionGroup', function() {
222
// Add an element
223
ReactDOM.render(
224
<ReactCSSTransitionGroup
227
- transitionName={ customTransitionNames }
225
+ transitionName={customTransitionNames}
226
transitionEnterTimeout={1}
227
transitionLeaveTimeout={1}
228
>
@@ -235,13 +233,13 @@ describe('ReactCSSTransitionGroup', function() {
233
);
234
expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(2);
235
238
- // Test for the custom entering name
239
- expect(hasClassName(ReactDOM.findDOMNode(a).childNodes[1], 'custom-entering')).toBe(true);
236
+ var enteringNode = ReactDOM.findDOMNode(a).childNodes[1];
237
+ expect(CSSCore.hasClass(enteringNode, 'custom-entering')).toBe(true);
238
239
// Remove an element
240
ReactDOM.render(
241
<ReactCSSTransitionGroup
244
- transitionName={ customTransitionNames }
242
+ transitionName={customTransitionNames}
243
transitionEnterTimeout={1}
244
transitionLeaveTimeout={1}
245
>
@@ -251,7 +249,7 @@ describe('ReactCSSTransitionGroup', function() {
249
);
250
expect(ReactDOM.findDOMNode(a).childNodes.length).toBe(2);
251
254
- // Test for the custom leaving name
255
- expect(hasClassName(ReactDOM.findDOMNode(a).childNodes[0], 'custom-leaving')).toBe(true);
252
+ var leavingNode = ReactDOM.findDOMNode(a).childNodes[0];
253
+ expect(CSSCore.hasClass(leavingNode, 'custom-leaving')).toBe(true);
254
});
255
});