Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 5 additions & 3 deletions src/Menu.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -50,8 +50,10 @@ import { warnItemProp } from './utils/warnUtil';
// optimize for render
const EMPTY_LIST: string[] = [];

export interface MenuProps
extends Omit<React.HTMLAttributes<HTMLUListElement>, 'onClick' | 'onSelect' | 'dir'> {
export interface MenuProps extends Omit<
React.HTMLAttributes<HTMLUListElement>,
'onClick' | 'onSelect' | 'dir'
> {
prefixCls?: string;
rootClassName?: string;
classNames?: Partial<Record<SemanticName, string>>;
Expand Down
5 changes: 3 additions & 2 deletions src/MenuItem.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -16,7 +16,8 @@ import type { MenuInfo, MenuItemType } from './interface';
import { warnItemProp } from './utils/warnUtil';

export interface MenuItemProps
extends Omit<MenuItemType, 'label' | 'key' | 'ref'>,
extends
Omit<MenuItemType, 'label' | 'key' | 'ref'>,
Omit<
React.HTMLAttributes<HTMLLIElement>,
'onClick' | 'onMouseEnter' | 'onMouseLeave' | 'onSelect'
Expand Down
2 changes: 1 addition & 1 deletion src/SubMenu/index.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
6 changes: 3 additions & 3 deletions tests/Responsive.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/* 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';
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;
Expand Down
Loading