Skip to content

Commit 24d1da5

Browse files
shaodahongzombieJ
shaodahong
authored and
zombieJ
committed
refactor: upgrade rc-trigger (#79)
* refactor: upgrade rc-trigger * add type * change ci node version * improve type * improve type and refactor isEqualArrays * fix LGTM * fix type
1 parent ec54bfb commit 24d1da5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1007
-785
lines changed

‎.eslintrc.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
const base = require('@umijs/fabric/dist/eslint');
2+
3+
module.exports = {
4+
...base,
5+
rules: {
6+
...base.rules,
7+
'no-template-curly-in-string': 0,
8+
'prefer-promise-reject-errors': 0,
9+
'react/no-array-index-key': 0,
10+
'react/sort-comp': 0,
11+
'@typescript-eslint/no-explicit-any': 0,
12+
'jsx-a11y/label-has-associated-control': 0,
13+
'jsx-a11y/label-has-for': 0,
14+
'no-shadow': 0
15+
},
16+
};

‎.fatherrc.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
export default {
2+
cjs: 'babel',
3+
esm: { type: 'babel', importLibToEs: true },
4+
preCommit: {
5+
eslint: true,
6+
prettier: true,
7+
},
8+
};

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.storybook
12
*.iml
23
*.log
34
.idea

‎.travis.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
11
language: node_js
22

3-
sudo: false
4-
5-
notifications:
6-
email:
7-
- [email protected]
83

94
node_js:
10-
- 6
5+
- 10
116

127
before_install:
13-
- |
8+
- |
149
if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.md$)|(^(docs|examples))/'
1510
then
1611
echo "Only docs were updated, stopping build process."
1712
exit
1813
fi
1914
script:
20-
- |
15+
- |
2116
if [ "$TEST_TYPE" = test ]; then
22-
npm test -- --coverage && \
17+
npm run coverage && \
2318
bash <(curl -s https://codecov.io/bash)
2419
else
2520
npm run $TEST_TYPE
2621
fi
2722
env:
2823
matrix:
29-
- TEST_TYPE=lint
30-
- TEST_TYPE=test
24+
- TEST_TYPE=lint
25+
- TEST_TYPE=test

‎examples/adjust-overflow.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎examples/adjust-overflow.js

Lines changed: 69 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,73 @@
11
/* eslint-disable no-console, react/prop-types */
2-
import 'rc-cascader/assets/index.less';
3-
import Cascader from 'rc-cascader';
42
import React from 'react';
5-
import ReactDOM from 'react-dom';
3+
import '../assets/index.less';
4+
import Cascader from '../src';
65

7-
const addressOptions = [{
8-
label: '福建',
9-
value: 'fj',
10-
children: [{
11-
label: '福州',
12-
value: 'fuzhou',
13-
children: [{
14-
label: '马尾',
15-
value: 'mawei',
16-
}],
17-
}, {
18-
label: '泉州',
19-
value: 'quanzhou',
20-
}],
21-
}, {
22-
label: '浙江',
23-
value: 'zj',
24-
children: [{
25-
label: '杭州',
26-
value: 'hangzhou',
27-
children: [{
28-
label: '余杭',
29-
value: 'yuhang',
30-
}],
31-
}],
32-
}, {
33-
label: '北京',
34-
value: 'bj',
35-
children: [{
36-
label: '朝阳区',
37-
value: 'chaoyang',
38-
}, {
39-
label: '海淀区',
40-
value: 'haidian',
41-
disabled: true,
42-
}],
43-
}];
6+
const addressOptions = [
7+
{
8+
label: '福建',
9+
value: 'fj',
10+
children: [
11+
{
12+
label: '福州',
13+
value: 'fuzhou',
14+
children: [
15+
{
16+
label: '马尾',
17+
value: 'mawei',
18+
},
19+
],
20+
},
21+
{
22+
label: '泉州',
23+
value: 'quanzhou',
24+
},
25+
],
26+
},
27+
{
28+
label: '浙江',
29+
value: 'zj',
30+
children: [
31+
{
32+
label: '杭州',
33+
value: 'hangzhou',
34+
children: [
35+
{
36+
label: '余杭',
37+
value: 'yuhang',
38+
},
39+
],
40+
},
41+
],
42+
},
43+
{
44+
label: '北京',
45+
value: 'bj',
46+
children: [
47+
{
48+
label: '朝阳区',
49+
value: 'chaoyang',
50+
},
51+
{
52+
label: '海淀区',
53+
value: 'haidian',
54+
disabled: true,
55+
},
56+
],
57+
},
58+
];
4459

4560
class MyCascader extends React.Component {
4661
state = {
4762
inputValue: '',
48-
}
63+
};
4964

5065
onChange = (value, selectedOptions) => {
5166
console.log(value, selectedOptions);
5267
this.setState({
5368
inputValue: selectedOptions.map(o => o.label).join(', '),
5469
});
55-
}
70+
};
5671

5772
render() {
5873
const { builtinPlacements } = this.props;
@@ -103,11 +118,15 @@ const placements = {
103118
},
104119
};
105120

