Files
Netcatty/components/terminal/TerminalSearchBar.tsx
T
陈大猫andnetcatty-bot d6efb6a313 fix(terminal): keep Enter reconnect working after disconnect (#2550)
* fix(terminal): keep Enter reconnect working after disconnect

Disconnected sessions advertised "Press Enter to reconnect" but often
swallowed the key when focus left xterm (body blur or dialog controls),
and an open terminal search bar globally hid the hint and disabled the
shortcut. Give the disconnected overlay a focus sink + local Enter
handler, and stop treating search-open as a global reconnect gate while
still leaving real buttons/inputs alone.

Closes #2544
Closes #2546

* fix(terminal): stop disconnected dialog focus theft

Only claim Enter-reconnect focus when it is already lost or still inside
this session tree, and restore xterm focus when the overlay unmounts.
Avoid stealing focus from other panes/side panels on disconnect.

* fix(terminal): restore dialog focus only when overlay leaves

Split claim/restore effects so showLogs/error rerenders no longer
yank focus off dialog buttons onto xterm mid-interaction.

* fix(terminal): restore Enter-reconnect focus in popup terminals

Popup Terminal windows lack data-session-id ancestors. Walk up from
the dialog to the local xterm root so claim/restore still work there.

* fix: address Codex review on PR #2550

* fix: address Codex review on PR #2550

* fix: address Codex review on PR #2550

* fix: address Codex review on PR #2550

---------

Co-authored-by: netcatty-bot <308658023+netcatty-bot@users.noreply.github.com>
2026-07-28 00:20:02 +08:00

193 lines
7.5 KiB
TypeScript

/**
* Terminal Search Bar
* Provides search functionality within terminal scrollback buffer
*/
import { ChevronUp, ChevronDown, Search } from 'lucide-react';
import React, { useState, useRef, useEffect, useCallback } from 'react';
import { useI18n } from '../../application/i18n/I18nProvider';
import { Button } from '../ui/button';
import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip';
export interface TerminalSearchBarProps {
isOpen: boolean;
/**
* Incremented each time the search hotkey fires while the bar is already
* open. Watched by the focus effect so Cmd/Ctrl+F re-grabs focus when it
* has moved elsewhere (issue #1789). Ignored while `isOpen` is false.
*/
focusToken?: number;
onClose: () => void;
onSearch: (term: string) => boolean;
onFindNext: () => boolean;
onFindPrevious: () => boolean;
matchCount?: { current: number; total: number } | null;
}
export const notifyTerminalSearchTermChange = (
searchTerm: string,
previousSearchTerm: string,
onSearch: (term: string) => boolean,
): string => {
if (searchTerm === previousSearchTerm) return previousSearchTerm;
onSearch(searchTerm);
return searchTerm;
};
export const TerminalSearchBar: React.FC<TerminalSearchBarProps> = ({
isOpen,
focusToken,
onClose,
onSearch,
onFindNext,
onFindPrevious,
matchCount,
}) => {
const { t } = useI18n();
const [searchTerm, setSearchTerm] = useState('');
const inputRef = useRef<HTMLInputElement>(null);
const prevSearchTermRef = useRef('');
// Focus input when opened, or when the search hotkey re-fires while open
// (focusToken bumps) so focus returns to the input after it moved elsewhere.
useEffect(() => {
if (isOpen && inputRef.current) {
inputRef.current.focus();
inputRef.current.select();
}
}, [isOpen, focusToken]);
// Trigger search when term changes. When the term is cleared we still call
// onSearch('') so the underlying search addon clears its highlights;
// otherwise the last match decorations linger after emptying the input.
useEffect(() => {
prevSearchTermRef.current = notifyTerminalSearchTermChange(
searchTerm,
prevSearchTermRef.current,
onSearch,
);
}, [searchTerm, onSearch]);
const handleKeyDown = useCallback((e: React.KeyboardEvent) => {
if (e.key === 'Escape') {
e.preventDefault();
onClose();
} else if (e.key === 'Enter') {
e.preventDefault();
if (e.shiftKey) {
onFindPrevious();
} else {
onFindNext();
}
} else if (e.key === 'F3' || (e.key === 'g' && (e.ctrlKey || e.metaKey))) {
e.preventDefault();
if (e.shiftKey) {
onFindPrevious();
} else {
onFindNext();
}
}
}, [onClose, onFindNext, onFindPrevious]);
if (!isOpen) return null;
return (
<div
className="flex items-center gap-1.5 px-2 pt-0 pb-2 bg-black/50 backdrop-blur-sm"
style={{
backgroundColor: 'color-mix(in srgb, var(--terminal-ui-bg, #000000) 86%, transparent)',
}}
onClick={(e) => e.stopPropagation()}
onMouseDown={(e) => e.stopPropagation()}
>
{/* Search input */}
<div className="relative flex-1">
<Search
size={12}
className="absolute left-2 top-1/2 -translate-y-1/2"
style={{ color: 'color-mix(in srgb, var(--terminal-ui-fg, #ffffff) 40%, transparent)' }}
/>
<input
ref={inputRef}
type="text"
value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)}
onKeyDown={handleKeyDown}
onClick={(e) => e.stopPropagation()}
onMouseDown={(e) => e.stopPropagation()}
data-terminal-search-input=""
placeholder={t("terminal.search.placeholder")}
className="w-full h-6 pl-7 pr-2 text-[11px] border-none rounded placeholder:opacity-40 focus:outline-none"
style={{
backgroundColor: 'color-mix(in srgb, var(--terminal-ui-fg, #ffffff) 5%, transparent)',
color: 'var(--terminal-ui-fg, #ffffff)',
}}
/>
</div>
{/* Match count indicator - only show when no results */}
{searchTerm.length > 0 && matchCount?.total === 0 && (
<span
className="text-[10px] flex-shrink-0"
style={{ color: 'color-mix(in srgb, var(--terminal-ui-fg, #ffffff) 50%, transparent)' }}
>
{t("terminal.search.noResults")}
</span>
)}
{/* Navigation buttons */}
<div className="flex items-center gap-0.5 flex-shrink-0">
<Tooltip>
<TooltipTrigger asChild>
<Button
type="button"
variant="ghost"
size="icon"
className="h-6 w-6 disabled:opacity-30"
style={{
color: 'color-mix(in srgb, var(--terminal-ui-fg, #ffffff) 60%, transparent)',
}}
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
onFindPrevious();
}}
onMouseDown={(e) => e.stopPropagation()}
onKeyDown={(e) => e.stopPropagation()}
disabled={!searchTerm}
tabIndex={-1}
>
<ChevronUp size={14} />
</Button>
</TooltipTrigger>
<TooltipContent>{t("terminal.search.prevMatch")}</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger asChild>
<Button
type="button"
variant="ghost"
size="icon"
className="h-6 w-6 disabled:opacity-30"
style={{
color: 'color-mix(in srgb, var(--terminal-ui-fg, #ffffff) 60%, transparent)',
}}
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
onFindNext();
}}
onMouseDown={(e) => e.stopPropagation()}
onKeyDown={(e) => e.stopPropagation()}
disabled={!searchTerm}
tabIndex={-1}
>
<ChevronDown size={14} />
</Button>
</TooltipTrigger>
<TooltipContent>{t("terminal.search.nextMatch")}</TooltipContent>
</Tooltip>
</div>
</div>
);
};