Skip to content

Commit 173a93d

Browse files
authored
Merge pull request #45 from react-component/react16
update react 16
2 parents 4ae82c6 + 0fb0d58 commit 173a93d

File tree

6 files changed

+82
-60
lines changed

6 files changed

+82
-60
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ node_modules
2222
*.css
2323
build
2424
lib
25-
dist
25+
coverage
26+
dist
27+
es

index.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

package.json

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rc-queue-anim",
3-
"version": "1.2.3",
3+
"version": "1.3.0",
44
"description": "Queue animation component for react",
55
"keywords": [
66
"react",
@@ -20,42 +20,47 @@
2020
"files": [
2121
"lib",
2222
"assets/*.css",
23-
"dist"
23+
"dist",
24+
"es"
2425
],
2526
"licenses": "MIT",
2627
"main": "./lib/index",
27-
"entry": {
28-
"rc-queue-anim": [
29-
"./assets/index.less",
30-
"./src/index.js"
31-
]
32-
},
28+
"module": "./es/index",
3329
"config": {
34-
"port": 8001
30+
"port": 8001,
31+
"entry": {
32+
"rc-queue-anim": [
33+
"./assets/index.less",
34+
"./src/index.js"
35+
]
36+
}
3537
},
3638
"scripts": {
39+
"dist": "rc-tools run dist",
3740
"build": "rc-tools run build",
3841
"gh-pages": "rc-tools run gh-pages",
3942
"start": "rc-tools run server",
43+
"compile": "rc-tools run compile --babel-runtime",
4044
"pub": "rc-tools run pub --babel-runtime",
4145
"lint": "rc-tools run lint",
42-
"karma": "rc-tools run karma",
43-
"saucelabs": "rc-tools run saucelabs",
44-
"test": "rc-tools run test",
45-
"chrome-test": "rc-tools run chrome-test",
46-
"coverage": "rc-tools run coverage"
46+
"karma": "rc-test run karma",
47+
"saucelabs": "rc-test run saucelabs",
48+
"test": "rc-test run test",
49+
"chrome-test": "rc-test run chrome-test",
50+
"coverage": "rc-test run coverage"
4751
},
4852
"devDependencies": {
53+
"core-js": "^2.5.1",
54+
"expect.js": "0.3.x",
55+
"pre-commit": "1.x",
56+
"rc-test": "6.x",
57+
"rc-tools": "6.x",
58+
"react": "^16.0.0",
59+
"react-dom": "^16.0.0",
4960
"antd": "^2.12.3",
50-
"expect.js": "~0.3.1",
51-
"history": "^2.1.2",
5261
"jquery": "~1.11.3",
5362
"precommit-hook": "1.x",
5463
"rc-dialog": "~5.2.1",
55-
"rc-tools": "5.x",
56-
"react": "~15.5.0",
57-
"react-addons-test-utils": "~15.5.0",
58-
"react-dom": "~15.5.0",
5964
"react-router-dom": "^4.1.0",
6065
"react-router": "~4.1.0"
6166
},

src/QueueAnim.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,5 +425,5 @@ class QueueAnim extends React.Component {
425425
return createElement(this.props.component, props, childrenToRender);
426426
}
427427
}
428-
428+
QueueAnim.isQueueAnim = true;
429429
export default QueueAnim;

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// export this package's api
22
import QueueAnim from './QueueAnim';
3-
QueueAnim.isQueueAnim = true;
3+
44
export default QueueAnim;

tests/index.js

Lines changed: 52 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
/* eslint no-console:0 */
2+
import 'core-js/es6/map';
3+
import 'core-js/es6/set';
24
import React from 'react';
35
import ReactDom from 'react-dom';
46
import expect from 'expect.js';
5-
import QueueAnim from '../index';
6-
import TestUtils from 'react-addons-test-utils';
7+
import QueueAnim from '../src';
8+
import TestUtils from 'react-dom/test-utils';
79
import ticker from 'rc-tween-one/lib/ticker';
810
import $ from 'jquery';
911

@@ -41,55 +43,53 @@ describe('rc-queue-anim', () => {
4143
}
4244

4345
function createQueueAnimInstance(props = {}) {
44-
const QueueAnimExample = React.createClass({
45-
getInitialState() {
46-
return {
47-
show: true,
48-
unMount: false,
49-
items: [{
50-
key: 1,
51-
content: 'div',
52-
}, {
53-
key: 2,
54-
content: 'div',
55-
}, {
56-
key: 3,
57-
content: 'div',
58-
}],
59-
};
60-
},
61-
toggle() {
46+
class QueueAnimExample extends React.Component {
47+
state = {
48+
show: true,
49+
unMount: false,
50+
items: [{
51+
key: 1,
52+
content: 'div',
53+
}, {
54+
key: 2,
55+
content: 'div',
56+
}, {
57+
key: 3,
58+
content: 'div',
59+
}],
60+
}
61+
toggle = () => {
6262
this.setState({
6363
show: !this.state.show,
6464
});
65-
},
66-
unMountQueue() {
65+
}
66+
unMountQueue = () => {
6767
this.setState({
6868
unMount: true,
6969
});
70-
},
71-
removeOne() {
70+
}
71+
removeOne = () => {
7272
const items = this.state.items;
7373
const removeIndex = 0;
7474
items.splice(removeIndex, 1);
7575
this.setState({ items });
7676
return removeIndex;
77-
},
77+
}
7878
render() {
7979
return (
8080
<section>
8181
{!this.state.unMount ? <QueueAnim {...props}>
82-
{
83-
this.state.show ?
84-
this.state.items.map((item) => <div key={item.key}>{item.content}</div>) :
85-
null
86-
}
87-
{null}
88-
</QueueAnim> : null}
82+
{
83+
this.state.show ?
84+
this.state.items.map((item) => <div key={item.key}>{item.content}</div>) :
85+
null
86+
}
87+
{null}
88+
</QueueAnim> : null}
8989
</section>
9090
);
91-
},
92-
});
91+
}
92+
}
9393
return ReactDom.render(<QueueAnimExample />, div);
9494
}
9595

@@ -223,6 +223,24 @@ describe('rc-queue-anim', () => {
223223
}, 18);
224224
});
225225

226+
it('should support custom animation config array', (done) => {
227+
const instance = createQueueAnimInstance({
228+
animConfig: [
229+
[{ left: [100, 0] }, { top: [100, 0] }],
230+
],
231+
});
232+
let children = TestUtils.scryRenderedDOMComponentsWithTag(instance, 'div');
233+
expect(isNaN(children[1])).to.be.ok();
234+
ticker.timeout(() => {
235+
children = TestUtils.scryRenderedDOMComponentsWithTag(instance, 'div');
236+
console.log('left:', getLeft(children[1]));
237+
console.log('top:', getTop(children[1]));
238+
expect(getLeft(children[1])).to.be(100);
239+
expect(getTop(children[1])).to.be(100);
240+
done();
241+
}, 917);
242+
});
243+
226244
it('should support animation when change direction at animating', (done) => {
227245
const instance = createQueueAnimInstance({
228246
leaveReverse: true,

0 commit comments

Comments
 (0)