mirror of
https://github.com/QwenLM/qwen-code.git
synced 2025-12-20 16:57:46 +00:00
b4c16d1f56
No intentional different behavior aside for tweaks suggested from the code review of #506 Refactor: Extract console message logic to custom hook This commit refactors the console message handling from App.tsx into a new custom hook useConsoleMessages. This change improves the testability of the console message logic and declutters the main App component. Created useConsoleMessages.ts to encapsulate console message state and update logic. Updated App.tsx to utilize the new useConsoleMessages hook. Added unit tests for useConsoleMessages.ts to ensure its functionality. I deleted and started over on LoadingIndicator.test.tsx as I spent way too much time trying to fix it before just regenerating the tests as the code was easier to write tests for from scratch and the existing tests were not that good (I added them in the previous pull request).
58 lines
2.1 KiB
TypeScript
58 lines
2.1 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2025 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import { StreamingState } from '../types.js';
|
|
import { useTimer } from './useTimer.js';
|
|
import { usePhraseCycler } from './usePhraseCycler.js';
|
|
import { useState, useEffect, useRef } from 'react'; // Added useRef
|
|
|
|
export const useLoadingIndicator = (streamingState: StreamingState) => {
|
|
const [timerResetKey, setTimerResetKey] = useState(0);
|
|
const isTimerActive = streamingState === StreamingState.Responding;
|
|
|
|
const elapsedTimeFromTimer = useTimer(isTimerActive, timerResetKey);
|
|
|
|
const isPhraseCyclingActive = streamingState === StreamingState.Responding;
|
|
const isWaiting = streamingState === StreamingState.WaitingForConfirmation;
|
|
const currentLoadingPhrase = usePhraseCycler(
|
|
isPhraseCyclingActive,
|
|
isWaiting,
|
|
);
|
|
|
|
const [retainedElapsedTime, setRetainedElapsedTime] = useState(0);
|
|
const prevStreamingStateRef = useRef<StreamingState | null>(null);
|
|
|
|
useEffect(() => {
|
|
if (
|
|
prevStreamingStateRef.current === StreamingState.WaitingForConfirmation &&
|
|
streamingState === StreamingState.Responding
|
|
) {
|
|
setTimerResetKey((prevKey) => prevKey + 1);
|
|
setRetainedElapsedTime(0); // Clear retained time when going back to responding
|
|
} else if (
|
|
streamingState === StreamingState.Idle &&
|
|
prevStreamingStateRef.current === StreamingState.Responding
|
|
) {
|
|
setTimerResetKey((prevKey) => prevKey + 1); // Reset timer when becoming idle from responding
|
|
setRetainedElapsedTime(0);
|
|
} else if (streamingState === StreamingState.WaitingForConfirmation) {
|
|
// Capture the time when entering WaitingForConfirmation
|
|
// elapsedTimeFromTimer will hold the last value from when isTimerActive was true.
|
|
setRetainedElapsedTime(elapsedTimeFromTimer);
|
|
}
|
|
|
|
prevStreamingStateRef.current = streamingState;
|
|
}, [streamingState, elapsedTimeFromTimer]);
|
|
|
|
return {
|
|
elapsedTime:
|
|
streamingState === StreamingState.WaitingForConfirmation
|
|
? retainedElapsedTime
|
|
: elapsedTimeFromTimer,
|
|
currentLoadingPhrase,
|
|
};
|
|
};
|