Skip to content

Fix hooks to avoid unnecessary re-renders #10820

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
scidomino merged 1 commit into from
Oct 9, 2025
Merged

Fix hooks to avoid unnecessary re-renders #10820

Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion packages/cli/src/ui/AppContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,6 +1239,11 @@ Logging in with Google... Please restart Gemini CLI to continue.
],
);

const exitPrivacyNotice = useCallback(
() => setShowPrivacyNotice(false),
[setShowPrivacyNotice],
);

const uiActions: UIActions = useMemo(
() => ({
handleThemeSelect,
Expand All @@ -1248,7 +1253,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
onAuthError,
handleEditorSelect,
exitEditorDialog,
exitPrivacyNotice: () => setShowPrivacyNotice(false),
exitPrivacyNotice,
closeSettingsDialog,
closeModelDialog,
closePermissionsDialog,
Expand All @@ -1273,6 +1278,7 @@ Logging in with Google... Please restart Gemini CLI to continue.
onAuthError,
handleEditorSelect,
exitEditorDialog,
exitPrivacyNotice,
closeSettingsDialog,
closeModelDialog,
closePermissionsDialog,
Expand Down
19 changes: 11 additions & 8 deletions packages/cli/src/ui/hooks/useHistoryManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { useState, useRef, useCallback } from 'react';
import { useState, useRef, useCallback, useMemo } from 'react';
import type { HistoryItem } from '../types.js';

// Type for the updater function passed to updateHistoryItem
Expand Down Expand Up @@ -101,11 +101,14 @@ export function useHistory(): UseHistoryManagerReturn {
messageIdCounterRef.current = 0;
}, []);

return {
history,
addItem,
updateItem,
clearItems,
loadHistory,
};
return useMemo(
() => ({
history,
addItem,
updateItem,
clearItems,
loadHistory,
}),
[history, addItem, updateItem, clearItems, loadHistory],
);
}
30 changes: 19 additions & 11 deletions packages/cli/src/ui/hooks/useWorkspaceMigration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { useState, useEffect } from 'react';
import { useState, useEffect, useCallback, useMemo } from 'react';
import type { GeminiCLIExtension } from '@google/gemini-cli-core';
import { getWorkspaceExtensions } from '../../config/extension.js';
import { type LoadedSettings, SettingScope } from '../../config/settings.js';
Expand Down Expand Up @@ -37,7 +37,7 @@ export function useWorkspaceMigration(settings: LoadedSettings) {
settings.merged.experimental?.extensionManagement,
]);

const onWorkspaceMigrationDialogOpen = () => {
const onWorkspaceMigrationDialogOpen = useCallback(() => {
const userSettings = settings.forScope(SettingScope.User);
const extensionSettings = userSettings.settings.extensions || {
disabled: [],
Expand All @@ -53,16 +53,24 @@ export function useWorkspaceMigration(settings: LoadedSettings) {
extensionSettings.workspacesWithMigrationNudge =
workspacesWithMigrationNudge;
settings.setValue(SettingScope.User, 'extensions', extensionSettings);
};
}, [settings]);

const onWorkspaceMigrationDialogClose = () => {
const onWorkspaceMigrationDialogClose = useCallback(() => {
setShowWorkspaceMigrationDialog(false);
};
}, [setShowWorkspaceMigrationDialog]);

return {
showWorkspaceMigrationDialog,
workspaceExtensions,
onWorkspaceMigrationDialogOpen,
onWorkspaceMigrationDialogClose,
};
return useMemo(
() => ({
showWorkspaceMigrationDialog,
workspaceExtensions,
onWorkspaceMigrationDialogOpen,
onWorkspaceMigrationDialogClose,
}),
[
showWorkspaceMigrationDialog,
workspaceExtensions,
onWorkspaceMigrationDialogOpen,
onWorkspaceMigrationDialogClose,
],
);
}