Skip to content

Commit

Permalink
refactor: bump rc-select version with @rc-component/react (#398)
Browse files Browse the repository at this point in the history
* chore: init

* chore: bump rc-test
  • Loading branch information
zombieJ authored Mar 2, 2023
1 parent e7b6d15 commit b3be6ac
Show file tree
Hide file tree
Showing 11 changed files with 78 additions and 176 deletions.
14 changes: 5 additions & 9 deletions .fatherrc.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
export default {
cjs: 'babel',
esm: { type: 'babel', importLibToEs: true },
preCommit: {
eslint: true,
prettier: true,
},
runtimeHelpers: true,
};
import { defineConfig } from 'father';

export default defineConfig({
plugins: ['@rc-component/father-plugin'],
});
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions/setup-node@v1
with:
node-version: '12'
node-version: '16'

- name: cache package-lock.json
uses: actions/cache@v2
Expand Down
17 changes: 10 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,14 @@
"compile": "father build",
"prepublishOnly": "npm run compile && np --no-cleanup --yolo --no-publish",
"lint": "eslint src/ examples/ --ext .tsx,.ts,.jsx,.jsx",
"test": "father test",
"test": "rc-test",
"coverage": "father test --coverage",
"now-build": "npm run build"
},
"devDependencies": {
"@rc-component/father-plugin": "^1.0.0",
"@rc-component/trigger": "^1.4.0",
"@testing-library/react": "^12.1.5",
"@types/classnames": "^2.2.6",
"@types/enzyme": "^3.1.15",
"@types/jest": "^27.0.2",
Expand All @@ -50,25 +53,25 @@
"cross-env": "^7.0.0",
"dumi": "^2.1.10",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.0.2",
"enzyme-adapter-react-16": "^1.15.6",
"enzyme-to-json": "^3.2.1",
"father": "^2.13.2",
"father": "^4.0.0",
"gh-pages": "^3.1.0",
"glob": "^7.1.6",
"less": "^3.13.1",
"np": "^7.6.0",
"prettier": "^2.7.1",
"rc-form": "^2.4.0",
"rc-trigger": "^5.0.4",
"rc-test": "^7.0.14",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"typescript": "^4.4.2",
"less": "^3.13.1"
"typescript": "^4.4.2"
},
"dependencies": {
"@babel/runtime": "^7.12.5",
"array-tree-filter": "^2.1.0",
"classnames": "^2.3.1",
"rc-select": "~14.2.0",
"rc-select": "~14.3.0",
"rc-tree": "~5.7.0",
"rc-util": "^5.6.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Cascader.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { BuildInPlacements } from '@rc-component/trigger/lib/interface';
import type { BaseSelectProps, BaseSelectPropsWithoutPrivate, BaseSelectRef } from 'rc-select';
import { BaseSelect } from 'rc-select';
import type { DisplayValueType, Placement } from 'rc-select/lib/BaseSelect';
import useId from 'rc-select/lib/hooks/useId';
import { conductCheck } from 'rc-tree/lib/utils/conductUtil';
import type { BuildInPlacements } from 'rc-trigger/lib/interface';
import useMergedState from 'rc-util/lib/hooks/useMergedState';
import * as React from 'react';
import CascaderContext from './context';
Expand Down
3 changes: 3 additions & 0 deletions tests/__mocks__/@rc-component/trigger.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Trigger from '@rc-component/trigger/lib/mock';

export default Trigger;
3 changes: 0 additions & 3 deletions tests/__mocks__/rc-trigger.js

This file was deleted.

4 changes: 2 additions & 2 deletions tests/__snapshots__/index.spec.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ exports[`Cascader.Basic should not show title when title is falsy 1`] = `

exports[`Cascader.Basic should render custom dropdown correctly 1`] = `
<div
class="rc-cascader-dropdown"
style="opacity: 0; min-width: auto;"
class="rc-cascader-dropdown rc-cascader-dropdown-placement-bottomLeft"
style="left: -1000vw; top: -1000vh; box-sizing: border-box; min-width: auto;"
>
<div>
<div
Expand Down
102 changes: 0 additions & 102 deletions tests/__snapshots__/private.spec.tsx.snap

This file was deleted.

86 changes: 42 additions & 44 deletions tests/__snapshots__/search.spec.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,48 @@ exports[`Cascader.Search should correct render Cascader with same field name of
<div
class="rc-cascader rc-cascader-single rc-cascader-show-arrow rc-cascader-open rc-cascader-show-search"
>
<div
class="rc-cascader-dropdown rc-cascader-dropdown-placement-bottomLeft"
style="left: -1000vw; top: -1000vh; box-sizing: border-box; min-width: 0;"
>
<div>
<div
class="rc-cascader-menus"
>
<ul
class="rc-cascader-menu"
role="menu"
>
<li
aria-checked="false"
class="rc-cascader-menu-item"
data-path-key="Zhejiang__RC_CASCADER_SPLIT__Hangzhou__RC_CASCADER_SPLIT__West Lake"
role="menuitemcheckbox"
title="Zhejiang / Hangzhou / West Lake"
>
<div
class="rc-cascader-menu-item-content"
>
Zhejiang / Hangzhou / West Lake
</div>
</li>
<li
aria-checked="false"
class="rc-cascader-menu-item rc-cascader-menu-item-disabled"
data-path-key="Zhejiang__RC_CASCADER_SPLIT__Hangzhou__RC_CASCADER_SPLIT__Xia Sha"
role="menuitemcheckbox"
title="Zhejiang / Hangzhou / Xia Sha"
>
<div
class="rc-cascader-menu-item-content"
>
Zhejiang / Hangzhou / Xia Sha
</div>
</li>
</ul>
</div>
</div>
</div>
<div
class="rc-cascader-selector"
>
Expand All @@ -29,50 +71,6 @@ exports[`Cascader.Search should correct render Cascader with same field name of
style="visibility: hidden;"
/>
</div>
<div>
<div
class="rc-cascader-dropdown"
style="opacity: 0; min-width: 0;"
>
<div>
<div
class="rc-cascader-menus"
>
<ul
class="rc-cascader-menu"
role="menu"
>
<li
aria-checked="false"
class="rc-cascader-menu-item"
data-path-key="Zhejiang__RC_CASCADER_SPLIT__Hangzhou__RC_CASCADER_SPLIT__West Lake"
role="menuitemcheckbox"
title="Zhejiang / Hangzhou / West Lake"
>
<div
class="rc-cascader-menu-item-content"
>
Zhejiang / Hangzhou / West Lake
</div>
</li>
<li
aria-checked="false"
class="rc-cascader-menu-item rc-cascader-menu-item-disabled"
data-path-key="Zhejiang__RC_CASCADER_SPLIT__Hangzhou__RC_CASCADER_SPLIT__Xia Sha"
role="menuitemcheckbox"
title="Zhejiang / Hangzhou / Xia Sha"
>
<div
class="rc-cascader-menu-item-content"
>
Zhejiang / Hangzhou / Xia Sha
</div>
</li>
</ul>
</div>
</div>
</div>
</div>
<span
aria-hidden="true"
class="rc-cascader-arrow"
Expand Down
7 changes: 4 additions & 3 deletions tests/private.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* eslint-disable @typescript-eslint/consistent-type-imports */

import { render } from '@testing-library/react';
import React from 'react';
import { mount } from './enzyme';
import Cascader from '../src';

describe('Cascader.Private', () => {
it('dropdownPrefixCls', () => {
const wrapper = mount(
const { container } = render(
<Cascader
defaultValue={['light', 'toy']}
options={[
Expand All @@ -27,6 +27,7 @@ describe('Cascader.Private', () => {
/>,
);

expect(wrapper.render()).toMatchSnapshot();
expect(container.querySelector('.bamboo-dropdown')).toBeTruthy();
expect(container.querySelector('.little-menus')).toBeTruthy();
});
});
14 changes: 10 additions & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,20 @@
"target": "esnext",
"moduleResolution": "node",
"baseUrl": "./",
"jsx": "preserve",
"jsx": "react",
"declaration": true,
"skipLibCheck": true,
"esModuleInterop": true,
"paths": {
"@/*": ["src/*"],
"@@/*": ["src/.umi/*"],
"rc-cascader": ["src/index.ts"]
"@/*": [
"src/*"
],
"@@/*": [
"src/.umi/*"
],
"rc-cascader": [
"src/index.ts"
]
}
}
}

1 comment on commit b3be6ac

@vercel
Copy link

@vercel vercel bot commented on b3be6ac Mar 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

cascader – ./

cascader-react-component.vercel.app
cascader-git-master-react-component.vercel.app

Please sign in to comment.