Skip to content

Commit e0d91a5

Browse files
fix(web): picking a surface from the + menu always moves focus into the panel
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent c6a3dc0 commit e0d91a5

2 files changed

Lines changed: 33 additions & 24 deletions

File tree

‎apps/web/src/components/RightPanelTabs.browser.test.tsx‎

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { page, userEvent } from "vite-plus/test/browser";
66

77
import type { RightPanelSurface } from "~/rightPanelStore";
88
import { render, stubGlobal } from "../../test/render";
9-
import { createWorkspaceFocusController } from "~/lib/workspaceFocus";
9+
import { startWorkspaceFocus, workspaceAreaProps } from "~/lib/workspaceFocus";
1010
import { HistorySwipeNavigation } from "./HistorySwipeNavigation";
1111
import { RightPanelTabs } from "./RightPanelTabs";
1212

@@ -143,37 +143,44 @@ describe("RightPanelTabs", () => {
143143

144144
expect(navigateHistory).toHaveBeenCalledExactlyOnceWith("back");
145145
});
146-
it("a surface picked from the add menu keeps the focus it takes; dismissing the menu returns to +", async () => {
147-
const focus = createWorkspaceFocusController(document);
148-
using _focus = { [Symbol.dispose]: focus.dispose };
146+
it("a surface picked from the add menu takes focus, even when already open; dismissing the menu returns to +", async () => {
147+
using _focus = {
148+
[Symbol.dispose]: startWorkspaceFocus({ subscribe: () => () => {} } as never),
149+
};
149150
function Panel() {
150151
const [activeSurfaceId, setActiveSurfaceId] = useState("terminal:0");
151152
return (
152-
<Tabs
153-
activeSurfaceId={activeSurfaceId}
154-
filesAvailable
155-
onAddFiles={() => {
156-
setActiveSurfaceId("terminal:1");
157-
focus.request({ area: "panel" });
158-
}}
159-
>
160-
<input
161-
key={activeSurfaceId}
162-
aria-label={`Content of ${activeSurfaceId}`}
163-
data-workspace-focus-default
164-
/>
165-
</Tabs>
153+
<>
154+
<div {...workspaceAreaProps("composer", 2, "Composer")}>
155+
<textarea aria-label="Message" />
156+
</div>
157+
<Tabs
158+
activeSurfaceId={activeSurfaceId}
159+
filesAvailable
160+
onAddFiles={() => setActiveSurfaceId("terminal:1")}
161+
>
162+
<input
163+
key={activeSurfaceId}
164+
aria-label={`Content of ${activeSurfaceId}`}
165+
data-workspace-focus-default
166+
/>
167+
</Tabs>
168+
</>
166169
);
167170
}
168171
await using _screen = await render(<Panel />);
169172
const add = page.getByRole("button", { name: "Add panel surface" });
173+
const content = page.getByRole("textbox", { name: "Content of terminal:1" });
170174

171-
await userEvent.click(add);
172-
await userEvent.keyboard("f");
173-
await expect.element(page.getByRole("menu")).not.toBeInTheDocument();
174-
await expect
175-
.element(page.getByRole("textbox", { name: "Content of terminal:1" }))
176-
.toHaveFocus();
175+
for (let pick = 0; pick < 2; pick++) {
176+
await userEvent.click(add);
177+
await vi.waitFor(() =>
178+
expect(document.activeElement?.closest('[role="menu"]')).not.toBeNull(),
179+
);
180+
await userEvent.keyboard("f");
181+
await expect.element(page.getByRole("menu")).not.toBeInTheDocument();
182+
await expect.element(content).toHaveFocus();
183+
}
177184

178185
await userEvent.click(add);
179186
await userEvent.keyboard("{Escape}");

‎apps/web/src/components/RightPanelTabs.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ import { resolvePullRequestState } from "./pullRequest/pullRequestPresentation";
104104
import { PullRequestGlyph } from "~/components/pullRequest/pullRequestIcons";
105105
import { observeResize } from "~/lib/observeResize";
106106
import { surfaceShortcutKey } from "~/lib/surfaceShortcutKey";
107+
import { requestWorkspaceFocus } from "~/lib/workspaceFocus";
107108

108109
export interface RightPanelTabsProps {
109110
mode: PreviewPanelMode;
@@ -1043,6 +1044,7 @@ export function RightPanelTabs(props: RightPanelTabsProps) {
10431044
const pickSurface = (open: () => void) => () => {
10441045
setSurfacePicked(true);
10451046
open();
1047+
requestWorkspaceFocus({ area: "panel" });
10461048
};
10471049
const [tabScrollState, setTabScrollState] = useState({
10481050
hasOverflow: false,

0 commit comments

Comments
 (0)