From 847f3e943a1227a310b5d574399e34c21861e012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= <yanbing.gao@aliyun.com>
Date: Thu, 22 Jan 2026 17:01:54 +0800
Subject: [PATCH 1/4] fix: add popupRender to SubMenuType

---
 src/interface.ts | 1 +
 1 file changed, 1 insertion(+)

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;

From 2286085cf45ddc7a7ab927ee185424b7d7072abf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= <yanbing.gao@aliyun.com>
Date: Fri, 23 Jan 2026 10:35:44 +0800
Subject: [PATCH 2/4] chore: remove SubMenuProps popupRender

---
 src/SubMenu/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/SubMenu/index.tsx b/src/SubMenu/index.tsx
index a7824e8f..822ff316 100644
--- a/src/SubMenu/index.tsx
+++ b/src/SubMenu/index.tsx
@@ -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;
 }

From 93603be003ca0b7b52e5385006239a15edf7d123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= <yanbing.gao@aliyun.com>
Date: Fri, 23 Jan 2026 14:33:59 +0800
Subject: [PATCH 3/4] chore: remove unused types from SubMenu

---
 src/SubMenu/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SubMenu/index.tsx b/src/SubMenu/index.tsx
index 822ff316..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';

From 8f61e0811263e69ea3f2e551b4b3a00b799b95e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= <yanbing.gao@aliyun.com>
Date: Mon, 26 Jan 2026 13:46:26 +0800
Subject: [PATCH 4/4] fix: keep useResizeObserver in resize-observer mock

---
 tests/Responsive.spec.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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