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): prevent dropdown usage when menu bar is disabled (#3400)

白熱5f2e9fa12aa3
diff --git a/packages/sheets/src/services/permission/permission-point/range/edit.ts b/packages/sheets/src/services/permission/permission-point/range/edit.ts
index 03fd000f86..9cbac5f157 100644
--- a/packages/sheets/src/services/permission/permission-point/range/edit.ts
+++ b/packages/sheets/src/services/permission/permission-point/range/edit.ts
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-import type { IPermissionPoint } from '@univerjs/core';
import { PermissionStatus } from '@univerjs/core';
import { UnitAction, UnitObject } from '@univerjs/protocol';
+import type { IPermissionPoint } from '@univerjs/core';
export class RangeProtectionPermissionEditPoint implements IPermissionPoint {
type = UnitObject.SelectRange;
diff --git a/packages/ui/src/components/menu/desktop/Menu.tsx b/packages/ui/src/components/menu/desktop/Menu.tsx
index bf785cc17d..3bdfcad212 100644
--- a/packages/ui/src/components/menu/desktop/Menu.tsx
+++ b/packages/ui/src/components/menu/desktop/Menu.tsx
@@ -27,6 +27,13 @@ import clsx from 'clsx';
import React, { useState } from 'react';
import { isObservable } from 'rxjs';
+import { ILayoutService } from '../../../services/layout/layout.service';
+import { MenuItemType } from '../../../services/menu/menu';
+import { IMenuManagerService } from '../../../services/menu/menu-manager.service';
+import { CustomLabel } from '../../custom-label/CustomLabel';
+import { useScrollYOverContainer } from '../../hooks/layout';
+import { useObservable } from '../../hooks/observable';
+import styles from './index.module.less';
import type {
IDisplayMenuItem,
IMenuButtonItem,
@@ -35,13 +42,6 @@ import type {
IValueOption,
MenuItemDefaultValueType,
} from '../../../services/menu/menu';
-import { MenuItemType } from '../../../services/menu/menu';
-import { CustomLabel } from '../../custom-label/CustomLabel';
-import { useObservable } from '../../hooks/observable';
-import { useScrollYOverContainer } from '../../hooks/layout';
-import { ILayoutService } from '../../../services/layout/layout.service';
-import { IMenuManagerService } from '../../../services/menu/menu-manager.service';
-import styles from './index.module.less';
// TODO: @jikkai disabled and hidden are not working
diff --git a/packages/ui/src/views/components/ribbon/Ribbon.tsx b/packages/ui/src/views/components/ribbon/Ribbon.tsx
index ddba5e67ab..d4328a17fe 100644
--- a/packages/ui/src/views/components/ribbon/Ribbon.tsx
+++ b/packages/ui/src/views/components/ribbon/Ribbon.tsx
@@ -15,19 +15,19 @@
*/
import { LocaleService, useDependency } from '@univerjs/core';
-import type { ComponentType } from 'react';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
-import clsx from 'clsx';
import { MoreFunctionSingle } from '@univerjs/icons';
+import clsx from 'clsx';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import type { ComponentType } from 'react';
-import type { IMenuSchema } from '../../../services/menu/menu-manager.service';
import { IMenuManagerService } from '../../../services/menu/menu-manager.service';
+import { MenuManagerPosition, RibbonPosition } from '../../../services/menu/types';
import { ComponentContainer } from '../ComponentContainer';
import { ToolbarButton } from '../ribbon/Button/ToolbarButton';
-import { MenuManagerPosition, RibbonPosition } from '../../../services/menu/types';
+import styles from './index.module.less';
import { ToolbarItem } from './ToolbarItem';
import { DropdownWrapper, TooltipWrapper } from './TooltipButtonWrapper';
-import styles from './index.module.less';
+import type { IMenuSchema } from '../../../services/menu/menu-manager.service';
interface IRibbonProps {
headerMenuComponents?: Set<ComponentType>;
diff --git a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
index 9499436475..bb60f271ee 100644
--- a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
@@ -16,23 +16,23 @@
import { ICommandService, LocaleService, useDependency } from '@univerjs/core';
import { MoreDownSingle } from '@univerjs/icons';
-import type { IDropdownProps } from '@univerjs/design';
-import type { Ref } from 'react';
+import clsx from 'clsx';
import React, { forwardRef, useMemo } from 'react';
import { isObservable, Observable } from 'rxjs';
-import clsx from 'clsx';
+import type { IDropdownProps } from '@univerjs/design';
+import type { Ref } from 'react';
import { ComponentManager } from '../../../common/component-manager';
import { CustomLabel } from '../../../components/custom-label/CustomLabel';
import { useObservable } from '../../../components/hooks/observable';
import { Menu } from '../../../components/menu/desktop/Menu';
-import type { IDisplayMenuItem, IMenuItem, IMenuSelectorItem, IValueOption } from '../../../services/menu/menu';
-import { MenuItemType } from '../../../services/menu/menu';
import { ILayoutService } from '../../../services/layout/layout.service';
+import { MenuItemType } from '../../../services/menu/menu';
import { ToolbarButton } from './Button/ToolbarButton';
import { useToolbarItemStatus } from './hook';
-import { DropdownWrapper, TooltipWrapper } from './TooltipButtonWrapper';
import styles from './index.module.less';
+import { DropdownWrapper, TooltipWrapper } from './TooltipButtonWrapper';
+import type { IDisplayMenuItem, IMenuItem, IMenuSelectorItem, IValueOption } from '../../../services/menu/menu';
export const ToolbarItem = forwardRef((props: IDisplayMenuItem<IMenuItem> & { align?: IDropdownProps['align'] }, ref: Ref<any>) => {
const { align } = props;
@@ -126,6 +126,7 @@ export const ToolbarItem = forwardRef((props: IDisplayMenuItem<IMenuItem> & { al
/>
</div>
<DropdownWrapper
+ disabled={disabled}
align={align ?? {
targetOffset: [32, -12],
}}
@@ -154,6 +155,7 @@ export const ToolbarItem = forwardRef((props: IDisplayMenuItem<IMenuItem> & { al
} else {
return (
<DropdownWrapper
+ disabled={disabled}
overlay={(
<Menu
overViewport="scroll"