diff --git a/src/SubMenu/index.tsx b/src/SubMenu/index.tsx index a7824e8f..5c78e61c 100644 --- a/src/SubMenu/index.tsx +++ b/src/SubMenu/index.tsx @@ -4,7 +4,7 @@ import Overflow from '@rc-component/overflow'; import warning from '@rc-component/util/lib/warning'; import SubMenuList from './SubMenuList'; import { parseChildren } from '../utils/commonUtil'; -import type { MenuInfo, SubMenuType, PopupRender } from '../interface'; +import type { MenuInfo, SubMenuType } from '../interface'; import MenuContextProvider, { MenuContext } from '../context/MenuContext'; import useMemoCallback from '../hooks/useMemoCallback'; import PopupTrigger from './PopupTrigger'; @@ -38,7 +38,6 @@ export interface SubMenuProps extends Omit>>>>>>>>>>>>>>>>>>>> Next Round <<<<<<<<<<<<<<<<<<<<<<< // onDestroy?: DestroyEventHandler; } diff --git a/src/interface.ts b/src/interface.ts index e845058b..683f6d87 100644 --- a/src/interface.ts +++ b/src/interface.ts @@ -33,6 +33,7 @@ export interface SubMenuType extends ItemSharedProps { popupClassName?: string; popupOffset?: number[]; popupStyle?: React.CSSProperties; + popupRender?: PopupRender; // >>>>> Events onClick?: MenuClickEventHandler; diff --git a/tests/Responsive.spec.tsx b/tests/Responsive.spec.tsx index aa137991..f8f454b2 100644 --- a/tests/Responsive.spec.tsx +++ b/tests/Responsive.spec.tsx @@ -15,7 +15,7 @@ jest.mock('@rc-component/resize-observer', () => { let guid = 0; - return R.forwardRef((props, ref) => { + const MockResizeObserver = R.forwardRef((props, ref) => { const [id] = R.useState(() => { guid += 1; return guid; @@ -26,6 +26,9 @@ jest.mock('@rc-component/resize-observer', () => { return R.createElement(RO, { ref, ...props }); }); + + MockResizeObserver.useResizeObserver = RO.useResizeObserver || (() => {}); + return MockResizeObserver; }); describe('Menu.Responsive', () => {