Skip to content

Commit b3be6ac

Browse files
zombieJzombieJ
authored
refactor: bump rc-select version with @rc-component/react (#398)
* chore: init * chore: bump rc-test
1 parent e7b6d15 commit b3be6ac

File tree

11 files changed

+78
-176
lines changed

11 files changed

+78
-176
lines changed

‎.fatherrc.js

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
export default {
2-
cjs: 'babel',
3-
esm: { type: 'babel', importLibToEs: true },
4-
preCommit: {
5-
eslint: true,
6-
prettier: true,
7-
},
8-
runtimeHelpers: true,
9-
};
1+
import { defineConfig } from 'father';
2+
3+
export default defineConfig({
4+
plugins: ['@rc-component/father-plugin'],
5+
});

‎.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- uses: actions/setup-node@v1
1717
with:
18-
node-version: '12'
18+
node-version: '16'
1919

2020
- name: cache package-lock.json
2121
uses: actions/cache@v2

‎package.json

+10-7
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,14 @@
3636
"compile": "father build",
3737
"prepublishOnly": "npm run compile && np --no-cleanup --yolo --no-publish",
3838
"lint": "eslint src/ examples/ --ext .tsx,.ts,.jsx,.jsx",
39-
"test": "father test",
39+
"test": "rc-test",
4040
"coverage": "father test --coverage",
4141
"now-build": "npm run build"
4242
},
4343
"devDependencies": {
44+
"@rc-component/father-plugin": "^1.0.0",
45+
"@rc-component/trigger": "^1.4.0",
46+
"@testing-library/react": "^12.1.5",
4447
"@types/classnames": "^2.2.6",
4548
"@types/enzyme": "^3.1.15",
4649
"@types/jest": "^27.0.2",
@@ -50,25 +53,25 @@
5053
"cross-env": "^7.0.0",
5154
"dumi": "^2.1.10",
5255
"enzyme": "^3.3.0",
53-
"enzyme-adapter-react-16": "^1.0.2",
56+
"enzyme-adapter-react-16": "^1.15.6",
5457
"enzyme-to-json": "^3.2.1",
55-
"father": "^2.13.2",
58+
"father": "^4.0.0",
5659
"gh-pages": "^3.1.0",
5760
"glob": "^7.1.6",
61+
"less": "^3.13.1",
5862
"np": "^7.6.0",
5963
"prettier": "^2.7.1",
6064
"rc-form": "^2.4.0",
61-
"rc-trigger": "^5.0.4",
65+
"rc-test": "^7.0.14",
6266
"react": "^16.0.0",
6367
"react-dom": "^16.0.0",
64-
"typescript": "^4.4.2",
65-
"less": "^3.13.1"
68+
"typescript": "^4.4.2"
6669
},
6770
"dependencies": {
6871
"@babel/runtime": "^7.12.5",
6972
"array-tree-filter": "^2.1.0",
7073
"classnames": "^2.3.1",
71-
"rc-select": "~14.2.0",
74+
"rc-select": "~14.3.0",
7275
"rc-tree": "~5.7.0",
7376
"rc-util": "^5.6.1"
7477
},

‎src/Cascader.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import type { BuildInPlacements } from '@rc-component/trigger/lib/interface';
12
import type { BaseSelectProps, BaseSelectPropsWithoutPrivate, BaseSelectRef } from 'rc-select';
23
import { BaseSelect } from 'rc-select';
34
import type { DisplayValueType, Placement } from 'rc-select/lib/BaseSelect';
45
import useId from 'rc-select/lib/hooks/useId';
56
import { conductCheck } from 'rc-tree/lib/utils/conductUtil';
6-
import type { BuildInPlacements } from 'rc-trigger/lib/interface';
77
import useMergedState from 'rc-util/lib/hooks/useMergedState';
88
import * as React from 'react';
99
import CascaderContext from './context';

‎tests/__mocks__/@rc-component/trigger.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import Trigger from '@rc-component/trigger/lib/mock';
2+
3+
export default Trigger;

‎tests/__mocks__/rc-trigger.js

-3
This file was deleted.

‎tests/__snapshots__/index.spec.tsx.snap

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ exports[`Cascader.Basic should not show title when title is falsy 1`] = `
6262

6363
exports[`Cascader.Basic should render custom dropdown correctly 1`] = `
6464
<div
65-
class="rc-cascader-dropdown"
66-
style="opacity: 0; min-width: auto;"
65+
class="rc-cascader-dropdown rc-cascader-dropdown-placement-bottomLeft"
66+
style="left: -1000vw; top: -1000vh; box-sizing: border-box; min-width: auto;"
6767
>
6868
<div>
6969
<div

‎tests/__snapshots__/private.spec.tsx.snap

-102
This file was deleted.

‎tests/__snapshots__/search.spec.tsx.snap

