Skip to content

Commit eda49a3

Browse files
aojunhao123zombieJ
aojunhao123
and
zombieJ
authored
chore: update dependencies and import paths to @rc-component packages dependencies (#756)
* chore: update dependencies and import paths to @rc-component packages dependencies * chore: update package name to @rc-component/menu * chore: update import paths to @rc-component/menu in example files * docs: format * chore: back of version * chore: update deps --------- Co-authored-by: 二货机器人 <[email protected]>
1 parent a6ac700 commit eda49a3

35 files changed

+152
-170
lines changed

Diff for: ‎.prettierrc

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"semi": true,
44
"singleQuote": true,
55
"tabWidth": 2,
6+
"printWidth": 100,
7+
"proseWrap": "never",
68
"trailingComma": "all",
79
"arrowParens": "avoid"
810
}

Diff for: ‎README.md

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@
44

55
React Menu Component. port from https://github.com/kissyteam/menu
66

7-
[![NPM version][npm-image]][npm-url]
8-
[![npm download][download-image]][download-url]
9-
[![build status][github-actions-image]][github-actions-url]
10-
[![Codecov][codecov-image]][codecov-url]
11-
[![bundle size][bundlephobia-image]][bundlephobia-url]
12-
[![dumi][dumi-image]][dumi-url]
7+
[![NPM version][npm-image]][npm-url] [![npm download][download-image]][download-url] [![build status][github-actions-image]][github-actions-url] [![Codecov][codecov-image]][codecov-url] [![bundle size][bundlephobia-image]][bundlephobia-url] [![dumi][dumi-image]][dumi-url]
138

149
[npm-image]: http://img.shields.io/npm/v/rc-menu.svg?style=flat-square
1510
[npm-url]: http://npmjs.org/package/rc-menu
@@ -172,7 +167,7 @@ ReactDOM.render(
172167
<td>openAnimation</td>
173168
<td>{enter:function,leave:function}|String</td>
174169
<th></th>
175-
<td>animate when sub menu open or close. see rc-motion for object type.</td>
170+
<td>animate when sub menu open or close. see @rc-component/motion for object type.</td>
176171
</tr>
177172
<tr>
178173
<td>openTransition</td>

Diff for: ‎docs/examples/antd.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-console, react/require-default-props, no-param-reassign */
22

33
import React from 'react';
4-
import type { CSSMotionProps } from 'rc-motion';
4+
import type { CSSMotionProps } from '@rc-component/motion';
55
import Menu, { SubMenu, Item as MenuItem, Divider, MenuProps } from '../../src';
66
import '../../assets/index.less';
77

Diff for: ‎docs/examples/debug.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint no-console:0 */
22

33
import React, { useRef } from 'react';
4-
import type { CSSMotionProps } from 'rc-motion';
4+
import type { CSSMotionProps } from '@rc-component/motion';
55
import Menu, { ItemGroup as MenuItemGroup, MenuItem } from '../../src';
66
import type { MenuProps } from '../../src';
77
import '../../assets/index.less';

Diff for: ‎docs/examples/fragment.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import Menu, { SubMenu, Item as MenuItem, Divider } from 'rc-menu';
2+
import Menu, { SubMenu, Item as MenuItem, Divider } from '@rc-component/menu';
33
import '../../assets/index.less';
44

55
export default () => (

Diff for: ‎docs/examples/inlineCollapsed.tsx

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
import React, { useState } from 'react';
2-
import Menu from 'rc-menu';
2+
import Menu from '@rc-component/menu';
33
import './inlineCollapsed.less';
44

55
const App = () => {
66
const [collapsed, setCollapsed] = useState(false);
77
return (
88
<>
99
<label>
10-
<input type="checkbox" checked={collapsed} onChange={e => setCollapsed(e.target.checked)} />
10+
<input
11+
type="checkbox"
12+
checked={collapsed}
13+
onChange={e => setCollapsed(e.target.checked)}
14+
/>
1115
inlineCollapsed: {collapsed.toString()}
1216
</label>
1317
<Menu
@@ -24,18 +28,20 @@ const App = () => {
2428
{ key: '3', label: 'item 2' },
2529
{ key: '4', label: 'item 3' },
2630
{
27-
key: '5', label: 'SubMenu', children: [
31+
key: '5',
32+
label: 'SubMenu',
33+
children: [
2834
{ key: '6', label: 'item 4' },
2935
{ key: '7', label: 'item 5' },
3036
{ key: '8', label: 'item 6' },
31-
]
32-
}
37+
],
38+
},
3339
],
3440
},
3541
]}
3642
/>
3743
</>
3844
);
39-
}
45+
};
4046

