Skip to content

Commit 902cfcd

Browse files
authored
refactor: migrate rc-overflow to @rc-component/overflow (#832)
1 parent aa32249 commit 902cfcd

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
},
4646
"dependencies": {
4747
"@rc-component/motion": "^1.1.4",
48+
"@rc-component/overflow": "^1.0.0",
4849
"@rc-component/trigger": "^3.0.0",
4950
"@rc-component/util": "^1.3.0",
50-
"clsx": "^2.1.1",
51-
"rc-overflow": "^1.3.1"
51+
"clsx": "^2.1.1"
5252
},
5353
"devDependencies": {
5454
"@rc-component/father-plugin": "^2.0.2",

src/Menu.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { clsx } from 'clsx';
22
import type { CSSMotionProps } from '@rc-component/motion';
3-
import Overflow from 'rc-overflow';
3+
import Overflow from '@rc-component/overflow';
44
import useControlledState from '@rc-component/util/lib/hooks/useControlledState';
55
import useId from '@rc-component/util/lib/hooks/useId';
66
import isEqual from '@rc-component/util/lib/isEqual';
@@ -50,8 +50,10 @@ import { warnItemProp } from './utils/warnUtil';
5050
// optimize for render
5151
const EMPTY_LIST: string[] = [];
5252

53-
export interface MenuProps
54-
extends Omit<React.HTMLAttributes<HTMLUListElement>, 'onClick' | 'onSelect' | 'dir'> {
53+
export interface MenuProps extends Omit<
54+
React.HTMLAttributes<HTMLUListElement>,
55+
'onClick' | 'onSelect' | 'dir'
56+
> {
5557
prefixCls?: string;
5658
rootClassName?: string;
5759
classNames?: Partial<Record<SemanticName, string>>;

src/MenuItem.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { clsx } from 'clsx';
2-
import Overflow from 'rc-overflow';
2+
import Overflow from '@rc-component/overflow';
33
import KeyCode from '@rc-component/util/lib/KeyCode';
44
import omit from '@rc-component/util/lib/omit';
55
import { useComposeRef } from '@rc-component/util/lib/ref';
@@ -16,7 +16,8 @@ import type { MenuInfo, MenuItemType } from './interface';
1616
import { warnItemProp } from './utils/warnUtil';
1717

1818
export interface MenuItemProps
19-
extends Omit<MenuItemType, 'label' | 'key' | 'ref'>,
19+
extends
20+
Omit<MenuItemType, 'label' | 'key' | 'ref'>,
2021
Omit<
2122
React.HTMLAttributes<HTMLLIElement>,
2223
'onClick' | 'onMouseEnter' | 'onMouseLeave' | 'onSelect'

src/SubMenu/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import { clsx } from 'clsx';
3-
import Overflow from 'rc-overflow';
3+
import Overflow from '@rc-component/overflow';
44
import warning from '@rc-component/util/lib/warning';
55
import SubMenuList from './SubMenuList';
66
import { parseChildren } from '../utils/commonUtil';

tests/Responsive.spec.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/* eslint-disable no-undef, react/no-multi-comp, react/jsx-curly-brace-presence, max-classes-per-file */
22
import { act, fireEvent, render } from '@testing-library/react';
3-
import ResizeObserver from 'rc-resize-observer';
3+
import ResizeObserver from '@rc-component/resize-observer';
44
import KeyCode from '@rc-component/util/lib/KeyCode';
55
import { spyElementPrototype } from '@rc-component/util/lib/test/domHook';
66
import React from 'react';
77
import Menu, { MenuItem, SubMenu } from '../src';
88
import { OVERFLOW_KEY } from '../src/hooks/useKeyRecords';
99
import { last } from './util';
1010

11-
jest.mock('rc-resize-observer', () => {
11+
jest.mock('@rc-component/resize-observer', () => {
1212
const R = require('react');
13-
let RO = jest.requireActual('rc-resize-observer');
13+
let RO = jest.requireActual('@rc-component/resize-observer');
1414
RO = RO.default || RO;
1515

1616
let guid = 0;

0 commit comments

Comments
 (0)