106-
ReactDOM.render(
107-
<div style={{ position: 'absolute', right: 10, top: 150 }}>
108-
<MyCascader />
109-
<br />
110-
<br />
111-
<MyCascader builtinPlacements={placements} />
112-
</div>
113-
, document.getElementById('__react-content'));
121+
function Demo() {
122+
return (
123+
<div style={{ position: 'absolute', right: 10, top: 150 }}>
124+
<MyCascader />
125+
<br />
126+
<br />
127+
<MyCascader builtinPlacements={placements} />
128+
</div>
129+
);
130+
}
131+
132+
export default Demo;

‎examples/animation.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎examples/animation.js

Lines changed: 57 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,72 @@
11
/* eslint-disable no-console */
2-
import 'rc-cascader/assets/index.less';
3-
import Cascader from 'rc-cascader';
42
import React from 'react';
5-
import ReactDOM from 'react-dom';
3+
import '../assets/index.less';
4+
import Cascader from '../src';
65

7-
const addressOptions = [{
8-
label: '福建',
9-
value: 'fj',
10-
children: [{
11-
label: '福州',
12-
value: 'fuzhou',
13-
children: [{
14-
label: '马尾',
15-
value: 'mawei',
16-
}],
17-
}, {
18-
label: '泉州',
19-
value: 'quanzhou',
20-
}],
21-
}, {
22-
label: '浙江',
23-
value: 'zj',
24-
children: [{
25-
label: '杭州',
26-
value: 'hangzhou',
27-
children: [{
28-
label: '余杭',
29-
value: 'yuhang',
30-
}],
31-
}],
32-
}, {
33-
label: '北京',
34-
value: 'bj',
35-
children: [{
36-
label: '朝阳区',
37-
value: 'chaoyang',
38-
}, {
39-
label: '海淀区',
40-
value: 'haidian',
41-
}],
42-
}];
6+
const addressOptions = [
7+
{
8+
label: '福建',
9+
value: 'fj',
10+
children: [
11+
{
12+
label: '福州',
13+
value: 'fuzhou',
14+
children: [
15+
{
16+
label: '马尾',
17+
value: 'mawei',
18+
},
19+
],
20+
},
21+
{
22+
label: '泉州',
23+
value: 'quanzhou',
24+
},
25+
],
26+
},
27+
{
28+
label: '浙江',
29+
value: 'zj',
30+
children: [
31+
{
32+
label: '杭州',
33+
value: 'hangzhou',
34+
children: [
35+
{
36+
label: '余杭',
37+
value: 'yuhang',
38+
},
39+
],
40+
},
41+
],
42+
},
43+
{
44+
label: '北京',
45+
value: 'bj',
46+
children: [
47+
{
48+
label: '朝阳区',
49+
value: 'chaoyang',
50+
},
51+
{
52+
label: '海淀区',
53+
value: 'haidian',
54+
},
55+
],
56+
},
57+
];
4358

4459
class Demo extends React.Component {
4560
state = {
4661
inputValue: '',
47-
}
62+
};
4863

4964
onChange = (value, selectedOptions) => {
5065
console.log(value, selectedOptions);
5166
this.setState({
5267
inputValue: selectedOptions.map(o => o.label).join(', '),
5368
});
54-
}
69+
};
5570

5671
render() {
5772
return (
@@ -62,4 +77,4 @@ class Demo extends React.Component {
6277
}
6378
}
6479

65-
ReactDOM.render(<Demo />, document.getElementById('__react-content'));
80+
export default Demo;

‎examples/change-on-select.html

Whitespace-only changes.

‎examples/change-on-select.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/* eslint-disable no-console */
2-
import 'rc-cascader/assets/index.less';
3-
import Cascader from 'rc-cascader';
42
import React from 'react';
5-
import ReactDOM from 'react-dom';
3+
import '../assets/index.less';
4+
import Cascader from '../src';
65

76
const addressOptions = [
87
{
@@ -84,4 +83,4 @@ class Demo extends React.Component {
8483
}
8584
}
8685

87-
ReactDOM.render(<Demo />, document.getElementById('__react-content'));
86+
export default Demo;

‎examples/custom-arrow-icon.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎examples/custom-arrow-icon.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/* eslint-disable no-console */
2-
import 'rc-cascader/assets/index.less';
3-
import Cascader from 'rc-cascader';
42
import React from 'react';
5-
import ReactDOM from 'react-dom';
3+
import '../assets/index.less';
4+
import Cascader from '../src';
65

76
const addressOptions = [
87
{
@@ -171,6 +170,7 @@ class Demo extends React.Component {
171170
},
172171
];
173172
this.setState({
173+
// eslint-disable-next-line react/no-access-state-in-setstate
174174
options: [...this.state.options],
175175
});
176176
}, 1500);
@@ -202,4 +202,4 @@ class Demo extends React.Component {
202202
}
203203
}
204204

205-
ReactDOM.render(<Demo />, document.getElementById('__react-content'));
205+
export default Demo;

‎examples/custom-field-name.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)