The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 23:30 UTC
fix(web): dismiss image path tooltips after preview and scroll (#30620)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Lakshmi Tanmay committed
Nov 11, 2026 at 12:51 UTC
75b22bf56ceee0d62a8e43c009d5a9ad3a9ab804
4 files changed
+94
-8
apps/web/src/components/chat/ExpandedImageDialog.browser.test.tsx
+40
-1
@@ -1,6 +1,7 @@
1
+import { useState } from "react";
2
import type { SnapShotSource } from "@t3tools/contracts";
3
import { describe, expect, it, vi } from "vite-plus/test";
3
-import { userEvent } from "vite-plus/test/browser";
4
+import { page, userEvent } from "vite-plus/test/browser";
5
6
import "~/index.css";
7
import { render } from "../../../test/render";
@@ -19,7 +20,45 @@ const snapShotSource: SnapShotSource = {
20
const D2_SVG =
21
'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1174 920"><rect width="1174" height="920"/></svg>';
22
23
+function ImagePreviewOpener() {
24
+ const [open, setOpen] = useState(false);
25
+ return (
26
+ <>
27
+ <button type="button" onClick={() => setOpen(true)}>
28
+ Open preview
29
+ </button>
30
+ {open && (
31
+ <ExpandedImageDialog
32
+ preview={{ images: [{ src: PIXEL, name: "shot.png", source: snapShotSource }], index: 0 }}
33
+ onClose={() => setOpen(false)}
34
+ />
35
+ )}
36
+ </>
37
+ );
38
+}
39
+
40
describe("ExpandedImageDialog", () => {
41
+ it.each([
42
+ { opener: "mouse", focusVisible: false },
43
+ { opener: "keyboard", focusVisible: true },
44
+ ])("returns $opener focus to the opener on close", async (c) => {
45
+ await using screen = await render(<ImagePreviewOpener />, {
46
+ // The opener renders no links and reads no route.
47
+ router: false,
48
+ });
49
+ const opener = screen.getByRole("button", { name: "Open preview" });
50
+ if (c.opener === "mouse") {
51
+ await userEvent.click(opener);
52
+ } else {
53
+ await userEvent.keyboard("{Tab}");
54
+ await userEvent.keyboard("{Enter}");
55
+ }
56
+ await expect.element(page.getByRole("button", { name: "Close image preview" })).toHaveFocus();
57
+ await userEvent.keyboard("{Escape}");
58
+ await expect.element(opener).toHaveFocus();
59
+ expect(opener.element().matches(":focus-visible")).toBe(c.focusVisible);
60
+ });
61
+
62
it.each(["/work/pipeline.svg", "/work/diagram#v2.svg", "/work/diagram?v2.svg"])(
63
"fits a markdown SVG without intrinsic size to the viewer: %s",
64
async (path) => {
apps/web/src/components/chat/ExpandedImageDialog.tsx
+8
-6
@@ -85,15 +85,17 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
85
const [failedImageSrc, setFailedImageSrc] = useState<string | null>(null);
86
const [accessibilityDetailsSrc, setAccessibilityDetailsSrc] = useState<string | null>(null);
87
const zoomableImageRef = useRef<ZoomableImageHandle>(null);
88
- const [returnFocusTarget] = useState(() =>
89
- document.activeElement instanceof HTMLElement ? document.activeElement : null,
90
- );
88
+ const [returnFocus] = useState(() => {
89
+ const target = document.activeElement instanceof HTMLElement ? document.activeElement : null;
90
+ return { target, focusVisible: target?.matches(":focus-visible") ?? false };
91
+ });
92
// The host unmounts the dialog outright, so Base UI never runs finalFocus. Without
93
// this, focus stays on the removed dialog, and the composer that owned the opener
93
- // reads that as a blur and rests.
94
+ // reads that as a blur and rests. Preserve mouse focus when Escape closes it.
95
const close = () => {
96
flushSync(onClose);
96
- if (returnFocusTarget?.isConnected) returnFocusTarget.focus({ preventScroll: true });
97
+ const { target, focusVisible } = returnFocus;
98
+ if (target?.isConnected) target.focus({ preventScroll: true, focusVisible });
99
};
100
const closeButtonRef = useRef<HTMLButtonElement>(null);
101
const imageCount = preview.images.length;
@@ -177,7 +179,7 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
179
className="row-start-1 h-full max-h-[92vh] w-[92vw] max-w-[92vw] items-center justify-center overflow-visible [--media-width:92vw] [--media-height:min(calc((100vh-var(--native-titlebar-height,0px))*0.86),calc(100vh-var(--native-titlebar-height,0px)-160px))] sm:[--media-width:calc(92vw-96px)]"
180
onKeyDown={onKeyDown}
181
initialFocus={closeButtonRef}
180
- finalFocus={() => returnFocusTarget}
182
+ finalFocus={() => returnFocus.target}
183
onClick={(event) => {
184
if (event.target === event.currentTarget) close();
185
}}
apps/web/src/components/ui/tooltip.browser.test.tsx
new
+43
@@ -0,0 +1,43 @@
1
+import { expect, it, vi } from "vite-plus/test";
2
+import { page, userEvent } from "vite-plus/test/browser";
3
+
4
+import "~/index.css";
5
+import { render } from "../../../test/render";
6
+import { Tooltip, TooltipPopup, TooltipScrollDismissArea, TooltipTrigger } from "./tooltip";
7
+
8
+it.each([
9
+ { focus: "mouse", keptOpen: false },
10
+ { focus: "keyboard", keptOpen: true },
11
+])("scrolling with a $focus-focused hovered trigger keeps it open: $keptOpen", async (c) => {
12
+ const onScroll = vi.fn();
13
+ await using screen = await render(
14
+ <TooltipScrollDismissArea
15
+ data-testid="timeline"
16
+ onScrollCapture={onScroll}
17
+ className="h-32 overflow-y-auto"
18
+ >
19
+ <Tooltip>
20
+ <TooltipTrigger>Timeline action</TooltipTrigger>
21
+ <TooltipPopup>Description</TooltipPopup>
22
+ </Tooltip>
23
+ <div className="h-96" />
24
+ </TooltipScrollDismissArea>,
25
+ );
26
+ const trigger = screen.getByRole("button", { name: "Timeline action" });
27
+ if (c.focus === "mouse") {
28
+ // A press closes the tooltip; hovering again reopens it with mouse focus kept.
29
+ await userEvent.click(trigger);
30
+ await userEvent.unhover(trigger);
31
+ } else {
32
+ await userEvent.keyboard("{Tab}");
33
+ }
34
+ await userEvent.hover(trigger);
35
+ await expect.element(trigger).toHaveFocus();
36
+ await expect.element(page.getByText("Description")).toBeVisible();
37
+
38
+ screen.getByTestId("timeline").element().scrollTop = 20;
39
+ await vi.waitFor(() => expect(onScroll).toHaveBeenCalledOnce());
40
+
41
+ if (c.keptOpen) await expect.element(page.getByText("Description")).toBeVisible();
42
+ else await expect.element(page.getByText("Description")).not.toBeInTheDocument();
43
+});
apps/web/src/components/ui/tooltip.tsx
+3
-1
@@ -31,7 +31,9 @@ function createTooltipHoverTracker() {
31
},
32
dismissUnfocused() {
33
const tooltip = hovered;
34
- if (!tooltip || tooltip.trigger.contains(tooltip.trigger.ownerDocument.activeElement)) {
34
+ if (!tooltip) return;
35
+ const focused = tooltip.trigger.ownerDocument.activeElement;
36
+ if (focused && tooltip.trigger.contains(focused) && focused.matches(":focus-visible")) {
37
return;
38
}
39
hovered = null;