Multiplayer agent harness for work.
Focus the composer when switching multiview panes (#1714)
Joshua France8472a8209185
diff --git a/plugins/web-ui/src/pane-focus.ts b/plugins/web-ui/src/pane-focus.tsindex 0423512a1..06245795c 100644--- a/plugins/web-ui/src/pane-focus.ts+++ b/plugins/web-ui/src/pane-focus.ts@@ -75,3 +75,18 @@ export function focusComposerOnPaneClick(pane: HTMLElement, isActive: () => boolpane.querySelector<HTMLTextAreaElement>(".composer-input:not(:disabled)")?.focus({ preventScroll: true });});}++export function focusPaneComposer(pane: HTMLElement | undefined): void {+ if (!pane) return;+ const doc = pane.ownerDocument;+ const inside = (): boolean => {+ const now = doc.activeElement;+ return Boolean(now && now !== pane && pane.contains(now));+ };+ if (inside() || (doc.activeElement as HTMLElement | null)?.closest?.("dialog, [role='dialog'], [role='menu']"))+ return;+ setTimeout(() => {+ if (inside()) return;+ pane.querySelector<HTMLTextAreaElement>(".composer-input:not(:disabled)")?.focus({ preventScroll: true });+ }, 0);+}diff --git a/plugins/web-ui/src/split.ts b/plugins/web-ui/src/split.tsindex 7a5e09b81..6018d4602 100644--- a/plugins/web-ui/src/split.ts+++ b/plugins/web-ui/src/split.ts@@ -53,7 +53,7 @@ import {type SplitEdge,} from "./split-layout";import { paneKindByKey, paneKindEntry } from "./pane-kinds";-import { focusComposerOnPaneClick, preservingFocus } from "./pane-focus";+import { focusComposerOnPaneClick, focusPaneComposer, preservingFocus } from "./pane-focus";import { attachTooltip, tip } from "./tooltip";import { icon, workingWave } from "./ui";import { contextsState, scopeTitle } from "./contexts";@@ -251,6 +251,7 @@ function buildDock(): DockviewApi {api.onDidActivePanelChange((e) => {splitState.focusedId = e.panel?.id ?? null;syncDocumentTitle();+ if (e.panel) focusPaneComposer(paneContents.get(e.panel.id)?.element);});api.onDidMaximizedGroupChange(() => {for (const a of groupActions) a.draw();diff --git a/plugins/web-ui/test/pane-focus.test.ts b/plugins/web-ui/test/pane-focus.test.tsindex 1a8b4286a..566749006 100644--- a/plugins/web-ui/test/pane-focus.test.ts+++ b/plugins/web-ui/test/pane-focus.test.ts@@ -2,7 +2,12 @@ import { test } from "node:test";import assert from "node:assert/strict";import { JSDOM } from "jsdom";import { readFileSync } from "node:fs";-import { focusComposerOnPaneClick, preservingFocus, replaceChildrenPreservingFocus } from "../src/pane-focus.ts";+import {+ focusComposerOnPaneClick,+ focusPaneComposer,+ preservingFocus,+ replaceChildrenPreservingFocus,+} from "../src/pane-focus.ts";test("re-rendered pane inputs keep focus and caret across multi-character typing", () => {const dom = new JSDOM('<main><div><input data-focus-key="search" value="a"></div></main>');@@ -159,3 +164,30 @@ test("keyboard-generated clicks do not reuse the last pointer activation", () =>second.dispatchEvent(new dom.window.MouseEvent("click", { bubbles: true }));assert.equal(doc.activeElement, first.querySelector("textarea"));});++test("switching the focused pane moves the caret into that pane's composer", async () => {+ const dom = new JSDOM(+ '<div class="a"><textarea class="composer-input"></textarea></div><div class="b"><textarea class="composer-input"></textarea></div>',+ { pretendToBeVisual: true },+ );+ const doc = dom.window.document;+ const a = doc.querySelector(".a") as HTMLElement;+ const b = doc.querySelector(".b") as HTMLElement;+ a.querySelector("textarea")!.focus();+ focusPaneComposer(b);+ await new Promise((r) => setTimeout(r, 0));+ assert.equal(doc.activeElement, b.querySelector("textarea"));+});++test("pane switch leaves focus alone when it already landed inside the pane", async () => {+ const dom = new JSDOM('<div class="b"><input class="search"><textarea class="composer-input"></textarea></div>', {+ pretendToBeVisual: true,+ });+ const doc = dom.window.document;+ const b = doc.querySelector(".b") as HTMLElement;+ const search = doc.querySelector(".search") as HTMLInputElement;+ search.focus();+ focusPaneComposer(b);+ await new Promise((r) => setTimeout(r, 0));+ assert.equal(doc.activeElement, search);+});