4147
export default App;

Diff for: ‎docs/examples/keyPath.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint no-console:0 */
22

33
import React from 'react';
4-
import Menu, { SubMenu, Item as MenuItem } from 'rc-menu';
4+
import Menu, { SubMenu, Item as MenuItem } from '@rc-component/menu';
55

66
import '../../assets/index.less';
77

Diff for: ‎docs/examples/menuItemGroup.tsx

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
/* eslint no-console:0 */
22

33
import React from 'react';
4-
import Menu, { Item as MenuItem, ItemGroup as MenuItemGroup } from 'rc-menu';
4+
import Menu, {
5+
Item as MenuItem,
6+
ItemGroup as MenuItemGroup,
7+
} from '@rc-component/menu';
58

69
import '../../assets/index.less';
710

811
export default () => (
912
<div>
1013
<h2>menu item group</h2>
11-
<Menu style={{ margin: 20, width: 300 }} onClick={() => console.log('click')}>
14+
<Menu
15+
style={{ margin: 20, width: 300 }}
16+
onClick={() => console.log('click')}
17+
>
1218
<MenuItemGroup title="group 1" key="2">
1319
<MenuItem key="21">2</MenuItem>
1420
<MenuItem key="22">3</MenuItem>

Diff for: ‎docs/examples/multiple.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint no-console:0 */
22

33
import React from 'react';
4-
import Menu, { SubMenu, Item as MenuItem, Divider } from 'rc-menu';
4+
import Menu, { SubMenu, Item as MenuItem, Divider } from '@rc-component/menu';
55

66
import '../../assets/index.less';
77

Diff for: ‎docs/examples/openKeys.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint no-console:0 */
22

33
import React from 'react';
4-
import Menu, { SubMenu, Item as MenuItem } from 'rc-menu';
4+
import Menu, { SubMenu, Item as MenuItem } from '@rc-component/menu';
55

66
import '../../assets/index.less';
77

Diff for: ‎docs/examples/rtl-antd.tsx

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
/* eslint-disable no-console, react/require-default-props, no-param-reassign */
22

33
import React from 'react';
4-
import type { CSSMotionProps } from 'rc-motion';
5-
import Menu, { SubMenu, Item as MenuItem, Divider, MenuProps } from 'rc-menu';
4+
import type { CSSMotionProps } from '@rc-component/motion';
5+
import Menu, {
6+
SubMenu,
7+
Item as MenuItem,
8+
Divider,
9+
MenuProps,
10+
} from '@rc-component/menu';
611
import '../../assets/index.less';
712

813
function handleClick(info) {
@@ -122,8 +127,8 @@ const children2 = [
122127
const customizeIndicator = <span>Add More Items</span>;
123128

124129
interface CommonMenuState {
125-
children: React.ReactNode;
126-
overflowedIndicator?: React.ReactNode;
130+
children: React.ReactNode;
131+
overflowedIndicator?: React.ReactNode;
127132
}
128133

129134
class CommonMenu extends React.Component<any, CommonMenuState> {

Diff for: ‎docs/examples/scrollable.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint no-console:0 */
22

33
import React from 'react';
4-
import Menu, { Item as MenuItem } from 'rc-menu';
4+
import Menu, { Item as MenuItem } from '@rc-component/menu';
55

66
import '../../assets/index.less';
77

Diff for: ‎docs/examples/selectedKeys.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/* eslint no-console:0 */
22

33
import React from 'react';
4-
import Menu, { SubMenu, Item as MenuItem } from 'rc-menu';
4+
import Menu, { SubMenu, Item as MenuItem } from '@rc-component/menu';
55

66
import '../../assets/index.less';
77

88
interface TestState {
9-
destroyed: boolean;
10-
selectedKeys: string[];
11-
openKeys: string[];
12-
}
9+
destroyed: boolean;
10+
selectedKeys: string[];
11+
openKeys: string[];
12+
}
1313

1414
class Test extends React.Component<any, TestState> {
1515
state = {

Diff for: ‎docs/examples/single.tsx

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
/* eslint no-console:0 */
22

33
import React from 'react';
4-
import Menu from 'rc-menu';
4+
import Menu from '@rc-component/menu';
55
import '../../assets/index.less';
66

77
const menu1List = [
88
{
9-
titleLocalKey: "Properties",
10-
key: "Properties"
9+
titleLocalKey: 'Properties',
10+
key: 'Properties',
1111
},
1212
{
13-
titleLocalKey: "Resources",
14-
key: "Resources",
13+
titleLocalKey: 'Resources',
14+
key: 'Resources',
1515
children: [
1616
{
17-
titleLocalKey: "FAQ",
18-
key: "Faq",
19-
isSub: true
17+
titleLocalKey: 'FAQ',
18+
key: 'Faq',
19+
isSub: true,
2020
},
2121
{
22-
titleLocalKey: "Learn",
23-
key: "Learn",
24-
isSub: true
25-
}
26-
]
22+
titleLocalKey: 'Learn',
23+
key: 'Learn',
24+
isSub: true,
25+
},
26+
],
2727
},
2828
{
29-
titleLocalKey: "About Us",
30-
key: "AboutUs"
31-
}
29+
titleLocalKey: 'About Us',
30+
key: 'AboutUs',
31+
},
3232
];
3333

34-
const menu1Items = (values) => {
34+
const menu1Items = values => {
3535
if (!values) {
3636
return undefined;
3737
}
3838
return values.map((item, index) => {
3939
return {
4040
label: <div>{item.titleLocalKey}</div>,
4141
key: item.key,
42-
children: menu1Items(item.children)
42+
children: menu1Items(item.children),
4343
};
4444
});
4545
};
@@ -48,10 +48,10 @@ console.log(menu1Items(menu1List));
4848

4949
export default () => (
5050
<Menu
51-
selectable={false}
52-
mode="inline"
53-
defaultOpenKeys={['Resources']}
54-
style={{ width: "100%" }}
55-
items={menu1Items(menu1List)}
56-
/>
57-
)
51+
selectable={false}
52+
mode="inline"
53+
defaultOpenKeys={['Resources']}
54+
style={{ width: '100%' }}
55+
items={menu1Items(menu1List)}
56+
/>
57+
);

Diff for: ‎package.json

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "rc-menu",
3-
"version": "9.16.1",
2+
"name": "@rc-component/menu",
3+
"version": "1.0.0",
44
"description": "menu ui component for react",
55
"keywords": [
66
"react",
@@ -37,22 +37,22 @@
3737
"docs:deploy": "gh-pages -d .doc",
3838
"lint": "eslint src/ --ext .tsx,.ts,.jsx,.js",
3939
"now-build": "npm run build",
40-
"prepublishOnly": "npm run compile && np --yolo --no-publish",
41-
"postpublish": "tnpm sync rc-menu",
40+
"prepublishOnly": "npm run compile && rc-np",
41+
"postpublish": "tnpm sync @rc-component/menu",
4242
"start": "dumi dev",
4343
"test": "rc-test",
4444
"prepare": "husky && dumi setup"
4545
},
4646
"dependencies": {
47-
"@babel/runtime": "^7.10.1",
48-
"@rc-component/trigger": "^2.0.0",
47+
"@rc-component/motion": "^1.1.4",
48+
"@rc-component/trigger": "^3.0.0",
49+
"@rc-component/util": "^1.0.0",
4950
"classnames": "2.x",
50-
"rc-motion": "^2.4.3",
51-
"rc-overflow": "^1.3.1",
52-
"rc-util": "^5.27.0"
51+
"rc-overflow": "^1.3.1"
5352
},
5453
"devDependencies": {
55-
"@rc-component/father-plugin": "^1.0.0",
54+
"@rc-component/father-plugin": "^2.0.2",
55+
"@rc-component/np": "^1.0.3",
5656
"@testing-library/jest-dom": "^6.1.5",
5757
"@testing-library/react": "^16.0.0",
5858
"@types/jest": "^29.5.2",
@@ -70,7 +70,6 @@
7070
"husky": "^9.1.6",
7171
"less": "^4.1.3",
7272
"lint-staged": "^15.2.10",
73-
"np": "^10.0.5",
7473
"prettier": "^3.3.3",
7574
"rc-test": "^7.0.14",
7675
"react": "^18.3.1",

Diff for: ‎src/Menu.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import classNames from 'classnames';
2-
import type { CSSMotionProps } from 'rc-motion';
2+
import type { CSSMotionProps } from '@rc-component/motion';
33
import Overflow from 'rc-overflow';
4-
import useMergedState from 'rc-util/lib/hooks/useMergedState';
5-
import isEqual from 'rc-util/lib/isEqual';
6-
import warning from 'rc-util/lib/warning';
4+
import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
5+
import isEqual from '@rc-component/util/lib/isEqual';
6+
import warning from '@rc-component/util/lib/warning';
77
import * as React from 'react';
88
import { useImperativeHandle } from 'react';
99
import { flushSync } from 'react-dom';

Diff for: ‎src/MenuItem.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import classNames from 'classnames';
22
import Overflow from 'rc-overflow';
3-
import KeyCode from 'rc-util/lib/KeyCode';
4-
import omit from 'rc-util/lib/omit';
5-
import { useComposeRef } from 'rc-util/lib/ref';
6-
import warning from 'rc-util/lib/warning';
3+
import KeyCode from '@rc-component/util/lib/KeyCode';
4+
import omit from '@rc-component/util/lib/omit';
5+
import { useComposeRef } from '@rc-component/util/lib/ref';
6+
import warning from '@rc-component/util/lib/warning';
77
import * as React from 'react';
88
import { useMenuId } from './context/IdContext';
99
import { MenuContext } from './context/MenuContext';

Diff for: ‎src/MenuItemGroup.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import classNames from 'classnames';
2-
import omit from 'rc-util/lib/omit';
2+
import omit from '@rc-component/util/lib/omit';
33
import * as React from 'react';
44
import { MenuContext } from './context/MenuContext';
55
import { useFullPath, useMeasure } from './context/PathContext';

Diff for: ‎src/SubMenu/InlineSubMenuList.tsx

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import CSSMotion from 'rc-motion';
2+
import CSSMotion from '@rc-component/motion';
33
import { getMotion } from '../utils/motionUtil';
44
import MenuContextProvider, { MenuContext } from '../context/MenuContext';
55
import SubMenuList from './SubMenuList';
@@ -20,13 +20,8 @@ export default function InlineSubMenuList({
2020
}: InlineSubMenuListProps) {
2121
const fixedMode: MenuMode = 'inline';
2222

23-
const {
24-
prefixCls,
25-
forceSubMenuRender,
26-
motion,
27-
defaultMotions,
28-
mode,
29-
} = React.useContext(MenuContext);
23+
const { prefixCls, forceSubMenuRender, motion, defaultMotions, mode } =
24+
React.useContext(MenuContext);
3025

3126
// Always use latest mode check
3227
const sameModeRef = React.useRef(false);

0 commit comments

Comments
 (0)