chore: better code

dream-num · Feb 13, 2025 · a128240 · a128240
1 parent 1ea02ec
commit a128240
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 65 deletions.
diff --git a/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx b/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx
@@ -19,7 +19,6 @@ import { LocaleService } from '@univerjs/core';
 import { InputNumber } from '@univerjs/design';
 import { IContextMenuService, useDependency } from '@univerjs/ui';
 
-import { IContextMenuService } from '@univerjs/ui';
 import React, { useEffect, useState } from 'react';
 import styles from './index.module.less';
 

diff --git a/packages/sheets-ui/src/controllers/menu.schema.ts b/packages/sheets-ui/src/controllers/menu.schema.ts
@@ -24,13 +24,11 @@ import {
     ClearSelectionAllCommand,
     ClearSelectionContentCommand,
     ClearSelectionFormatCommand, CopySheetCommand,
-    InsertColAfterCommand,
     InsertColBeforeCommand,
     InsertMultiColsLeftCommand,
     InsertMultiColsRightCommand,
     InsertMultiRowsAboveCommand,
     InsertMultiRowsAfterCommand,
-    InsertRowAfterCommand,
     InsertRowBeforeCommand,
     RemoveWorksheetMergeCommand,
     ResetBackgroundColorCommand,
@@ -97,19 +95,14 @@ import { ToggleGridlinesMenuFactory } from './menu/gridlines.menu';
 import {
     CELL_INSERT_MENU_ID,
     CellInsertMenuItemFactory,
-    COL_INSERT_MENU_ID,
-    ColInsertMenuItemFactory,
-    InsertColAfterMenuItemFactory,
     InsertColBeforeMenuItemFactory,
     InsertMultiColsLeftMenuItemFactory,
     InsertMultiColsRightMenuItemFactory,
     InsertMultiRowsAboveMenuItemFactory,
     InsertMultiRowsAfterMenuItemFactory,
     InsertRangeMoveDownMenuItemFactory,
     InsertRangeMoveRightMenuItemFactory,
-    InsertRowAfterMenuItemFactory,
     InsertRowBeforeMenuItemFactory,
-    ROW_INSERT_MENU_ID, RowInsertMenuItemFactory,
 } from './menu/insert.menu';
 import {
     BackgroundColorSelectorMenuItemFactory,
@@ -466,26 +459,6 @@ export const menuSchema: MenuSchemaType = {
         },
         [ContextMenuGroup.LAYOUT]: {
             order: 1,
-            // [COL_INSERT_MENU_ID]: {
-            //     order: 0,
-            //     menuItemFactory: ColInsertMenuItemFactory,
-            //     [InsertColBeforeCommand.id]: {
-            //         order: 0,
-            //         menuItemFactory: InsertColBeforeMenuItemFactory,
-            //     },
-            //     [InsertColAfterCommand.id]: {
-            //         order: 1,
-            //         menuItemFactory: InsertColAfterMenuItemFactory,
-            //     },
-            //     [InsertMultiColsLeftCommand.id]: {
-            //         order: 2,
-            //         menuItemFactory: InsertMultiColsLeftMenuItemFactory,
-            //     },
-            //     [InsertMultiColsRightCommand.id]: {
-            //         order: 3,
-            //         menuItemFactory: InsertMultiColsRightMenuItemFactory,
-            //     },
-            // },
             [InsertMultiColsLeftCommand.id]: {
                 order: 0,
                 menuItemFactory: InsertMultiColsLeftMenuItemFactory,
@@ -607,26 +580,6 @@ export const menuSchema: MenuSchemaType = {
         },
         [ContextMenuGroup.LAYOUT]: {
             order: 1,
-            // [ROW_INSERT_MENU_ID]: {
-            //     order: 0,
-            //     menuItemFactory: RowInsertMenuItemFactory,
-            //     [InsertRowBeforeCommand.id]: {
-            //         order: 0,
-            //         menuItemFactory: InsertRowBeforeMenuItemFactory,
-            //     },
-            //     [InsertRowAfterCommand.id]: {
-            //         order: 1,
-            //         menuItemFactory: InsertRowAfterMenuItemFactory,
-            //     },
-            //     [InsertMultiRowsAboveCommand.id]: {
-            //         order: 2,
-            //         menuItemFactory: InsertMultiRowsAboveMenuItemFactory,
-            //     },
-            //     [InsertMultiRowsAfterCommand.id]: {
-            //         order: 3,
-            //         menuItemFactory: InsertMultiRowsAfterMenuItemFactory,
-            //     },
-            // },
             [InsertMultiRowsAboveCommand.id]: {
                 order: 0,
                 menuItemFactory: InsertMultiRowsAboveMenuItemFactory,

diff --git a/packages/ui/src/components/menu/desktop/Menu.tsx b/packages/ui/src/components/menu/desktop/Menu.tsx
@@ -206,7 +206,6 @@ interface IMenuItemProps {
 function MenuItem({ menuItem, onClick }: IMenuItemProps) {
     const menuManagerService = useDependency(IMenuManagerService);
     const contextMenuService = useDependency(IContextMenuService);
-    // console.log('contextMenuService', contextMenuService);
     const disabled = useObservable<boolean>(menuItem.disabled$, false);
     const activated = useObservable<boolean>(menuItem.activated$, false);
     const hidden = useObservable(menuItem.hidden$, false);
@@ -215,19 +214,6 @@ function MenuItem({ menuItem, onClick }: IMenuItemProps) {
     const item = menuItem as IDisplayMenuItem<IMenuSelectorItem>;
     const selectionsFromObservable = useObservable(isObservable(item.selections) ? item.selections : undefined);
     const [inputValue, setInputValue] = useState(value);
-    // const [trigger, setMenuTrigger] = useState(0);
-
-    // useEffect(() => {
-    //     const subscription = contextMenuService.trigger$.subscribe((value) => {
-    //         setMenuTrigger(value);
-    //     });
-
-    //     return () => subscription.unsubscribe();
-    // }, []);
-
-    // useEffect(() => {
-    //     setInputValue(value);
-    // }, [value, trigger]);
 
     useEffect(() => {
         setInputValue(value);
@@ -259,7 +245,6 @@ function MenuItem({ menuItem, onClick }: IMenuItemProps) {
                     [styles.menuItemActivated]: activated,
                 })}
                 onClick={() => {
-                    // console.log('MENU CLICK______', menuItem.id, inputValue);
                     onClick({ commandId: item.commandId, value: inputValue, id: item.id });
                 }}
             >

diff --git a/packages/ui/src/services/contextmenu/contextmenu.service.ts b/packages/ui/src/services/contextmenu/contextmenu.service.ts
@@ -16,10 +16,8 @@
 
 import type { IDisposable } from '@univerjs/core';
 import type { IMouseEvent, IPointerEvent } from '@univerjs/engine-render';
-import type { Subject } from 'rxjs';
 import { createIdentifier, Disposable, toDisposable } from '@univerjs/core';
 import { BehaviorSubject } from 'rxjs';
-import { L } from 'vitest/dist/chunks/reporters.0x019-V2.js';
 
 export interface IContextMenuHandler {
     /** A callback to open context menu with given position and menu type. */