(browser autoFocus) then remount into Sheet.
+ const [usesSheet, setUsesSheet] = useState(sheetBreakpoint === "all");
const mobileTriggerRef = useRef(null);
const open = controlledOpen ?? uncontrolledOpen;
const sheetTriggerClassName =
diff --git a/src/components/ui/sheet.tsx b/src/components/ui/sheet.tsx
index 0f3413513..33324b3ed 100644
--- a/src/components/ui/sheet.tsx
+++ b/src/components/ui/sheet.tsx
@@ -120,9 +120,14 @@ export function Sheet({
// Pending focus-restore timers from the previous close. Cleared on the next
// open and on unmount so a torn-down jsdom environment cannot throw from a
// stale 50ms retry under Vitest coverage workers.
- const restoreTimersRef = useRef<{ frame: number | null; timeout: number | null }>({
+ const restoreTimersRef = useRef<{
+ frame: number | null;
+ timeout: number | null;
+ openFocusRetry: number | null;
+ }>({
frame: null,
timeout: null,
+ openFocusRetry: null,
});
const unmountingRef = useRef(false);
const titleId = useId();
@@ -146,6 +151,10 @@ export function Sheet({
window.clearTimeout(restoreTimers.timeout);
restoreTimers.timeout = null;
}
+ if (restoreTimers.openFocusRetry != null) {
+ window.clearInterval(restoreTimers.openFocusRetry);
+ restoreTimers.openFocusRetry = null;
+ }
};
}, []);
@@ -188,21 +197,48 @@ export function Sheet({
const explicitReturnElement = returnFocusRef?.current ?? null;
const previousActiveElement = document.activeElement instanceof HTMLElement ? document.activeElement : null;
+ const restoreTimers = restoreTimersRef.current;
+ if (restoreTimers.openFocusRetry != null) {
+ window.clearInterval(restoreTimers.openFocusRetry);
+ restoreTimers.openFocusRetry = null;
+ }
pushSheet(sheetId);
const focusFrame = window.requestAnimationFrame(() => {
- const focusTarget =
+ const resolveFocusTarget = () =>
initialFocusRef?.current ??
panelRef.current?.querySelector('[data-sheet-autofocus="true"]') ??
closeRef.current;
- focusTarget?.focus({ preventScroll: true });
- // One retry if open-time focus lost the race to a closing sibling sheet
- // (phone Guide menu → Guide dialog, or Sources opener teardown).
- window.setTimeout(() => {
- if (!focusTarget?.isConnected || document.activeElement === focusTarget) return;
- if (panelRef.current && !panelRef.current.contains(document.activeElement)) {
+ const focusIfNeeded = () => {
+ const focusTarget = resolveFocusTarget();
+ if (!focusTarget?.isConnected) return null;
+ if (document.activeElement === focusTarget) return focusTarget;
+ // Reclaim when focus is outside the panel (or still on body after a
+ // remount). Do not steal from another in-panel control the user tabbed to.
+ const active = document.activeElement;
+ if (
+ active == null ||
+ active === document.body ||
+ (panelRef.current != null && !panelRef.current.contains(active))
+ ) {
focusTarget.focus({ preventScroll: true });
}
+ return focusTarget;
+ };
+ focusIfNeeded();
+ // Retries cover sibling-sheet teardown and late-mounted autofocus inputs
+ // (UtilityDrawer media sync / deferred drawer children).
+ let attempts = 0;
+ const retryTimer = window.setInterval(() => {
+ attempts += 1;
+ const focusTarget = focusIfNeeded();
+ if (attempts >= 8 || (focusTarget != null && document.activeElement === focusTarget)) {
+ window.clearInterval(retryTimer);
+ if (restoreTimers.openFocusRetry === retryTimer) {
+ restoreTimers.openFocusRetry = null;
+ }
+ }
}, 50);
+ restoreTimers.openFocusRetry = retryTimer;
});
function onKeyDown(event: KeyboardEvent) {
@@ -243,7 +279,6 @@ export function Sheet({
}
window.addEventListener("keydown", onKeyDown);
- const restoreTimers = restoreTimersRef.current;
return () => {
window.cancelAnimationFrame(focusFrame);
window.removeEventListener("keydown", onKeyDown);
@@ -255,6 +290,10 @@ export function Sheet({
if (restoreTimers.timeout != null) {
window.clearTimeout(restoreTimers.timeout);
}
+ if (restoreTimers.openFocusRetry != null) {
+ window.clearInterval(restoreTimers.openFocusRetry);
+ restoreTimers.openFocusRetry = null;
+ }
if (unmountingRef.current) return;
// Focus restore is best-effort. Under Vitest coverage workers the jsdom
// `document` can be torn down before this rAF/setTimeout pair fires; bare
From 05373f1dccd4e4a31341ffea64bc4a80c1663605 Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Sat, 25 Jul 2026 13:59:55 +0800
Subject: [PATCH 16/17] ci: retrigger PR policy check on tip
From 82efa0d4e5c20617b497da9957a903e56ac778d4 Mon Sep 17 00:00:00 2001
From: BigSimmo <87357024+BigSimmo@users.noreply.github.com>
Date: Sat, 25 Jul 2026 14:44:14 +0800
Subject: [PATCH 17/17] fix(ui): stop stacked Sheet focus steal; assert Escape
restore honestly
Gate Sheet autofocus retries on isTopmostSheet, and remove test-side focus repair so production restore failures stay visible.
---
src/components/ui/sheet.tsx | 8 +++++++-
tests/ui-smoke.spec.ts | 13 +++----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/components/ui/sheet.tsx b/src/components/ui/sheet.tsx
index 33324b3ed..c4a0ea333 100644
--- a/src/components/ui/sheet.tsx
+++ b/src/components/ui/sheet.tsx
@@ -209,6 +209,8 @@ export function Sheet({
panelRef.current?.querySelector('[data-sheet-autofocus="true"]') ??
closeRef.current;
const focusIfNeeded = () => {
+ // Never reclaim focus once a newer Sheet is stacked above this one.
+ if (!isTopmostSheet(sheetId)) return null;
const focusTarget = resolveFocusTarget();
if (!focusTarget?.isConnected) return null;
if (document.activeElement === focusTarget) return focusTarget;
@@ -231,7 +233,11 @@ export function Sheet({
const retryTimer = window.setInterval(() => {
attempts += 1;
const focusTarget = focusIfNeeded();
- if (attempts >= 8 || (focusTarget != null && document.activeElement === focusTarget)) {
+ if (
+ attempts >= 8 ||
+ !isTopmostSheet(sheetId) ||
+ (focusTarget != null && document.activeElement === focusTarget)
+ ) {
window.clearInterval(retryTimer);
if (restoreTimers.openFocusRetry === retryTimer) {
restoreTimers.openFocusRetry = null;
diff --git a/tests/ui-smoke.spec.ts b/tests/ui-smoke.spec.ts
index 113720dfb..f8962ecf8 100644
--- a/tests/ui-smoke.spec.ts
+++ b/tests/ui-smoke.spec.ts
@@ -3121,16 +3121,9 @@ test.describe("Clinical KB UI smoke coverage", () => {
await page.keyboard.press("Escape");
await expect(resultsLibraryDialog).toHaveCount(0);
await expect
- .poll(
- async () => {
- if (await openSourcesButton.evaluate((el) => el === document.activeElement)) return true;
- // If focus landed on body after sheet teardown, re-assert the opener is the
- // intended restore target and focus it once (mirrors production restore retry).
- await openSourcesButton.focus();
- return openSourcesButton.evaluate((el) => el === document.activeElement);
- },
- { timeout: 15_000 },
- )
+ .poll(async () => openSourcesButton.evaluate((el) => el === document.activeElement), {
+ timeout: 15_000,
+ })
.toBe(true);
await page.reload({ waitUntil: "domcontentloaded" });