Simplify focus restoration - use window focus event instead of view state

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/@types/vscode.proposed.chatParticipantAdditions.d.ts

@@ -105,6 +105,7 @@ declare module 'vscode' {
 		isComplete?: boolean;
 		toolSpecificData?: ChatTerminalToolInvocationData;
 		fromSubAgent?: boolean;
+		presentation?: 'hidden' | 'hiddenAfterComplete' | undefined;
 
 		constructor(toolName: string, toolCallId: string, isError?: boolean);
 	}

src/github/pullRequestOverview.ts

@@ -186,11 +186,6 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 		if (this._panel.visible && this._item) {
 			PullRequestOverviewPanel._onVisible.fire(this._item);
 		}
-
-		// If the panel becomes active, send a message to restore focus to the comment textarea if needed
-		if (this._panel.active) {
-			this._postMessage({ command: 'pr.restoreFocus' });
-		}
 	}
 
 	private setVisibilityContext() {

webviews/common/constants.ts

@@ -5,7 +5,6 @@
 
 import { createContext } from 'react';
 import { getState, setState, updateState } from './cache';
-import { COMMENT_TEXTAREA_FOCUS_KEY } from './constants';
 import { getMessageHandler, MessageHandler } from './message';
 import { CloseResult, OpenCommitChangesArgs } from '../../common/views';
 import { IComment } from '../../src/common/comment';
@@ -411,17 +410,6 @@ export class PRContext {
 					pendingReview.focus();
 				}
 				return;
-			case 'pr.restoreFocus':
-				// Restore focus to the comment textarea if it had focus before the webview lost focus
-				const commentTextarea = document.getElementById('comment-textarea');
-				if (commentTextarea instanceof HTMLTextAreaElement) {
-					// Check if there's a stored focus state
-					const shouldRestoreFocus = sessionStorage.getItem(COMMENT_TEXTAREA_FOCUS_KEY) === 'true';
-					if (shouldRestoreFocus) {
-						commentTextarea.focus();
-					}
-				}
-				return;
 			case 'pr.submitting-review':
 				return this.updatePR({ busy: true, lastReviewType: message.lastReviewType });
 			case 'pr.append-review':

webviews/common/context.tsx

@@ -8,7 +8,6 @@ import React, { useContext, useEffect, useState } from 'react';
 import { render } from 'react-dom';
 import { Overview } from './overview';
 import { PullRequest } from '../../src/github/views';
-import { COMMENT_TEXTAREA_FOCUS_KEY } from '../common/constants';
 import PullRequestContext from '../common/context';
 
 export function main() {
@@ -23,31 +22,21 @@ export function Root({ children }) {
 		setPR(ctx.pr);
 	}, []);
 
-	// Track focus on the comment textarea to restore it when the webview regains focus
+	// Restore focus to comment textarea when window regains focus if user was typing
 	useEffect(() => {
-		const handleFocusIn = (e: FocusEvent) => {
-			if (e.target instanceof HTMLTextAreaElement && e.target.id === 'comment-textarea') {
-				sessionStorage.setItem(COMMENT_TEXTAREA_FOCUS_KEY, 'true');
-			}
-		};
-
-		const handleFocusOut = (e: FocusEvent) => {
-			if (e.target instanceof HTMLTextAreaElement && e.target.id === 'comment-textarea') {
-				// Only clear the flag if we're switching to another element within the webview
-				// When switching to another editor group, relatedTarget will be null and we want to keep the flag
-				if (e.relatedTarget instanceof HTMLElement) {
-					sessionStorage.setItem(COMMENT_TEXTAREA_FOCUS_KEY, 'false');
+		const handleWindowFocus = () => {
+			// Give the focus event time to settle
+			setTimeout(() => {
+				const commentTextarea = document.getElementById('comment-textarea') as HTMLTextAreaElement;
+				// Only restore focus if there's content and nothing else has focus
+				if (commentTextarea && commentTextarea.value && document.activeElement === document.body) {
+					commentTextarea.focus();
 				}
-			}
+			}, 100);
 		};
 
-		document.addEventListener('focusin', handleFocusIn);
-		document.addEventListener('focusout', handleFocusOut);
-
-		return () => {
-			document.removeEventListener('focusin', handleFocusIn);
-			document.removeEventListener('focusout', handleFocusOut);
-		};
+		window.addEventListener('focus', handleWindowFocus);
+		return () => window.removeEventListener('focus', handleWindowFocus);
 	}, []);
 
 	window.onscroll = debounce(() => {