Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(ui): close submenu immediately on context menu pointer leave (#7096)

白熱f127da5d9fb0
diff --git a/packages/ui/src/views/components/context-menu/ContextMenuPanel.tsx b/packages/ui/src/views/components/context-menu/ContextMenuPanel.tsx
index e4c2638c96..cd0239fd64 100644
--- a/packages/ui/src/views/components/context-menu/ContextMenuPanel.tsx
+++ b/packages/ui/src/views/components/context-menu/ContextMenuPanel.tsx
@@ -1146,13 +1146,18 @@ function ContextMenuMenuItem(props: IContextMenuMenuItemProps) {
submenuCloseTimerRef.current = null;
}, []);
+ const closeSubmenu = useCallback(() => {
+ clearSubmenuCloseTimer();
+ setActiveSubmenuKey((currentKey) => (currentKey === menuKey ? null : currentKey));
+ }, [clearSubmenuCloseTimer, menuKey, setActiveSubmenuKey]);
+
const scheduleSubmenuClose = useCallback(() => {
clearSubmenuCloseTimer();
submenuCloseTimerRef.current = setTimeout(() => {
submenuCloseTimerRef.current = null;
- setActiveSubmenuKey((currentKey) => (currentKey === menuKey ? null : currentKey));
+ closeSubmenu();
}, CONTEXT_MENU_SUBMENU_CLOSE_DELAY);
- }, [clearSubmenuCloseTimer, menuKey, setActiveSubmenuKey]);
+ }, [clearSubmenuCloseTimer, closeSubmenu]);
useEffect(() => {
setInputValue(value);
@@ -1274,6 +1279,10 @@ function ContextMenuMenuItem(props: IContextMenuMenuItemProps) {
if (nextTarget && submenuElementRef.current?.contains(nextTarget)) {
return;
}
+ if (isContextMenuPointerLeaveTarget(nextTarget, menuItemElementRef.current, rootMenuElement)) {
+ closeSubmenu();
+ return;
+ }
scheduleSubmenuClose();
}
}}
@@ -1383,10 +1392,13 @@ function ContextMenuMenuItem(props: IContextMenuMenuItemProps) {
return;
}
- scheduleSubmenuClose();
if (isContextMenuPointerLeaveTarget(nextTarget, menuItemElementRef.current, rootMenuElement)) {
+ closeSubmenu();
onMenuPointerLeave?.();
+ return;
}
+
+ scheduleSubmenuClose();
}}
onWheel={(event) => event.stopPropagation()}
>