diff --git a/package.json b/package.json index b34b7393..e1b2c103 100644 --- a/package.json +++ b/package.json @@ -45,10 +45,10 @@ }, "dependencies": { "@rc-component/motion": "^1.1.4", + "@rc-component/overflow": "^1.0.0", "@rc-component/trigger": "^3.0.0", "@rc-component/util": "^1.3.0", - "clsx": "^2.1.1", - "rc-overflow": "^1.3.1" + "clsx": "^2.1.1" }, "devDependencies": { "@rc-component/father-plugin": "^2.0.2", diff --git a/src/Menu.tsx b/src/Menu.tsx index b87d2024..f8a1b87a 100644 --- a/src/Menu.tsx +++ b/src/Menu.tsx @@ -1,6 +1,6 @@ import { clsx } from 'clsx'; import type { CSSMotionProps } from '@rc-component/motion'; -import Overflow from 'rc-overflow'; +import Overflow from '@rc-component/overflow'; import useControlledState from '@rc-component/util/lib/hooks/useControlledState'; import useId from '@rc-component/util/lib/hooks/useId'; import isEqual from '@rc-component/util/lib/isEqual'; @@ -50,8 +50,10 @@ import { warnItemProp } from './utils/warnUtil'; // optimize for render const EMPTY_LIST: string[] = []; -export interface MenuProps - extends Omit, 'onClick' | 'onSelect' | 'dir'> { +export interface MenuProps extends Omit< + React.HTMLAttributes, + 'onClick' | 'onSelect' | 'dir' +> { prefixCls?: string; rootClassName?: string; classNames?: Partial>; diff --git a/src/MenuItem.tsx b/src/MenuItem.tsx index 952ee41b..3405fae6 100644 --- a/src/MenuItem.tsx +++ b/src/MenuItem.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx'; -import Overflow from 'rc-overflow'; +import Overflow from '@rc-component/overflow'; import KeyCode from '@rc-component/util/lib/KeyCode'; import omit from '@rc-component/util/lib/omit'; import { useComposeRef } from '@rc-component/util/lib/ref'; @@ -16,7 +16,8 @@ import type { MenuInfo, MenuItemType } from './interface'; import { warnItemProp } from './utils/warnUtil'; export interface MenuItemProps - extends Omit, + extends + Omit, Omit< React.HTMLAttributes, 'onClick' | 'onMouseEnter' | 'onMouseLeave' | 'onSelect' diff --git a/src/SubMenu/index.tsx b/src/SubMenu/index.tsx index fc9debe2..a7824e8f 100644 --- a/src/SubMenu/index.tsx +++ b/src/SubMenu/index.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { clsx } from 'clsx'; -import Overflow from 'rc-overflow'; +import Overflow from '@rc-component/overflow'; import warning from '@rc-component/util/lib/warning'; import SubMenuList from './SubMenuList'; import { parseChildren } from '../utils/commonUtil'; diff --git a/tests/Responsive.spec.tsx b/tests/Responsive.spec.tsx index 064dfaf9..aa137991 100644 --- a/tests/Responsive.spec.tsx +++ b/tests/Responsive.spec.tsx @@ -1,6 +1,6 @@ /* eslint-disable no-undef, react/no-multi-comp, react/jsx-curly-brace-presence, max-classes-per-file */ import { act, fireEvent, render } from '@testing-library/react'; -import ResizeObserver from 'rc-resize-observer'; +import ResizeObserver from '@rc-component/resize-observer'; import KeyCode from '@rc-component/util/lib/KeyCode'; import { spyElementPrototype } from '@rc-component/util/lib/test/domHook'; import React from 'react'; @@ -8,9 +8,9 @@ import Menu, { MenuItem, SubMenu } from '../src'; import { OVERFLOW_KEY } from '../src/hooks/useKeyRecords'; import { last } from './util'; -jest.mock('rc-resize-observer', () => { +jest.mock('@rc-component/resize-observer', () => { const R = require('react'); - let RO = jest.requireActual('rc-resize-observer'); + let RO = jest.requireActual('@rc-component/resize-observer'); RO = RO.default || RO; let guid = 0;