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: fix uni menu (#3338)

白熱af63f7dda4e2
diff --git a/packages-experimental/uniui/src/controllers/menu.schema.ts b/packages-experimental/uniui/src/controllers/menu.schema.ts
index 67f0376d34..8924794d18 100644
--- a/packages-experimental/uniui/src/controllers/menu.schema.ts
+++ b/packages-experimental/uniui/src/controllers/menu.schema.ts
@@ -17,6 +17,10 @@
import type { MenuSchemaType } from '@univerjs/ui';
import { FONT_GROUP_MENU_ID } from '@univerjs/uniui';
import {
+ DELETE_MENU_ID,
+ DeleteMenuItemFactory,
+ DOWNLOAD_MENU_ID,
+ DownloadMenuItemFactory,
FAKE_BG_COLOR_MENU_ID,
FAKE_FONT_COLOR_MENU_ID,
FAKE_FONT_FAMILY_MENU_ID,
@@ -36,7 +40,15 @@ import {
FakeTextColorSelectorMenuItemFactory,
FakeUnorderListMenuItemFactory,
FontGroupMenuItemFactory,
+ // LOCK_MENU_ID,
+ // LockMenuItemFactory,
+ PRINT_MENU_ID,
+ PrintMenuItemFactory,
+ SHARE_MENU_ID,
+ ShareMenuItemFactory,
UNI_MENU_POSITIONS,
+ ZEN_MENU_ID,
+ ZenMenuItemFactory,
} from './menu';
export const menuSchema: MenuSchemaType = {
@@ -72,4 +84,24 @@ export const menuSchema: MenuSchemaType = {
menuItemFactory: FakePivotTableMenuItemFactory,
},
},
+ [UNI_MENU_POSITIONS.TOOLBAR_FLOAT]: {
+ [DOWNLOAD_MENU_ID]: {
+ menuItemFactory: DownloadMenuItemFactory,
+ },
+ [SHARE_MENU_ID]: {
+ menuItemFactory: ShareMenuItemFactory,
+ },
+ // [LOCK_MENU_ID]: {
+ // menuItemFactory: LockMenuItemFactory,
+ // },
+ [PRINT_MENU_ID]: {
+ menuItemFactory: PrintMenuItemFactory,
+ },
+ [ZEN_MENU_ID]: {
+ menuItemFactory: ZenMenuItemFactory,
+ },
+ [DELETE_MENU_ID]: {
+ menuItemFactory: DeleteMenuItemFactory,
+ },
+ },
};
diff --git a/packages-experimental/uniui/src/controllers/uniui-toolbar.controller.tsx b/packages-experimental/uniui/src/controllers/uniui-toolbar.controller.tsx
index 05fee419b3..73e98eaf99 100644
--- a/packages-experimental/uniui/src/controllers/uniui-toolbar.controller.tsx
+++ b/packages-experimental/uniui/src/controllers/uniui-toolbar.controller.tsx
@@ -20,24 +20,6 @@ import type { MenuConfig } from '@univerjs/ui';
import { ComponentManager, IMenuManagerService } from '@univerjs/ui';
import { DisposeUnitOperation } from '../commands/operations/uni.operation';
import { UniToolbarService } from '../services/toolbar/uni-toolbar-service';
-// import {
-// DeleteMenuItemFactory,
-// DownloadMenuItemFactory,
-// FakeBackgroundColorSelectorMenuItemFactory,
-// FakeFontFamilySelectorMenuItemFactory,
-// FakeFontGroupMenuItemFactory,
-// FakeFontSizeSelectorMenuItemFactory,
-// FakeImageMenuFactory,
-// FakeOrderListMenuItemFactory,
-// FakePivotTableMenuItemFactory,
-// FakeTextColorSelectorMenuItemFactory,
-// FakeUnorderListMenuItemFactory,
-// FontGroupMenuItemFactory,
-// LockMenuItemFactory,
-// PrintMenuItemFactory,
-// ShareMenuItemFactory,
-// ZenMenuItemFactory,
-// } from './menu';
import { menuSchema } from './menu.schema';
export interface IUniuiToolbarConfig {
@@ -79,30 +61,6 @@ export class UniuiToolbarController extends Disposable {
private _initMenus(): void {
this._menuManagerService.appendRootMenu(menuSchema);
-
- // register menu factories
- // (
- // [
- // DownloadMenuItemFactory,
- // ShareMenuItemFactory,
- // LockMenuItemFactory,
- // PrintMenuItemFactory,
- // ZenMenuItemFactory,
- // DeleteMenuItemFactory,
- // FontGroupMenuItemFactory,
- // FakeFontFamilySelectorMenuItemFactory,
- // FakeTextColorSelectorMenuItemFactory,
- // FakeFontSizeSelectorMenuItemFactory,
- // FakeBackgroundColorSelectorMenuItemFactory,
- // FakeImageMenuFactory,
- // FakeFontGroupMenuItemFactory,
- // FakePivotTableMenuItemFactory,
- // FakeOrderListMenuItemFactory,
- // FakeUnorderListMenuItemFactory,
- // ] as IMenuItemFactory[]
- // ).forEach((factory) => {
- // this.disposeWithMe(this._menuService.addMenuItem(this._injector.invoke(factory), {}));
- // });
}
private _initCommands(): void {
diff --git a/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx b/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx
index f50eb324ee..b3f64abf54 100644
--- a/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx
+++ b/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx
@@ -17,7 +17,7 @@
import { flip, offset, shift, useFloating } from '@floating-ui/react-dom';
import React, { useEffect, useImperativeHandle } from 'react';
import { IUniverInstanceService, type Nullable, useDependency, useObservable } from '@univerjs/core';
-import { ComponentContainer, ToolbarItem, useComponentsOfPart, useToolbarGroups } from '@univerjs/ui';
+import { ComponentContainer, IMenuManagerService, ToolbarItem, useComponentsOfPart } from '@univerjs/ui';
import type { IUnitRendererProps } from '../workbench/UniWorkbench';
import { DELETE_MENU_ID, DOWNLOAD_MENU_ID, LOCK_MENU_ID, PRINT_MENU_ID, SHARE_MENU_ID, UNI_MENU_POSITIONS, ZEN_MENU_ID } from '../../controllers/menu';
import styles from './index.module.less';
@@ -30,10 +30,6 @@ export enum UniFloatToolbarUIPart {
NAME = 'name',
}
-const MENU_POSITIONS = [
- UNI_MENU_POSITIONS.TOOLBAR_FLOAT,
-];
-
const UNI_FLOATING_TOOLBAR_SCHEMA: string[] = [
DOWNLOAD_MENU_ID,
SHARE_MENU_ID,
@@ -44,13 +40,15 @@ const UNI_FLOATING_TOOLBAR_SCHEMA: string[] = [
];
export const UniFloatingToolbar = React.forwardRef<IFloatingToolbarRef, { node: Nullable<IUnitRendererProps> }>(({ node }, ref) => {
+ const menuManagerService = useDependency(IMenuManagerService);
+
const { x, y, refs, strategy, update } = useFloating({
placement: 'top',
middleware: [offset(10), flip(), shift({ padding: 5 })],
});
- const { visibleItems } = useToolbarGroups(MENU_POSITIONS, UNI_MENU_POSITIONS.TOOLBAR_FLOAT);
- const uniVisibleItems = UNI_FLOATING_TOOLBAR_SCHEMA.map((id) => visibleItems.find((item) => item.id === id)).filter((item) => !!item);
+ const menus = menuManagerService.getMenuByPositionKey(UNI_MENU_POSITIONS.TOOLBAR_FLOAT);
+ const uniVisibleItems = UNI_FLOATING_TOOLBAR_SCHEMA.map((id) => menus.find((item) => item.key === id)?.item).filter((item) => !!item);
const { setReference, setFloating } = refs;
@@ -106,4 +104,3 @@ export function UnitName({ unitId }: { unitId: string }) {
</div>
);
};
-