fix: add popupRender to SubMenuType (#849)

* fix: add popupRender to SubMenuType

* chore: remove SubMenuProps popupRender

* chore: remove unused types from SubMenu

* fix: keep useResizeObserver in resize-observer mock

Author: QDyanbing

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<SubMenuType, 'key' | 'children' | 'la
 
   /** @private Do not use. Private warning empty usage */
   warnKey?: boolean;
-  popupRender?: PopupRender;
   // >>>>>>>>>>>>>>>>>>>>> Next  Round <<<<<<<<<<<<<<<<<<<<<<<
   // onDestroy?: DestroyEventHandler;
 }

src/interface.ts

@@ -33,6 +33,7 @@ export interface SubMenuType extends ItemSharedProps {
   popupClassName?: string;
   popupOffset?: number[];
   popupStyle?: React.CSSProperties;
+  popupRender?: PopupRender;
 
   // >>>>> Events
   onClick?: MenuClickEventHandler;

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', () => {