Skip to content

fix: gate auto-focus behavior with preventFocusDisruption experiment #10529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roomote wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −4
Open

fix: gate auto-focus behavior with preventFocusDisruption experiment #10529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion webview-ui/src/components/chat/ChatTextArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
commands,
cloudUserInfo,
enterBehavior,
experiments,
} = useExtensionState()

// Find the ID and display text for the currently selected API configuration.
Expand Down Expand Up @@ -1080,7 +1081,7 @@ export const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
placeholder={placeholderText}
minRows={3}
maxRows={15}
autoFocus={true}
autoFocus={!experiments?.preventFocusDisruption}
className={cn(
"w-full",
"text-vscode-input-foreground",
Expand Down
13 changes: 10 additions & 3 deletions webview-ui/src/components/chat/ChatView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
cloudIsAuthenticated,
messageQueue = [],
isBrowserSessionActive,
experiments,
} = useExtensionState()

const messagesRef = useRef(messages)
Expand Down Expand Up @@ -803,7 +804,12 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
case "action":
switch (message.action!) {
case "didBecomeVisible":
if (!isHidden && !sendingDisabled && !enableButtons) {
if (
!isHidden &&
!sendingDisabled &&
!enableButtons &&
!experiments?.preventFocusDisruption
) {
textAreaRef.current?.focus()
}
break
Expand Down Expand Up @@ -877,6 +883,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
isHidden,
sendingDisabled,
enableButtons,
experiments?.preventFocusDisruption,
handleChatReset,
handleSendMessage,
handleSetChatBoxMessage,
Expand Down Expand Up @@ -1003,12 +1010,12 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro

useDebounceEffect(
() => {
if (!isHidden && !sendingDisabled && !enableButtons) {
if (!isHidden && !sendingDisabled && !enableButtons && !experiments?.preventFocusDisruption) {
textAreaRef.current?.focus()
}
},
50,
[isHidden, sendingDisabled, enableButtons],
[isHidden, sendingDisabled, enableButtons, experiments?.preventFocusDisruption],
)

useEffect(() => {
Expand Down
Loading