+42-44
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,48 @@ exports[`Cascader.Search should correct render Cascader with same field name of
44
<div
55
class="rc-cascader rc-cascader-single rc-cascader-show-arrow rc-cascader-open rc-cascader-show-search"
66
>
7+
<div
8+
class="rc-cascader-dropdown rc-cascader-dropdown-placement-bottomLeft"
9+
style="left: -1000vw; top: -1000vh; box-sizing: border-box; min-width: 0;"
10+
>
11+
<div>
12+
<div
13+
class="rc-cascader-menus"
14+
>
15+
<ul
16+
class="rc-cascader-menu"
17+
role="menu"
18+
>
19+
<li
20+
aria-checked="false"
21+
class="rc-cascader-menu-item"
22+
data-path-key="Zhejiang__RC_CASCADER_SPLIT__Hangzhou__RC_CASCADER_SPLIT__West Lake"
23+
role="menuitemcheckbox"
24+
title="Zhejiang / Hangzhou / West Lake"
25+
>
26+
<div
27+
class="rc-cascader-menu-item-content"
28+
>
29+
Zhejiang / Hangzhou / West Lake
30+
</div>
31+
</li>
32+
<li
33+
aria-checked="false"
34+
class="rc-cascader-menu-item rc-cascader-menu-item-disabled"
35+
data-path-key="Zhejiang__RC_CASCADER_SPLIT__Hangzhou__RC_CASCADER_SPLIT__Xia Sha"
36+
role="menuitemcheckbox"
37+
title="Zhejiang / Hangzhou / Xia Sha"
38+
>
39+
<div
40+
class="rc-cascader-menu-item-content"
41+
>
42+
Zhejiang / Hangzhou / Xia Sha
43+
</div>
44+
</li>
45+
</ul>
46+
</div>
47+
</div>
48+
</div>
749
<div
850
class="rc-cascader-selector"
951
>
@@ -29,50 +71,6 @@ exports[`Cascader.Search should correct render Cascader with same field name of
2971
style="visibility: hidden;"
3072
/>
3173
</div>
32-
<div>
33-
<div
34-
class="rc-cascader-dropdown"
35-
style="opacity: 0; min-width: 0;"
36-
>
37-
<div>
38-
<div
39-
class="rc-cascader-menus"
40-
>
41-
<ul
42-
class="rc-cascader-menu"
43-
role="menu"
44-
>
45-
<li
46-
aria-checked="false"
47-
class="rc-cascader-menu-item"
48-
data-path-key="Zhejiang__RC_CASCADER_SPLIT__Hangzhou__RC_CASCADER_SPLIT__West Lake"
49-
role="menuitemcheckbox"
50-
title="Zhejiang / Hangzhou / West Lake"
51-
>
52-
<div
53-
class="rc-cascader-menu-item-content"
54-
>
55-
Zhejiang / Hangzhou / West Lake
56-
</div>
57-
</li>
58-
<li
59-
aria-checked="false"
60-
class="rc-cascader-menu-item rc-cascader-menu-item-disabled"
61-
data-path-key="Zhejiang__RC_CASCADER_SPLIT__Hangzhou__RC_CASCADER_SPLIT__Xia Sha"
62-
role="menuitemcheckbox"
63-
title="Zhejiang / Hangzhou / Xia Sha"
64-
>
65-
<div
66-
class="rc-cascader-menu-item-content"
67-
>
68-
Zhejiang / Hangzhou / Xia Sha
69-
</div>
70-
</li>
71-
</ul>
72-
</div>
73-
</div>
74-
</div>
75-
</div>
7674
<span
7775
aria-hidden="true"
7876
class="rc-cascader-arrow"

‎tests/private.spec.tsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* eslint-disable @typescript-eslint/consistent-type-imports */
22

3+
import { render } from '@testing-library/react';
34
import React from 'react';
4-
import { mount } from './enzyme';
55
import Cascader from '../src';
66

77
describe('Cascader.Private', () => {
88
it('dropdownPrefixCls', () => {
9-
const wrapper = mount(
9+
const { container } = render(
1010
<Cascader
1111
defaultValue={['light', 'toy']}
1212
options={[
@@ -27,6 +27,7 @@ describe('Cascader.Private', () => {
2727
/>,
2828
);
2929

30-
expect(wrapper.render()).toMatchSnapshot();
30+
expect(container.querySelector('.bamboo-dropdown')).toBeTruthy();
31+
expect(container.querySelector('.little-menus')).toBeTruthy();
3132
});
3233
});

‎tsconfig.json

+10-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,20 @@
33
"target": "esnext",
44
"moduleResolution": "node",
55
"baseUrl": "./",
6-
"jsx": "preserve",
6+
"jsx": "react",
77
"declaration": true,
88
"skipLibCheck": true,
99
"esModuleInterop": true,
1010
"paths": {
11-
"@/*": ["src/*"],
12-
"@@/*": ["src/.umi/*"],
13-
"rc-cascader": ["src/index.ts"]
11+
"@/*": [
12+
"src/*"
13+
],
14+
"@@/*": [
15+
"src/.umi/*"
16+
],
17+
"rc-cascader": [
18+
"src/index.ts"
19+
]
1420
}
1521
}
1622
}

0 commit comments

Comments
 (0)