fix: better code

dream-num · Feb 22, 2025 · 02df8bf · 02df8bf
1 parent ead20e3
commit 02df8bf
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/packages/sheets-ui/src/controllers/menu/insert.menu.ts b/packages/sheets-ui/src/controllers/menu/insert.menu.ts
@@ -262,10 +262,6 @@ export function InsertMultiRowsAfterMenuItemFactory(accessor: IAccessor): IMenuB
                 suffix: 'rightClick.insertRowsAfterSuffix',
             },
         },
-        // value$: new Observable<number>((subscriber) => {
-        //     subscriber.next(1);
-        //     subscriber.complete();
-        // }),
         value$: deriveStateFromActiveSheet$(univerInstanceService, defaultValue, () => new Observable((subscriber) => {
             function update() {
                 const range = selectionManagerService.getCurrentLastSelection()?.range;

diff --git a/packages/ui/src/components/menu/desktop/Menu.tsx b/packages/ui/src/components/menu/desktop/Menu.tsx
@@ -34,7 +34,6 @@ import clsx from 'clsx';
 
 import React, { useEffect, useMemo, useState } from 'react';
 import { combineLatest, isObservable, of } from 'rxjs';
-import { IContextMenuService } from '../../../services/contextmenu/contextmenu.service';
 import { ILayoutService } from '../../../services/layout/layout.service';
 import { MenuItemType } from '../../../services/menu/menu';
 import { IMenuManagerService } from '../../../services/menu/menu-manager.service';
@@ -205,24 +204,21 @@ interface IMenuItemProps {
 
 function MenuItem({ menuItem, onClick }: IMenuItemProps) {
     const menuManagerService = useDependency(IMenuManagerService);
-    const contextMenuService = useDependency(IContextMenuService);
     const disabled = useObservable<boolean>(menuItem.disabled$, false);
     const activated = useObservable<boolean>(menuItem.activated$, false);
     const hidden = useObservable(menuItem.hidden$, false);
     const value = useObservable<MenuItemDefaultValueType>(menuItem.value$);
-    const trigger = useObservable(contextMenuService.trigger$);
     const item = menuItem as IDisplayMenuItem<IMenuSelectorItem>;
     const selectionsFromObservable = useObservable(isObservable(item.selections) ? item.selections : undefined);
     const [inputValue, setInputValue] = useState(value);
 
     useEffect(() => {
         setInputValue(value);
-    }, [value, trigger]);
+    }, [value]);
 
     if (hidden) {
         return null;
     }
-
     /**
      * user input change value from CustomLabel
      * @param v

diff --git a/packages/ui/src/services/contextmenu/contextmenu.service.ts b/packages/ui/src/services/contextmenu/contextmenu.service.ts
@@ -36,8 +36,6 @@ export interface IContextMenuService {
     triggerContextMenu(event: IPointerEvent | IMouseEvent, menuType: string): void;
     hideContextMenu(): void;
     registerContextMenuHandler(handler: IContextMenuHandler): IDisposable;
-
-    trigger$: BehaviorSubject<number>;
 }
 
 export const IContextMenuService = createIdentifier<IContextMenuService>('ui.contextmenu.service');

diff --git a/packages/ui/src/views/components/context-menu/ContextMenu.tsx b/packages/ui/src/views/components/context-menu/ContextMenu.tsx
@@ -62,22 +62,18 @@ export function DesktopContextMenu() {
         };
     }, [contextMenuService]);
 
+    /** A function to open context menu with given position and menu type. */
     function handleContextMenu(event: IMouseEvent, menuType: string) {
         setVisible(false);
         requestAnimationFrame(() => {
             setMenuType(menuType);
             setOffset([event.clientX, event.clientY]);
             setVisible(true);
-
-            // for refresh react comp input value after context menu open
-            contextMenuService.trigger$.next(1);
         });
     }
 
     function handleClose() {
         setVisible(false);
-        // for refresh input value after context menu close
-        contextMenuService.trigger$.next(0);
     }
 
     return (