MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-09 04:41:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Modify navigation and completion keyboard shortcuts to not use scroll. (#12502)

Browse Source
This commit is contained in:
Jacob Richman
2025-11-03 16:22:04 -08:00
committed by GitHub
parent f3759381b1
commit ad33c22374
7 changed files with 131 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/cli/src/ui/components/SettingsDialog.tsx
View File

@@ -38,6 +38,7 @@ import {
TOGGLE_TYPES,
} from '../../config/settingsSchema.js';
import { debugLogger } from '@google/gemini-cli-core';
import { keyMatchers, Command } from '../keyMatchers.js';
interface SettingsDialogProps {
settings: LoadedSettings;
@@ -480,7 +481,7 @@ export function SettingsDialog({
useKeypress(
(key) => {
const { name, ctrl } = key;
const { name } = key;
if (name === 'tab' && showScopeSelection) {
setFocusSection((prev) => (prev === 'settings' ? 'scope' : 'settings'));
}
@@ -523,11 +524,11 @@ export function SettingsDialog({
}
return;
}
if (name === 'escape') {
if (keyMatchers[Command.ESCAPE](key)) {
commitEdit(editingKey);
return;
}
if (name === 'return') {
if (keyMatchers[Command.RETURN](key)) {
commitEdit(editingKey);
return;
}
@@ -564,18 +565,18 @@ export function SettingsDialog({
return;
}
// Home and End keys
if (name === 'home') {
if (keyMatchers[Command.HOME](key)) {
setEditCursorPos(0);
return;
}
if (name === 'end') {
if (keyMatchers[Command.END](key)) {
setEditCursorPos(cpLen(editBuffer));
return;
}
// Block other keys while editing
return;
}
if (name === 'up' || name === 'k') {
if (keyMatchers[Command.DIALOG_NAVIGATION_UP](key)) {
// If editing, commit first
if (editingKey) {
commitEdit(editingKey);
@@ -591,7 +592,7 @@ export function SettingsDialog({
} else if (newIndex < scrollOffset) {
setScrollOffset(newIndex);
}
} else if (name === 'down' || name === 'j') {
} else if (keyMatchers[Command.DIALOG_NAVIGATION_DOWN](key)) {
// If editing, commit first
if (editingKey) {
commitEdit(editingKey);
@@ -605,7 +606,7 @@ export function SettingsDialog({
} else if (newIndex >= scrollOffset + effectiveMaxItemsToShow) {
setScrollOffset(newIndex - effectiveMaxItemsToShow + 1);
}
} else if (name === 'return' || name === 'space') {
} else if (keyMatchers[Command.RETURN](key) || name === 'space') {
const currentItem = items[activeSettingIndex];
if (
currentItem?.type === 'number' ||
@@ -620,7 +621,10 @@ export function SettingsDialog({
if (currentItem?.type === 'number') {
startEditing(currentItem.value, key.sequence);
}
} else if (ctrl && (name === 'c' || name === 'l')) {
} else if (
keyMatchers[Command.CLEAR_INPUT](key) ||
keyMatchers[Command.CLEAR_SCREEN](key)
) {
// Ctrl+C or Ctrl+L: Clear current setting and reset to default
const currentSetting = items[activeSettingIndex];
if (currentSetting) {
@@ -730,7 +734,7 @@ export function SettingsDialog({
setRestartRequiredSettings(new Set()); // Clear restart-required settings
if (onRestartRequest) onRestartRequest();
}
if (name === 'escape') {
if (keyMatchers[Command.ESCAPE](key)) {
if (editingKey) {
commitEdit(editingKey);
} else {