Skip to content

refactor(web): the keybindings panel keeps its caching without "use memo" hooks #20782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 1 commit into from
Oct 17, 2026
Merged

refactor(web): the keybindings panel keeps its caching without "use memo" hooks #20782

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 9 additions & 23 deletions apps/web/src/components/settings/KeybindingsSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,25 +1260,6 @@ function BrowserKeybindingNotice() {
);
}

// The panel calls hooks after these, so they would lose their caches inline. Separate hooks
// keep the command options from rebuilding on every search keystroke.
function useKeybindings(
serverKeybindings: Parameters<typeof mergeWithDefaultKeybindings>[0] | undefined,
) {
"use memo";
const keybindings = mergeWithDefaultKeybindings(serverKeybindings ?? []);
return { keybindings, commandOptions: buildKeybindingCommandOptions(keybindings) };
}

function useKeybindingRows(
keybindings: ReturnType<typeof mergeWithDefaultKeybindings>,
query: string,
) {
"use memo";
const rows = buildKeybindingRows(keybindings, query);
return { rows, groups: groupKeybindingRows(rows), anchorIds: keybindingAnchorIds(rows) };
}

function keybindingAnchorIds(rows: ReturnType<typeof buildKeybindingRows>) {
const ids = new Map<string, string>();
const seen = new Set<KeybindingCommand>();
Expand All @@ -1300,9 +1281,6 @@ export function KeybindingsSettingsPanel() {
const canWriteSettings =
connectedEnvironments.length > 0 &&
connectedEnvironments.every((target) => writableIds.has(target.environmentId));
const { keybindings, commandOptions } = useKeybindings(
primaryEnvironment?.serverConfig?.keybindings,
);
const keybindingsConfigPath = primaryEnvironment?.serverConfig?.keybindingsConfigPath ?? null;
const availableEditors = primaryEnvironment?.serverConfig?.availableEditors ?? [];
const upsertKeybinding = useAtomCommand(serverEnvironment.upsertKeybinding, {
Expand All @@ -1319,7 +1297,6 @@ export function KeybindingsSettingsPanel() {
const searchInputRef = useRef<HTMLInputElement>(null);
const [savingCommand, setSavingCommand] = useState<KeybindingCommand | null>(null);
const [isAddingBinding, setIsAddingBinding] = useState(false);
const { rows, groups, anchorIds } = useKeybindingRows(keybindings, query);
const searchTargetId = useLocation({ select: (location) => location.hash.replace(/^#/, "") });
const [handledSearchTargetId, setHandledSearchTargetId] = useState(searchTargetId);

Expand All @@ -1328,6 +1305,15 @@ export function KeybindingsSettingsPanel() {
if (searchTargetId.startsWith("keybinding-")) setQuery("");
}
const whenVariables = buildWhenVariableOptions();
const serverKeybindings = primaryEnvironment?.serverConfig?.keybindings;
// Each derivation merges the defaults itself so the command options key on the
// server keybindings alone and do not rebuild on every search keystroke.
const commandOptions = buildKeybindingCommandOptions(
mergeWithDefaultKeybindings(serverKeybindings ?? []),
);
const rows = buildKeybindingRows(mergeWithDefaultKeybindings(serverKeybindings ?? []), query);
const groups = groupKeybindingRows(rows);
const anchorIds = keybindingAnchorIds(rows);

const openKeybindingsFile = () => {
if (
Expand Down
Loading