fix: 修复 Config 面板第二次进入时左右键无反应的问题

将左右键枚举值切换从依赖 DOM 焦点的 onKeyDown 改为 useKeybindings 系统,
确保按键在任何焦点状态下都能正确响应。同时修复 isSearchMode 初始值和布局问题。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
claude-code-best
2026-04-26 14:07:01 +08:00
parent dff678924e
commit 9a5998eaef
3 changed files with 17 additions and 14 deletions

View File

@@ -153,7 +153,7 @@ export function Config({
const initialLanguage = React.useRef(currentLanguage);
const [selectedIndex, setSelectedIndex] = useState(0);
const [scrollOffset, setScrollOffset] = useState(0);
const [isSearchMode, setIsSearchMode] = useState(true);
const [isSearchMode, setIsSearchMode] = useState(false);
const isTerminalFocused = useTerminalFocus();
const { rows } = useTerminalSize();
// contentHeight is set by Settings.tsx (same value passed to Tabs to fix
@@ -561,24 +561,20 @@ export function Config({
value: settingsData?.permissions?.defaultMode || 'default',
options: (() => {
const priorityOrder: PermissionMode[] = ['default', 'plan'];
const allModes: readonly PermissionMode[] = feature('TRANSCRIPT_CLASSIFIER')
? PERMISSION_MODES
: EXTERNAL_PERMISSION_MODES;
const excluded: PermissionMode[] = ['bypassPermissions'];
if (feature('TRANSCRIPT_CLASSIFIER') && !showAutoInDefaultModePicker) {
excluded.push('auto');
}
return [...priorityOrder, ...allModes.filter(m => !priorityOrder.includes(m) && !excluded.includes(m))];
return [...priorityOrder, ...PERMISSION_MODES.filter(m => !priorityOrder.includes(m))];
})(),
type: 'enum' as const,
onChange(mode: string) {
const parsedMode = permissionModeFromString(mode);
// Internal modes (e.g. auto) are stored directly
const validatedMode = isExternalPermissionMode(parsedMode) ? toExternalPermissionMode(parsedMode) : parsedMode;
// auto is an internal-only mode — store it directly, don't convert
// to its external mapping ('default') which would make it invisible.
const validatedMode = parsedMode === 'auto'
? parsedMode
: (isExternalPermissionMode(parsedMode) ? toExternalPermissionMode(parsedMode) : parsedMode);
const result = updateSettingsForSource('userSettings', {
permissions: {
...settingsData?.permissions,
defaultMode: validatedMode as ExternalPermissionMode,
defaultMode: validatedMode as (typeof PERMISSION_MODES)[number],
},
});
@@ -1548,6 +1544,8 @@ export function Config({
'scroll:lineUp': () => moveSelection(-1),
'scroll:lineDown': () => moveSelection(1),
'select:accept': toggleSetting,
'select:previousValue': () => toggleSetting(),
'select:nextValue': () => toggleSetting(),
'settings:search': () => {
setIsSearchMode(true);
setSearchQuery('');
@@ -1936,13 +1934,13 @@ export function Config({
return (
<React.Fragment key={setting.id}>
<Box>
<Box width="100%">
<Box width={44}>
<Text color={isSelected ? 'suggestion' : undefined}>
{isSelected ? figures.pointer : ' '} {setting.label}
</Text>
</Box>
<Box key={isSelected ? 'selected' : 'unselected'}>
<Box flexGrow={1}>
{setting.type === 'boolean' ? (
<>
<Text color={isSelected ? 'suggestion' : undefined}>{setting.value.toString()}</Text>

View File

@@ -117,6 +117,9 @@ export const DEFAULT_BINDINGS: KeybindingBlock[] = [
j: 'select:next',
'ctrl+p': 'select:previous',
'ctrl+n': 'select:next',
// Cycle enum values left/right (same as left/right arrow in handleKeyDown)
left: 'select:previousValue',
right: 'select:nextValue',
// Toggle/activate the selected setting (space only — enter saves & closes)
space: 'select:accept',
// Save and close the config panel

View File

@@ -168,6 +168,8 @@ export const KEYBINDING_ACTIONS = [
'settings:search',
'settings:retry',
'settings:close',
'select:previousValue',
'select:nextValue',
// Voice actions
'voice:pushToTalk',
] as const