scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-08-28 05:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix callback cycle

Browse source
This commit is contained in:
Saoud Rizwan 2025-01-19 18:56:40 -08:00
parent 88af56c06c
commit d9ea1e606c
1 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
webview-ui/src/components/chat/ChatTextArea.tsx
View file

@ -244,6 +244,9 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
const [arrowPosition, setArrowPosition] = useState(0)
const [menuPosition, setMenuPosition] = useState(0)
// Add a ref to track previous menu state
const prevShowModelSelector = useRef(showModelSelector)
const queryItems = useMemo(() => {
return [
{ type: ContextMenuOptionType.Problems, value: "problems" },
@ -650,10 +653,37 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
updateHighlights()
}, [inputValue, textAreaDisabled, handleInputChange, updateHighlights])
// Add click away handler
// Separate the API config submission logic
const submitApiConfig = useCallback(() => {
const apiValidationResult = validateApiConfiguration(apiConfiguration)
const modelIdValidationResult = validateModelId(apiConfiguration, openRouterModels)
const advisorModelIdValidationResult = validateAdvisorModelId(apiConfiguration, openRouterModels)
if (!apiValidationResult && !modelIdValidationResult && !advisorModelIdValidationResult) {
vscode.postMessage({ type: "apiConfiguration", apiConfiguration })
} else {
vscode.postMessage({ type: "getLatestState" })
}
}, [apiConfiguration, openRouterModels])
// Use an effect to detect menu close
useEffect(() => {
if (prevShowModelSelector.current && !showModelSelector) {
// Menu was just closed
submitApiConfig()
}
prevShowModelSelector.current = showModelSelector
}, [showModelSelector, submitApiConfig])
// Remove the handleApiConfigSubmit callback
// Update click handler to just toggle the menu
const handleModelButtonClick = () => {
setShowModelSelector(!showModelSelector)
}
// Update click away handler to just close menu
useClickAway(modelSelectorRef, () => {
setShowModelSelector(false)
handleApiConfigSubmit()
})
// Get model display name
@ -704,19 +734,6 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
}
}, [showModelSelector, viewportWidth, viewportHeight])
const handleApiConfigSubmit = useCallback(() => {
console.log("handleApiConfigSubmit")
const apiValidationResult = validateApiConfiguration(apiConfiguration)
const modelIdValidationResult = validateModelId(apiConfiguration, openRouterModels)
const advisorModelIdValidationResult = validateAdvisorModelId(apiConfiguration, openRouterModels)
if (!apiValidationResult && !modelIdValidationResult && !advisorModelIdValidationResult) {
vscode.postMessage({ type: "apiConfiguration", apiConfiguration })
} else {
vscode.postMessage({ type: "getLatestState" })
}
}, [apiConfiguration, openRouterModels])
// Reset advisor settings when model selector is closed
useEffect(() => {
if (!showModelSelector) {
@ -959,20 +976,11 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
role="button"
isActive={showModelSelector}
disabled={textAreaDisabled}
onClick={() => {
if (showModelSelector) {
handleApiConfigSubmit()
}
setShowModelSelector(!showModelSelector)
}}
onClick={handleModelButtonClick}
onKeyDown={(e) => {
if (e.key === "Enter" || e.key === " ") {
e.preventDefault()
if (showModelSelector) {
handleApiConfigSubmit()
}
setShowModelSelector(!showModelSelector)
handleModelButtonClick()
}
}}
tabIndex={0}>