From fec57e30a8710918a30929dfdaf698315b4f578a Mon Sep 17 00:00:00 2001 From: Prathmesh Vhatkar Date: Thu, 30 Jan 2025 11:21:54 +0530 Subject: [PATCH 1/2] fix:Made the main inputbox focus styling better, added better spacing in openai compatible section --- webview-ui/src/components/chat/ChatTextArea.tsx | 8 ++++++++ webview-ui/src/components/settings/ApiOptions.tsx | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/webview-ui/src/components/chat/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea.tsx index fa00fc1..5776585 100644 --- a/webview-ui/src/components/chat/ChatTextArea.tsx +++ b/webview-ui/src/components/chat/ChatTextArea.tsx @@ -103,6 +103,7 @@ const ChatTextArea = forwardRef( const [intendedCursorPosition, setIntendedCursorPosition] = useState(null) const contextMenuContainerRef = useRef(null) const [isEnhancingPrompt, setIsEnhancingPrompt] = useState(false) + const [isFocused, setIsFocused] = useState(false) // Fetch git commits when Git is selected or when typing a hash useEffect(() => { @@ -379,6 +380,7 @@ const ChatTextArea = forwardRef( if (!isMouseDownOnMenu) { setShowContextMenu(false) } + setIsFocused(false) }, [isMouseDownOnMenu]) const handlePaste = useCallback( @@ -537,6 +539,10 @@ const ChatTextArea = forwardRef( backgroundColor: "var(--vscode-input-background)", margin: "10px 15px", padding: "8px", + outline: "none", + border: "1px solid", + borderColor: isFocused ? "var(--vscode-focusBorder)" : "transparent", + borderRadius: "2px", }} onDrop={async (e) => { e.preventDefault() @@ -647,6 +653,7 @@ const ChatTextArea = forwardRef( handleInputChange(e) updateHighlights() }} + onFocus={() => setIsFocused(true)} onKeyDown={handleKeyDown} onKeyUp={handleKeyUp} onBlur={handleBlur} @@ -665,6 +672,7 @@ const ChatTextArea = forwardRef( autoFocus={true} style={{ width: "100%", + outline: "none", boxSizing: "border-box", backgroundColor: "transparent", color: "var(--vscode-input-foreground)", diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx index 1199914..4bdff0b 100644 --- a/webview-ui/src/components/settings/ApiOptions.tsx +++ b/webview-ui/src/components/settings/ApiOptions.tsx @@ -563,7 +563,7 @@ const ApiOptions = ({ apiErrorMessage, modelIdErrorMessage }: ApiOptionsProps) = )} {selectedProvider === "openai" && ( -
+
Date: Thu, 30 Jan 2025 13:40:35 +0530 Subject: [PATCH 2/2] fix:padding improved, removed scrollbar in inputbox --- webview-ui/src/components/chat/ChatTextArea.tsx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/webview-ui/src/components/chat/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea.tsx index 5776585..99c75df 100644 --- a/webview-ui/src/components/chat/ChatTextArea.tsx +++ b/webview-ui/src/components/chat/ChatTextArea.tsx @@ -633,7 +633,8 @@ const ChatTextArea = forwardRef( fontFamily: "var(--vscode-font-family)", fontSize: "var(--vscode-editor-font-size)", lineHeight: "var(--vscode-editor-line-height)", - padding: "8px", + padding: "2px", + paddingRight: "8px", marginBottom: thumbnailsHeight > 0 ? `${thumbnailsHeight + 16}px` : 0, zIndex: 1, }} @@ -667,8 +668,8 @@ const ChatTextArea = forwardRef( onHeightChange?.(height) }} placeholder={placeholderText} - minRows={2} - maxRows={20} + minRows={3} + maxRows={15} autoFocus={true} style={{ width: "100%", @@ -684,11 +685,13 @@ const ChatTextArea = forwardRef( overflowX: "hidden", overflowY: "auto", border: "none", - padding: "8px", + padding: "2px", + paddingRight: "8px", marginBottom: thumbnailsHeight > 0 ? `${thumbnailsHeight + 16}px` : 0, cursor: textAreaDisabled ? "not-allowed" : undefined, flex: "0 1 auto", zIndex: 2, + scrollbarWidth: "none", }} onScroll={() => updateHighlights()} /> @@ -704,7 +707,7 @@ const ChatTextArea = forwardRef( bottom: "36px", left: "16px", zIndex: 2, - marginBottom: "8px", + marginBottom: "4px", }} /> )} @@ -715,7 +718,7 @@ const ChatTextArea = forwardRef( justifyContent: "space-between", alignItems: "center", marginTop: "auto", - paddingTop: "8px", + paddingTop: "2px", }}>