feat: optimzie activityBar onContextMenuClick method

optimzie activityBar onContextMenuClick method

Author: zhangtengjin

src/controller/activityBar.ts

@@ -29,10 +29,6 @@ export interface IActivityBarController {
         e: React.MouseEvent,
         item: IMenuItem | undefined
     ) => void;
-    onManageContextMenuClick?: (
-        e: React.MouseEvent,
-        item: IMenuItem | undefined
-    ) => void;
 }
 
 @singleton()
@@ -95,6 +91,7 @@ export class ActivityBarController
     ) => {
         const contextMenuId = item?.id;
         switch (contextMenuId) {
+            // activityBar contextMenu
             case CONTEXT_MENU_MENU.id: {
                 this.menuBarService.showHide();
                 break;
@@ -111,17 +108,7 @@ export class ActivityBarController
                 this.activityBarService.showHide();
                 break;
             }
-            default: {
-            }
-        }
-    };
-
-    public readonly onManageContextMenuClick = (
-        e: React.MouseEvent,
-        item: IMenuItem | undefined
-    ) => {
-        const contextMenu = item?.id;
-        switch (contextMenu) {
+            // manage button contextMenu
             case CONTEXT_MENU_COMMAND_PALETTE.id: {
                 this.gotoQuickCommand();
                 break;
@@ -135,7 +122,6 @@ export class ActivityBarController
                 break;
             }
             default: {
-                // Do Something()
             }
         }
     };

src/workbench/activityBar/activityBar.tsx

@@ -9,7 +9,6 @@ import { IActivityBar, IActivityBarItem } from 'mo/model/workbench/activityBar';
 import ActivityBarItem from './activityBarItem';
 import { Scrollable } from 'mo/components/scrollable';
 import { IActivityBarController } from 'mo/controller/activityBar';
-import { mergeFunctions } from 'mo/common/utils';
 
 import {
     containerClassName,
@@ -26,7 +25,6 @@ export function ActivityBar(props: IActivityBar & IActivityBarController) {
         onClick,
         onSelect,
         onContextMenuClick,
-        onManageContextMenuClick,
     } = props;
 
     const onClickBar = (e: React.MouseEvent, item: IActivityBarItem) => {
@@ -50,10 +48,7 @@ export function ActivityBar(props: IActivityBar & IActivityBarController) {
             <ActivityBarItem
                 key={item.id}
                 {...item}
-                onContextMenuClick={mergeFunctions(
-                    onContextMenuClick,
-                    onManageContextMenuClick
-                )}
+                onContextMenuClick={onContextMenuClick}
                 onClick={onClickBar}
                 data-index={index}
                 checked={selected === item.id}