mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-16 12:01:13 +00:00
* Fix #954: unify Tooltip styling + replace native selects Replace native HTML title= tooltips and native <select> dropdowns with the existing Radix-based Tooltip / Select components so they share the app's rounded styling, theme tokens and i18n pipeline. Adds a global TooltipProvider in AppWithProviders so every descendant Tooltip works without a per-file Provider wrapper. Scope (driven by the issue #954 examples and "全部都处理" follow-up): - TerminalLayer toolbar: Add Terminal / Split View / SFTP / Scripts / Theme / AI Chat / Move panel / Close panel. - TopTabs middle bar: quick switcher, more tabs, AI assistant, theme toggle, settings; window-control buttons (min/max/close), tray close and hotkey reset/disable have their native title dropped per the user's explicit opt-out ("可以不用Tooltip,直接全局禁用 原生title 属性"). - AI panels: AIChatSidePanel session history / new chat / delete, ConversationExport, AgentSelector, ChatInput attach / expand / permission, ModelSelector, ProviderCard, ai-elements/tool-call. - SFTP: SftpSidePanel header, SftpBreadcrumb, SftpFileRow, SftpPaneToolbar, SftpTabBar, SftpTransferQueue. - Settings: SettingsPage close, SettingsAppearanceTab theme/accent swatches, SettingsFileAssociationsTab edit/remove, SettingsSystemTab crash-log paths and global hotkey reset. - Host vault: HostDetailsPanel (clear / suggestions / show-password / key path / browse key), GroupDetailsPanel, KnownHostsManager, ConnectionLogsManager, KeychainManager, SyncStatusButton, CloudSyncSettings, LogView, QuickSwitcher, ScriptsSidePanel, Terminal status bar copy-host + broadcast/focus, ZmodemProgressIndicator. - Terminal subcomponents: HostKeywordHighlightPopover, TerminalComposeBar, TerminalConnectionDialog, TerminalSearchBar. - Editor: TextEditorPane (subtitle, search, wrap, promote-to-tab). - TrayPanel session rows and port-forwarding rows. Native <select> migrated to custom Select component: - SerialConnectModal (data bits, stop bits, parity, flow control) - SerialHostDetailsPanel (same four fields) - HostDetailsPanel backspace behavior - GroupDetailsPanel backspace behavior - SettingsTerminalTab local shell picker - terminal/ThemeSidePanel font weight Hardcoded English strings extracted to i18n. New keys for both en and zh-CN: terminal.layer.*, topTabs.*, ai.chat.* (sessionHistory, attach, collapse, expand, enableAgent), zmodem.*, settings.shortcuts. resetToDefault. Inline help text on SnippetsManager package-name input removed because the same hint is already shown in a visible <p> below the input. Existing per-file <TooltipProvider> wrappers (SnippetsManager, ScriptsSidePanel, SelectHostPanel, RuleCard, HostDetailsPanel proxy section) are left in place — they nest harmlessly under the global provider and stay self-sufficient for component tests. Tests: - tsc clean for changed files (pre-existing repo-wide errors unrelated to this PR). - All 802 tests pass (3 skipped pre-existing). - HostDetailsPanel.proxyProfile.test and TextEditorPane.test updated to wrap with TooltipProvider, matching the runtime context now needed by the migrated components. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * Fix #954: wrap Settings + Tray windows with TooltipProvider Settings and the tray panel mount as separate Electron windows with their own React root in index.tsx, so they do not inherit the global TooltipProvider added under AppWithProviders. After the unified Tooltip migration, any settings tab that used a Tooltip (Appearance, Application, FileAssociations, System, Shortcuts, Terminal, AI ProviderCard, AI ModelSelector) — and TrayPanel — threw "Tooltip must be used within TooltipProvider" and rendered nothing. Wrap both branches with TooltipProvider at the same level as ToastProvider in index.tsx. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
422 lines
14 KiB
TypeScript
422 lines
14 KiB
TypeScript
/**
|
|
* ScriptsSidePanel - Lightweight scripts browser for the terminal side panel
|
|
*
|
|
* Shows snippets organized by package hierarchy as a single tree view.
|
|
* Packages expand / collapse via a chevron; clicking a snippet executes it
|
|
* in the focused terminal session. Typing in the search box flattens to a
|
|
* list of matching snippets regardless of package nesting.
|
|
*/
|
|
|
|
import { ChevronRight, Edit2, FileCode, Package, Plus, Search, Trash2, Zap } from 'lucide-react';
|
|
import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
import { useI18n } from '../application/i18n/I18nProvider';
|
|
import { cn } from '../lib/utils';
|
|
import { Snippet } from '../types';
|
|
import {
|
|
ContextMenu,
|
|
ContextMenuContent,
|
|
ContextMenuItem,
|
|
ContextMenuTrigger,
|
|
} from './ui/context-menu';
|
|
import { Input } from './ui/input';
|
|
import { ScrollArea } from './ui/scroll-area';
|
|
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
|
|
|
|
interface ScriptsSidePanelProps {
|
|
snippets: Snippet[];
|
|
packages: string[];
|
|
onSnippetClick: (command: string, noAutoRun?: boolean) => void;
|
|
isVisible?: boolean;
|
|
}
|
|
|
|
type TreeRow =
|
|
| {
|
|
type: 'package';
|
|
id: string;
|
|
path: string;
|
|
name: string;
|
|
depth: number;
|
|
count: number;
|
|
hasChildren: boolean;
|
|
isExpanded: boolean;
|
|
}
|
|
| {
|
|
type: 'snippet';
|
|
id: string;
|
|
depth: number;
|
|
snippet: Snippet;
|
|
packagePath: string;
|
|
};
|
|
|
|
const pkgDisplayName = (path: string) => {
|
|
const clean = path.startsWith('/') ? path.slice(1) : path;
|
|
const last = clean.split('/').filter(Boolean).pop() ?? clean;
|
|
// Preserve the leading slash on absolute root packages so they stay
|
|
// distinguishable from relative ones (matches the previous breadcrumb UI).
|
|
return path.startsWith('/') && !clean.includes('/') ? `/${last}` : last;
|
|
};
|
|
|
|
const ScriptsSidePanelInner: React.FC<ScriptsSidePanelProps> = ({
|
|
snippets,
|
|
packages,
|
|
onSnippetClick,
|
|
isVisible = true,
|
|
}) => {
|
|
const { t } = useI18n();
|
|
const [search, setSearch] = useState('');
|
|
const [expandedPaths, setExpandedPaths] = useState<Set<string>>(new Set());
|
|
|
|
// Normalize the package list + derive ancestor packages implied by each path
|
|
// (e.g. package "a/b/c" implies roots "a" and "a/b" even when not listed).
|
|
const normalizedPackages = useMemo(() => {
|
|
const set = new Set<string>();
|
|
const addWithAncestors = (raw: string) => {
|
|
const path = raw.trim();
|
|
if (!path) return;
|
|
const isAbs = path.startsWith('/');
|
|
const body = isAbs ? path.slice(1) : path;
|
|
const parts = body.split('/').filter(Boolean);
|
|
for (let i = 1; i <= parts.length; i++) {
|
|
const sub = parts.slice(0, i).join('/');
|
|
set.add(isAbs ? `/${sub}` : sub);
|
|
}
|
|
};
|
|
packages.forEach(addWithAncestors);
|
|
// A snippet may reference a package path that's not in `packages` yet.
|
|
snippets.forEach((s) => {
|
|
if (s.package) addWithAncestors(s.package);
|
|
});
|
|
return set;
|
|
}, [packages, snippets]);
|
|
|
|
// Track every package we've ever observed so we can tell "new" from
|
|
// "previously-seen-but-user-collapsed". Without this, any unrelated refresh
|
|
// that reduced prev.size (because the user collapsed a row) would
|
|
// incorrectly trip a bulk re-expand.
|
|
const seenPackagesRef = useRef<Set<string>>(new Set());
|
|
|
|
// Default: auto-expand packages the first time they appear, so the user sees
|
|
// everything without drilling in. After that, respect the user's collapse
|
|
// choices across unrelated refreshes.
|
|
useEffect(() => {
|
|
const seen = seenPackagesRef.current;
|
|
const newlySeen: string[] = [];
|
|
normalizedPackages.forEach((p) => {
|
|
if (!seen.has(p)) {
|
|
seen.add(p);
|
|
newlySeen.push(p);
|
|
}
|
|
});
|
|
if (newlySeen.length === 0) return;
|
|
setExpandedPaths((prev) => {
|
|
const next = new Set(prev);
|
|
newlySeen.forEach((p) => next.add(p));
|
|
return next;
|
|
});
|
|
}, [normalizedPackages]);
|
|
|
|
const togglePackage = useCallback((path: string) => {
|
|
setExpandedPaths((prev) => {
|
|
const next = new Set(prev);
|
|
if (next.has(path)) next.delete(path);
|
|
else next.add(path);
|
|
return next;
|
|
});
|
|
}, []);
|
|
|
|
// When search is active, flatten everything (no tree, no packages).
|
|
const searchMatches = useMemo(() => {
|
|
const q = search.trim().toLowerCase();
|
|
if (!q) return null;
|
|
return snippets.filter(
|
|
(s) =>
|
|
s.label.toLowerCase().includes(q) ||
|
|
s.command.toLowerCase().includes(q),
|
|
);
|
|
}, [snippets, search]);
|
|
|
|
const rows = useMemo<TreeRow[]>(() => {
|
|
if (searchMatches !== null) return [];
|
|
|
|
const out: TreeRow[] = [];
|
|
const paths: string[] = [];
|
|
normalizedPackages.forEach((p) => paths.push(p));
|
|
|
|
const childPackagesOf = (parent: string | null): string[] => {
|
|
const prefix = parent === null ? '' : parent + '/';
|
|
return paths
|
|
.filter((p) => {
|
|
if (parent === null) {
|
|
// Root-level: no "/" inside the body
|
|
const body = p.startsWith('/') ? p.slice(1) : p;
|
|
return !body.includes('/');
|
|
}
|
|
if (!p.startsWith(prefix)) return false;
|
|
const rest = p.slice(prefix.length);
|
|
return rest.length > 0 && !rest.includes('/');
|
|
})
|
|
.sort((a, b) => pkgDisplayName(a).localeCompare(pkgDisplayName(b)));
|
|
};
|
|
|
|
const snippetsIn = (pkg: string | null): Snippet[] =>
|
|
snippets
|
|
.filter((s) => (s.package || '') === (pkg ?? ''))
|
|
.sort((a, b) => a.label.localeCompare(b.label));
|
|
|
|
const countDescendants = (pkg: string): number =>
|
|
snippets.filter((s) => {
|
|
const sp = s.package || '';
|
|
return sp === pkg || sp.startsWith(pkg + '/');
|
|
}).length;
|
|
|
|
const walk = (pkg: string, depth: number) => {
|
|
const children = childPackagesOf(pkg);
|
|
const localSnippets = snippetsIn(pkg);
|
|
const hasChildren = children.length > 0 || localSnippets.length > 0;
|
|
const isExpanded = expandedPaths.has(pkg);
|
|
|
|
out.push({
|
|
type: 'package',
|
|
id: pkg,
|
|
path: pkg,
|
|
name: pkgDisplayName(pkg),
|
|
depth,
|
|
count: countDescendants(pkg),
|
|
hasChildren,
|
|
isExpanded,
|
|
});
|
|
|
|
if (!isExpanded) return;
|
|
children.forEach((c) => walk(c, depth + 1));
|
|
localSnippets.forEach((s) =>
|
|
out.push({ type: 'snippet', id: s.id, depth: depth + 1, snippet: s, packagePath: pkg }),
|
|
);
|
|
};
|
|
|
|
// Orphan / uncategorized snippets first (package === '')
|
|
snippetsIn(null).forEach((s) =>
|
|
out.push({ type: 'snippet', id: s.id, depth: 0, snippet: s, packagePath: '' }),
|
|
);
|
|
childPackagesOf(null).forEach((root) => walk(root, 0));
|
|
|
|
return out;
|
|
}, [normalizedPackages, snippets, expandedPaths, searchMatches]);
|
|
|
|
const handleSnippetClick = useCallback(
|
|
(command: string, noAutoRun?: boolean) => {
|
|
onSnippetClick(command, noAutoRun);
|
|
},
|
|
[onSnippetClick],
|
|
);
|
|
|
|
const handleAddSnippet = useCallback(() => {
|
|
// Let the App shell listen and navigate to the Snippets section with
|
|
// the "add" panel pre-opened, so the user does not have to leave the
|
|
// terminal to jump back and click "New Snippet".
|
|
window.dispatchEvent(new CustomEvent('netcatty:snippets:add'));
|
|
}, []);
|
|
|
|
const handleEditSnippet = useCallback((snippet: Snippet) => {
|
|
window.dispatchEvent(
|
|
new CustomEvent('netcatty:snippets:edit', { detail: { snippet } }),
|
|
);
|
|
}, []);
|
|
|
|
const handleDeleteSnippet = useCallback((id: string) => {
|
|
window.dispatchEvent(
|
|
new CustomEvent('netcatty:snippets:delete', { detail: { id } }),
|
|
);
|
|
}, []);
|
|
|
|
if (!isVisible) return null;
|
|
|
|
const hasAnyContent = snippets.length > 0 || packages.length > 0;
|
|
|
|
return (
|
|
<TooltipProvider delayDuration={300}>
|
|
<div
|
|
className="h-full flex flex-col bg-background overflow-hidden"
|
|
data-section="snippets-panel"
|
|
>
|
|
{/* Search + Add */}
|
|
<div className="shrink-0 px-2 py-1.5 border-b border-border/50 flex items-center gap-1.5">
|
|
<div className="relative flex-1 min-w-0">
|
|
<Search size={12} className="absolute left-2 top-1/2 -translate-y-1/2 text-muted-foreground" />
|
|
<Input
|
|
value={search}
|
|
onChange={(e) => setSearch(e.target.value)}
|
|
placeholder={t('snippets.searchPlaceholder')}
|
|
className="h-7 pl-7 text-xs bg-muted/30 border-none"
|
|
/>
|
|
</div>
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<button
|
|
type="button"
|
|
onClick={handleAddSnippet}
|
|
aria-label={t('snippets.action.newSnippet')}
|
|
className="shrink-0 h-7 w-7 flex items-center justify-center rounded-md text-muted-foreground hover:text-foreground hover:bg-muted/60 transition-colors"
|
|
>
|
|
<Plus size={14} />
|
|
</button>
|
|
</TooltipTrigger>
|
|
<TooltipContent>{t('snippets.action.newSnippet')}</TooltipContent>
|
|
</Tooltip>
|
|
</div>
|
|
|
|
{/* Content */}
|
|
<ScrollArea className="flex-1">
|
|
<div className="py-1">
|
|
{!hasAnyContent && (
|
|
<div className="flex flex-col items-center justify-center py-8 text-muted-foreground">
|
|
<Zap size={24} className="opacity-40 mb-2" />
|
|
<span className="text-xs">{t('terminal.toolbar.noSnippets')}</span>
|
|
</div>
|
|
)}
|
|
|
|
{/* Search flat list */}
|
|
{searchMatches !== null && searchMatches.length > 0 &&
|
|
searchMatches.map((s) => (
|
|
<SnippetRow
|
|
key={s.id}
|
|
snippet={s}
|
|
depth={0}
|
|
subtitle={s.package || t('terminal.toolbar.library')}
|
|
onClick={() => handleSnippetClick(s.command, s.noAutoRun)}
|
|
onEdit={() => handleEditSnippet(s)}
|
|
onDelete={() => handleDeleteSnippet(s.id)}
|
|
editLabel={t('action.edit')}
|
|
deleteLabel={t('action.delete')}
|
|
/>
|
|
))}
|
|
|
|
{/* Tree */}
|
|
{searchMatches === null &&
|
|
rows.map((row) =>
|
|
row.type === 'package' ? (
|
|
<PackageRow
|
|
key={`pkg:${row.id}`}
|
|
row={row}
|
|
countLabel={t('snippets.package.count', { count: row.count })}
|
|
onToggle={() => togglePackage(row.path)}
|
|
/>
|
|
) : (
|
|
<SnippetRow
|
|
key={`snip:${row.id}`}
|
|
snippet={row.snippet}
|
|
depth={row.depth}
|
|
onClick={() => handleSnippetClick(row.snippet.command, row.snippet.noAutoRun)}
|
|
onEdit={() => handleEditSnippet(row.snippet)}
|
|
onDelete={() => handleDeleteSnippet(row.snippet.id)}
|
|
editLabel={t('action.edit')}
|
|
deleteLabel={t('action.delete')}
|
|
/>
|
|
),
|
|
)}
|
|
|
|
{hasAnyContent && searchMatches !== null && searchMatches.length === 0 && (
|
|
<div className="px-3 py-4 text-xs text-muted-foreground italic text-center">
|
|
{t('common.noResultsFound')}
|
|
</div>
|
|
)}
|
|
</div>
|
|
</ScrollArea>
|
|
</div>
|
|
</TooltipProvider>
|
|
);
|
|
};
|
|
|
|
interface PackageRowProps {
|
|
row: Extract<TreeRow, { type: 'package' }>;
|
|
countLabel: string;
|
|
onToggle: () => void;
|
|
}
|
|
|
|
const PackageRow: React.FC<PackageRowProps> = ({ row, countLabel, onToggle }) => (
|
|
<button
|
|
type="button"
|
|
onClick={onToggle}
|
|
className="w-full flex items-center gap-1.5 pr-3 py-1.5 text-left hover:bg-accent/50 transition-colors"
|
|
style={{ paddingLeft: 8 + row.depth * 14 }}
|
|
>
|
|
<ChevronRight
|
|
size={12}
|
|
className={cn(
|
|
'shrink-0 text-muted-foreground transition-transform',
|
|
row.isExpanded && 'rotate-90',
|
|
!row.hasChildren && 'opacity-0',
|
|
)}
|
|
/>
|
|
<Package size={12} className="shrink-0 text-primary/80" />
|
|
<span className="flex-1 min-w-0 truncate text-xs font-medium">{row.name}</span>
|
|
<span className="shrink-0 text-[10px] text-muted-foreground tabular-nums">{countLabel}</span>
|
|
</button>
|
|
);
|
|
|
|
interface SnippetRowProps {
|
|
snippet: Snippet;
|
|
depth: number;
|
|
subtitle?: string;
|
|
onClick: () => void;
|
|
onEdit: () => void;
|
|
onDelete: () => void;
|
|
editLabel: string;
|
|
deleteLabel: string;
|
|
}
|
|
|
|
const SnippetRow: React.FC<SnippetRowProps> = ({
|
|
snippet,
|
|
depth,
|
|
subtitle,
|
|
onClick,
|
|
onEdit,
|
|
onDelete,
|
|
editLabel,
|
|
deleteLabel,
|
|
}) => (
|
|
<ContextMenu>
|
|
<ContextMenuTrigger asChild>
|
|
<div>
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<button
|
|
type="button"
|
|
onClick={onClick}
|
|
className="w-full flex items-center gap-1.5 pr-3 py-1.5 text-left hover:bg-accent/50 transition-colors overflow-hidden"
|
|
style={{ paddingLeft: 8 + depth * 14 }}
|
|
>
|
|
{/* Hidden chevron column mirrors PackageRow's layout so the
|
|
snippet icon lines up exactly with the package icon above. */}
|
|
<ChevronRight size={12} className="shrink-0 opacity-0" aria-hidden />
|
|
<FileCode size={12} className="shrink-0 text-muted-foreground" />
|
|
<span className="flex-1 min-w-0 truncate text-xs font-medium">{snippet.label}</span>
|
|
{subtitle && (
|
|
<span className="shrink-0 max-w-[40%] truncate text-[10px] text-muted-foreground">
|
|
{subtitle}
|
|
</span>
|
|
)}
|
|
</button>
|
|
</TooltipTrigger>
|
|
<TooltipContent side="right" align="start" className="max-w-[480px]">
|
|
<div className="font-medium text-xs mb-1 break-all">{snippet.label}</div>
|
|
<pre className="font-mono text-[11px] whitespace-pre-wrap break-all leading-snug opacity-90">
|
|
{snippet.command}
|
|
</pre>
|
|
</TooltipContent>
|
|
</Tooltip>
|
|
</div>
|
|
</ContextMenuTrigger>
|
|
<ContextMenuContent>
|
|
<ContextMenuItem onClick={onEdit}>
|
|
<Edit2 className="mr-2 h-4 w-4" /> {editLabel}
|
|
</ContextMenuItem>
|
|
<ContextMenuItem className="text-destructive" onClick={onDelete}>
|
|
<Trash2 className="mr-2 h-4 w-4" /> {deleteLabel}
|
|
</ContextMenuItem>
|
|
</ContextMenuContent>
|
|
</ContextMenu>
|
|
);
|
|
|
|
export const ScriptsSidePanel = memo(ScriptsSidePanelInner);
|
|
ScriptsSidePanel.displayName = 'ScriptsSidePanel';
|