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): menu hidden error (#4519)

zhangw26ef5e95b10a
diff --git a/packages/ui/src/components/menu/desktop/Menu.tsx b/packages/ui/src/components/menu/desktop/Menu.tsx
index 924a8927c5..f92d44f80d 100644
--- a/packages/ui/src/components/menu/desktop/Menu.tsx
+++ b/packages/ui/src/components/menu/desktop/Menu.tsx
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+import type { Observable } from 'rxjs';
+
import type {
IDisplayMenuItem,
IMenuButtonItem,
@@ -22,7 +24,6 @@ import type {
IValueOption,
MenuItemDefaultValueType,
} from '../../../services/menu/menu';
-
import { isRealNum, useDependency } from '@univerjs/core';
import {
Menu as DesignMenu,
@@ -32,9 +33,9 @@ import {
} from '@univerjs/design';
import { CheckMarkSingle, MoreSingle } from '@univerjs/icons';
import clsx from 'clsx';
-import React, { useMemo, useState } from 'react';
-import { combineLatest, isObservable, Observable } from 'rxjs';
+import React, { useEffect, useMemo, useState } from 'react';
+import { combineLatest, isObservable } from 'rxjs';
import { ILayoutService } from '../../../services/layout/layout.service';
import { MenuItemType } from '../../../services/menu/menu';
import { IMenuManagerService } from '../../../services/menu/menu-manager.service';
@@ -64,34 +65,45 @@ function MenuWrapper(props: IBaseMenuProps) {
const menuManagerService = useDependency(IMenuManagerService);
- if (!menuType) {
- return null;
- };
- const menuItems = menuManagerService.getMenuByPositionKey(menuType);
+ const menuItems = useMemo(() => menuType ? menuManagerService.getMenuByPositionKey(menuType) : [], [menuType, menuManagerService]);
+
+ const [hiddenStates, setHiddenStates] = useState<Record<string, boolean>>({});
const filteredMenuItems = useMemo(() => {
return menuItems.filter((item) => {
if (!item.children) return item;
- let hasChildren = false;
- const hiddenObservables = item.children?.map((subItem) => {
- return subItem.item?.hidden$ ?? new Observable<boolean>((s) => {
- s.next(false);
- return s.unsubscribe();
- });
- });
- combineLatest(hiddenObservables).subscribe((hiddenValues) => {
- hasChildren = hiddenValues.every((hidden) => hidden === true);
+ const itemKey = item.key?.toString() || '';
+ return !hiddenStates[itemKey];
+ });
+ }, [menuItems, hiddenStates]);
- if (!hasChildren) {
- hasChildren = true;
- }
- }).unsubscribe();
+ useEffect(() => {
+ const subscriptions = menuItems.map((item) => {
+ if (!item.children) return null;
- return hasChildren;
+ const hiddenObservables = item.children.map((subItem) => subItem.item?.hidden$)
+ .filter(Boolean) as Observable<boolean>[];
+
+ return combineLatest(hiddenObservables).subscribe((hiddenValues) => {
+ const isAllHidden = hiddenValues.every((hidden) => hidden === true);
+ setHiddenStates((prev) => ({
+ ...prev,
+ [item.key]: isAllHidden,
+ }));
+ });
});
+
+ return () => {
+ subscriptions.forEach((sub) => sub?.unsubscribe());
+ setHiddenStates({});
+ };
}, [menuItems]);
+ if (!menuType) {
+ return null;
+ };
+
return filteredMenuItems && filteredMenuItems.map((item) => item.item
? (
<MenuItem