From ffe368afed853f43c9ab8851c1edc86160db8486 Mon Sep 17 00:00:00 2001 From: Taylor Mullen Date: Tue, 22 Apr 2025 18:25:03 -0700 Subject: Refactor tool confirmation radio buttons to own component. - I plan to utilize these radio buttons for theme selection in the future. Refactoring them into their own component. Part of https://b.corp.google.com/issues/412797985 --- .../messages/ToolConfirmationMessage.tsx | 45 +++++----------------- 1 file changed, 10 insertions(+), 35 deletions(-) (limited to 'packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx') diff --git a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx index abc4fe61..9f65f1b9 100644 --- a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx +++ b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx @@ -6,7 +6,6 @@ import React from 'react'; import { Box, Text, useInput } from 'ink'; -import SelectInput from 'ink-select-input'; import { PartListUnion } from '@google/genai'; import { DiffRenderer } from './DiffRenderer.js'; import { UI_WIDTH } from '../../constants.js'; @@ -17,6 +16,10 @@ import { ToolConfirmationOutcome, ToolExecuteConfirmationDetails, } from '@gemini-code/server'; +import { + RadioButtonSelect, + RadioSelectItem, +} from '../shared/RadioButtonSelect.js'; export interface ToolConfirmationMessageProps { confirmationDetails: ToolCallConfirmationDetails; @@ -29,11 +32,6 @@ function isEditDetails( return (props as ToolEditConfirmationDetails).fileName !== undefined; } -interface InternalOption { - label: string; - value: ToolConfirmationOutcome; -} - export const ToolConfirmationMessage: React.FC< ToolConfirmationMessageProps > = ({ confirmationDetails }) => { @@ -45,13 +43,14 @@ export const ToolConfirmationMessage: React.FC< } }); - const handleSelect = (item: InternalOption) => { - onConfirm(item.value); - }; + const handleSelect = (item: ToolConfirmationOutcome) => onConfirm(item); let bodyContent: React.ReactNode | null = null; // Removed contextDisplay here let question: string; - const options: InternalOption[] = []; + + const options: Array> = new Array< + RadioSelectItem + >(); if (isEditDetails(confirmationDetails)) { // Body content is now the DiffRenderer, passing filename to it @@ -118,32 +117,8 @@ export const ToolConfirmationMessage: React.FC< {/* Select Input for Options */} - + ); }; - -function Indicator({ isSelected = false }): React.JSX.Element { - return ( - - {isSelected ? '◉ ' : '○ '} - - ); -} - -export type ItemProps = { - readonly isSelected?: boolean; - readonly label: string; -}; - -function Item({ isSelected = false, label }: ItemProps): React.JSX.Element { - return ( - {label} - ); -} -- cgit v1.2.3