feat: optimize some named

optimize some named

Author: zhangtengjin

src/controller/explorer/explorer.tsx

@@ -11,7 +11,7 @@ import {
     SAMPLE_FOLDER_PANEL,
     NEW_FILE_COMMAND_ID,
     NEW_FOLDER_COMMAND_ID,
-    exploreActiveItem,
+    EXPLORER_ACTIVITY_ITEM,
 } from 'mo/model';
 import { IActionBarItem } from 'mo/components/actionBar';
 import {
@@ -65,8 +65,8 @@ export class ExplorerController
         const state = this.activityBarService.getState();
         const sideBarState = this.sidebarService.getState();
         this.activityBarService.setState({
-            selected: exploreActiveItem.id,
-            data: [...state.data!, exploreActiveItem],
+            selected: EXPLORER_ACTIVITY_ITEM.id,
+            data: [...state.data!, EXPLORER_ACTIVITY_ITEM],
         });
 
         const explorerEvent = {
@@ -86,7 +86,7 @@ export class ExplorerController
 
         this.activityBarService.onSelect((e, item: IActivityBarItem) => {
             const { hidden } = this.sidebarService.getState();
-            if (item.id === exploreActiveItem.id) {
+            if (item.id === EXPLORER_ACTIVITY_ITEM.id) {
                 const isShow = hidden ? !hidden : hidden;
                 this.sidebarService.setState({
                     current: explorePane.id,

src/controller/search/search.tsx

@@ -11,7 +11,7 @@ import {
     SEARCH_REGULAR_EXPRESSION_COMMAND_ID,
     SEARCH_PRESERVE_CASE_COMMAND_ID,
     SEARCH_REPLACE_ALL_COMMAND_ID,
-    searchActivityItem,
+    SEARCH_ACTIVITY_ITEM,
 } from 'mo/model/workbench/search';
 import {
     ActivityBarService,
@@ -61,10 +61,10 @@ export class SearchController extends Controller implements ISearchController {
 
         this.sidebarService.push(searchSidePane);
 
-        this.activityBarService.addBar(searchActivityItem);
+        this.activityBarService.addBar(SEARCH_ACTIVITY_ITEM);
 
         this.activityBarService.onSelect((e, item: IActivityBarItem) => {
-            if (item.id === searchActivityItem.id) {
+            if (item.id === SEARCH_ACTIVITY_ITEM.id) {
                 this.sidebarService.setState({
                     current: searchSidePane.id,
                 });

src/model/workbench/explorer/explorer.tsx

@@ -19,7 +19,7 @@ export const SAMPLE_FOLDER_PANEL_ID = 'Folders';
 export const EDITOR_PANEL_ID = 'OpenEditors';
 export const OUTLINE_PANEL_ID = 'Outline';
 
-export const exploreActiveItem = {
+export const EXPLORER_ACTIVITY_ITEM = {
     id: 'active-explorer',
     name: 'Explore',
     iconName: 'codicon-files',

src/model/workbench/search.tsx

@@ -18,7 +18,7 @@ export const SEARCH_REGULAR_EXPRESSION_COMMAND_ID =
 export const SEARCH_PRESERVE_CASE_COMMAND_ID = 'search.preserveCase';
 export const SEARCH_REPLACE_ALL_COMMAND_ID = 'search.replaceAll';
 
-export const searchActivityItem = {
+export const SEARCH_ACTIVITY_ITEM = {
     id: 'search',
     name: 'Search',
     iconName: 'codicon-search',

src/services/workbench/activityBarService.ts

@@ -7,8 +7,8 @@ import {
     IActivityBar,
     IActivityBarItem,
 } from 'mo/model/workbench/activityBar';
-import { exploreActiveItem } from 'mo/model/workbench/explorer/explorer';
-import { searchActivityItem } from 'mo/model/workbench/search';
+import { EXPLORER_ACTIVITY_ITEM } from 'mo/model/workbench/explorer/explorer';
+import { SEARCH_ACTIVITY_ITEM } from 'mo/model/workbench/search';
 import { searchById } from '../helper';
 import { IMenuBarItem } from 'mo/model';
 
@@ -85,9 +85,10 @@ export class ActivityBarService
         if (index > -1) {
             this.remove(id);
         } else {
-            const existBar = [exploreActiveItem, searchActivityItem].find(
-                searchById(id)
-            );
+            const existBar = [
+                EXPLORER_ACTIVITY_ITEM,
+                SEARCH_ACTIVITY_ITEM,
+            ].find(searchById(id));
             if (!existBar) return;
             this.addBar(existBar);
         }

src/workbench/activityBar/activityBar.tsx

@@ -9,6 +9,7 @@ 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,
@@ -49,7 +50,10 @@ export function ActivityBar(props: IActivityBar & IActivityBarController) {
             <ActivityBarItem
                 key={item.id}
                 {...item}
-                onManageContextMenuClick={onManageContextMenuClick}
+                onContextMenuClick={mergeFunctions(
+                    onContextMenuClick,
+                    onManageContextMenuClick
+                )}
                 onClick={onClickBar}
                 data-index={index}
                 checked={selected === item.id}

src/workbench/activityBar/activityBarItem.tsx

@@ -27,7 +27,7 @@ function ActivityBarItem(props: IActivityBarItem & IActivityBarController) {
         onClick,
         contextMenu = [],
         className,
-        onManageContextMenuClick,
+        onContextMenuClick,
     } = props;
     let content: React.ReactNode = '';
     if (render) {
@@ -38,7 +38,7 @@ function ActivityBarItem(props: IActivityBarItem & IActivityBarController) {
 
     const onClickMenuItem = useCallback(
         (e: React.MouseEvent, item: IMenuItem | undefined) => {
-            onManageContextMenuClick?.(e, item);
+            onContextMenuClick?.(e, item);
             contextViewMenu?.dispose();
         },
         [contextMenu]