From 58b4bbdc7fcb1376dbbf1d7b61cfaab856df5e65 Mon Sep 17 00:00:00 2001 From: Jinjing <6427696+AmethystLiang@users.noreply.github.com> Date: Sun, 8 Nov 2026 12:17:09 -0800 Subject: [PATCH] Allow disabling plugins from activity bar --- .../right-sidebar/activity-bar-buttons.tsx | 3 + .../activity-bar-position-menu.tsx | 72 +++++++++++++++++-- .../src/components/right-sidebar/index.tsx | 10 ++- .../plugin-panel-activity-items.ts | 1 + .../right-sidebar-top-activity-bar.tsx | 16 ++++- src/renderer/src/i18n/locales/en.json | 4 +- 6 files changed, 96 insertions(+), 10 deletions(-) diff --git a/src/renderer/src/components/right-sidebar/activity-bar-buttons.tsx b/src/renderer/src/components/right-sidebar/activity-bar-buttons.tsx index cb13af0aa90..d01e760703b 100644 --- a/src/renderer/src/components/right-sidebar/activity-bar-buttons.tsx +++ b/src/renderer/src/components/right-sidebar/activity-bar-buttons.tsx @@ -18,6 +18,7 @@ import { useTranslate, type Translate } from '@/i18n/use-translate' export type ActivityBarItem = { id: ActiveRightSidebarTab + pluginKey?: string icon: React.ComponentType<{ size?: number; className?: string }> title: string shortcut: string @@ -113,6 +114,7 @@ export function TopActivityOverflowMenu({ key={item.id} onSelect={() => onSelect(item.id)} data-workspace-board-dismiss="" + data-activity-plugin-key={item.pluginKey} className={cn(active && 'bg-accent text-accent-foreground')} aria-current={active ? 'page' : undefined} aria-label={activityItemAriaLabel(item, item.statusIndicator, t)} @@ -165,6 +167,7 @@ export function ActivityBarButton({ )} onClick={onClick} data-workspace-board-dismiss="" + data-activity-plugin-key={item.pluginKey} aria-label={activityItemAriaLabel(item, effectiveStatus, t)} > diff --git a/src/renderer/src/components/right-sidebar/activity-bar-position-menu.tsx b/src/renderer/src/components/right-sidebar/activity-bar-position-menu.tsx index b839533dbdb..6dad1bfb9b2 100644 --- a/src/renderer/src/components/right-sidebar/activity-bar-position-menu.tsx +++ b/src/renderer/src/components/right-sidebar/activity-bar-position-menu.tsx @@ -1,23 +1,87 @@ -import React from 'react' +import React, { useState } from 'react' +import { Power } from 'lucide-react' +import { toast } from 'sonner' import type { ActivityBarPosition } from '@/store/slices/editor/types/open-file' import { ContextMenuContent, + ContextMenuItem, ContextMenuLabel, ContextMenuRadioGroup, - ContextMenuRadioItem + ContextMenuRadioItem, + ContextMenuSeparator } from '@/components/ui/context-menu' -import { useTranslate } from '@/i18n/use-translate' +import { useTranslate, type Translate } from '@/i18n/use-translate' +import { usePluginPanelsStore } from '@/store/plugins/catalog/plugin-contribution-catalog' + +async function disableActivityBarPlugin( + pluginKey: string, + t: Translate, + setDisabling: (disabling: boolean) => void +): Promise { + setDisabling(true) + try { + const plugins = await window.api.plugins.setEnabled({ pluginKey, enabled: false }) + usePluginPanelsStore.getState().setPlugins(plugins) + } catch { + toast.error( + t('auto.components.right.sidebar.activityBar.disableFailed', 'Could not disable plugin.') + ) + } finally { + setDisabling(false) + } +} + +export function useActivityBarContextPlugin(): { + pluginKey: string | null + onContextMenu: React.MouseEventHandler + onPointerDown: React.PointerEventHandler +} { + const [pluginKey, setPluginKey] = useState(null) + const updatePluginKey = (event: React.SyntheticEvent): void => { + const target = event.target + setPluginKey( + target instanceof Element + ? (target.closest('[data-activity-plugin-key]')?.getAttribute('data-activity-plugin-key') ?? + null) + : null + ) + } + return { + pluginKey, + onContextMenu: updatePluginKey, + onPointerDown: (event) => { + if (event.pointerType !== 'mouse') { + updatePluginKey(event) + } + } + } +} export function ActivityBarPositionMenu({ currentPosition, - onChangePosition + onChangePosition, + pluginKey }: { currentPosition: ActivityBarPosition onChangePosition: (pos: ActivityBarPosition) => void + pluginKey?: string | null }): React.JSX.Element { const t = useTranslate() + const [disabling, setDisabling] = useState(false) return ( + {pluginKey && typeof window.api?.plugins?.setEnabled === 'function' && ( + <> + void disableActivityBarPlugin(pluginKey, t, setDisabling)} + > + + {t('auto.components.right.sidebar.activityBar.disablePlugin', 'Disable Plugin')} + + + + )} {t('auto.components.right.sidebar.index.864111caa2', 'Activity Bar Position')} diff --git a/src/renderer/src/components/right-sidebar/index.tsx b/src/renderer/src/components/right-sidebar/index.tsx index d660bff3a72..5bab37d9f1e 100644 --- a/src/renderer/src/components/right-sidebar/index.tsx +++ b/src/renderer/src/components/right-sidebar/index.tsx @@ -24,7 +24,7 @@ import { shouldRenderDesktopWindowChrome } from '@/lib/desktop-window-chrome' import { getRendererAppPlatform } from '@/lib/renderer-app-platform' -import { ActivityBarPositionMenu } from './activity-bar-position-menu' +import { ActivityBarPositionMenu, useActivityBarContextPlugin } from './activity-bar-position-menu' import { RightSidebarTopActivityBar } from './right-sidebar-top-activity-bar' import { useRightSidebarActivityItems } from './use-right-sidebar-activity-items' import { useRightSidebarTabRouting } from './use-right-sidebar-tab-routing' @@ -34,6 +34,7 @@ import { selectWorktreeCreationSurfaceShown } from '@/lib/workspace/creation/wor function RightSidebarInner(): React.JSX.Element { const t = useTranslate() + const contextPlugin = useActivityBarContextPlugin() useUiLanguageRevision() const hasDesktopWindowChrome = shouldRenderDesktopWindowChrome({ platform: getRendererAppPlatform(), @@ -237,7 +238,11 @@ function RightSidebarInner(): React.JSX.Element { {activityBarPosition === 'side' && ( - +
{sideActivityBarIcons}
@@ -245,6 +250,7 @@ function RightSidebarInner(): React.JSX.Element {
)} diff --git a/src/renderer/src/components/right-sidebar/plugin-panels/plugin-panel-activity-items.ts b/src/renderer/src/components/right-sidebar/plugin-panels/plugin-panel-activity-items.ts index c1f7efd1245..611b23f5647 100644 --- a/src/renderer/src/components/right-sidebar/plugin-panels/plugin-panel-activity-items.ts +++ b/src/renderer/src/components/right-sidebar/plugin-panels/plugin-panel-activity-items.ts @@ -15,6 +15,7 @@ export function getPluginPanelActivityItems( ): ActivityBarItem[] { return panels.map((panel) => ({ id: panel.tabKey, + pluginKey: panel.pluginKey, icon: resolvePluginPanelIcon(panel.icon), // Manifest titles are plugin-owned and render without app-catalog translation. title: panel.title, diff --git a/src/renderer/src/components/right-sidebar/right-sidebar-top-activity-bar.tsx b/src/renderer/src/components/right-sidebar/right-sidebar-top-activity-bar.tsx index 3bb55fed0c9..17bf3a3ca48 100644 --- a/src/renderer/src/components/right-sidebar/right-sidebar-top-activity-bar.tsx +++ b/src/renderer/src/components/right-sidebar/right-sidebar-top-activity-bar.tsx @@ -8,7 +8,7 @@ import { TooltipProvider } from '@/components/ui/tooltip' import { ContextMenu, ContextMenuTrigger } from '@/components/ui/context-menu' import { ActivityBarButton, TopActivityOverflowMenu } from './activity-bar-buttons' import type { ActivityBarItem } from './activity-bar-buttons' -import { ActivityBarPositionMenu } from './activity-bar-position-menu' +import { ActivityBarPositionMenu, useActivityBarContextPlugin } from './activity-bar-position-menu' import { RIGHT_SIDEBAR_HEADER_NO_DRAG_CLASS_NAME, RIGHT_SIDEBAR_TOP_ACTIVITY_STRIP_CLASS_NAME, @@ -36,12 +36,17 @@ export function RightSidebarTopActivityBar({ activityBarPosition: ActivityBarPosition onChangeActivityBarPosition: (pos: ActivityBarPosition) => void }): React.JSX.Element { + const contextPlugin = useActivityBarContextPlugin() return (
{!hasDesktopWindowChrome && ( - +
{hasDesktopWindowChrome && ( - +
) diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index da6289db69e..73f6e5447c7 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -15280,7 +15280,9 @@ "needsIsolatedFrames": "This panel is not available: it needs isolated plugin frames, which are turned off." }, "activityBar": { - "error": "Error" + "error": "Error", + "disablePlugin": "Disable Plugin", + "disableFailed": "Could not disable plugin." }, "AiVaultSessionLimitMenu": { "historyDepth": "History depth: {{value0}}",