From 00805cb2cdd9786451b9a3a6746f11f47535288d Mon Sep 17 00:00:00 2001 From: Jacob Richman Date: Wed, 28 May 2025 19:46:08 +0000 Subject: Cleanup: Remove low value StreamingContextType interface. (#585) --- .../src/ui/components/GeminiRespondingSpinner.tsx | 2 +- .../src/ui/components/LoadingIndicator.test.tsx | 23 ++++++---------------- .../cli/src/ui/components/LoadingIndicator.tsx | 2 +- .../ui/components/messages/ToolMessage.test.tsx | 9 +++------ 4 files changed, 11 insertions(+), 25 deletions(-) (limited to 'packages/cli/src/ui/components') diff --git a/packages/cli/src/ui/components/GeminiRespondingSpinner.tsx b/packages/cli/src/ui/components/GeminiRespondingSpinner.tsx index 57f5dd30..97e10cb3 100644 --- a/packages/cli/src/ui/components/GeminiRespondingSpinner.tsx +++ b/packages/cli/src/ui/components/GeminiRespondingSpinner.tsx @@ -23,7 +23,7 @@ interface GeminiRespondingSpinnerProps { export const GeminiRespondingSpinner: React.FC< GeminiRespondingSpinnerProps > = ({ nonRespondingDisplay, spinnerType = 'dots' }) => { - const { streamingState } = useStreamingContext(); + const streamingState = useStreamingContext(); if (streamingState === StreamingState.Responding) { return ; diff --git a/packages/cli/src/ui/components/LoadingIndicator.test.tsx b/packages/cli/src/ui/components/LoadingIndicator.test.tsx index c74003e4..3d31818b 100644 --- a/packages/cli/src/ui/components/LoadingIndicator.test.tsx +++ b/packages/cli/src/ui/components/LoadingIndicator.test.tsx @@ -8,10 +8,7 @@ import React from 'react'; import { render } from 'ink-testing-library'; import { Text } from 'ink'; import { LoadingIndicator } from './LoadingIndicator.js'; -import { - StreamingContext, - StreamingContextType, -} from '../contexts/StreamingContext.js'; +import { StreamingContext } from '../contexts/StreamingContext.js'; import { StreamingState } from '../types.js'; import { vi } from 'vitest'; @@ -22,7 +19,7 @@ vi.mock('./GeminiRespondingSpinner.js', () => ({ }: { nonRespondingDisplay?: string; }) => { - const { streamingState } = React.useContext(StreamingContext)!; + const streamingState = React.useContext(StreamingContext)!; if (streamingState === StreamingState.Responding) { return MockRespondingSpinner; } else if (nonRespondingDisplay) { @@ -36,9 +33,7 @@ const renderWithContext = ( ui: React.ReactElement, streamingStateValue: StreamingState, ) => { - const contextValue: StreamingContextType = { - streamingState: streamingStateValue, - }; + const contextValue: StreamingState = streamingStateValue; return render( {ui} @@ -129,9 +124,7 @@ describe('', () => { // Transition to Responding rerender( - + ', () => { // Transition to WaitingForConfirmation rerender( - + ', () => { // Transition back to Idle rerender( - + , ); diff --git a/packages/cli/src/ui/components/LoadingIndicator.tsx b/packages/cli/src/ui/components/LoadingIndicator.tsx index c3865f3e..31c6fee9 100644 --- a/packages/cli/src/ui/components/LoadingIndicator.tsx +++ b/packages/cli/src/ui/components/LoadingIndicator.tsx @@ -22,7 +22,7 @@ export const LoadingIndicator: React.FC = ({ elapsedTime, rightContent, }) => { - const { streamingState } = useStreamingContext(); + const streamingState = useStreamingContext(); if (streamingState === StreamingState.Idle) { return null; diff --git a/packages/cli/src/ui/components/messages/ToolMessage.test.tsx b/packages/cli/src/ui/components/messages/ToolMessage.test.tsx index a40ca31b..2b96f18a 100644 --- a/packages/cli/src/ui/components/messages/ToolMessage.test.tsx +++ b/packages/cli/src/ui/components/messages/ToolMessage.test.tsx @@ -9,10 +9,7 @@ import { render } from 'ink-testing-library'; import { ToolMessage, ToolMessageProps } from './ToolMessage.js'; import { StreamingState, ToolCallStatus } from '../../types.js'; import { Text } from 'ink'; -import { - StreamingContext, - StreamingContextType, -} from '../../contexts/StreamingContext.js'; +import { StreamingContext } from '../../contexts/StreamingContext.js'; // Mock child components or utilities if they are complex or have side effects vi.mock('../GeminiRespondingSpinner.js', () => ({ @@ -21,7 +18,7 @@ vi.mock('../GeminiRespondingSpinner.js', () => ({ }: { nonRespondingDisplay?: string; }) => { - const { streamingState } = React.useContext(StreamingContext)!; + const streamingState = React.useContext(StreamingContext)!; if (streamingState === StreamingState.Responding) { return MockRespondingSpinner; } @@ -48,7 +45,7 @@ const renderWithContext = ( ui: React.ReactElement, streamingState: StreamingState, ) => { - const contextValue: StreamingContextType = { streamingState }; + const contextValue: StreamingState = streamingState; return render( {ui} -- cgit v1.2.3