Skip to content

Preserve focus=1 behavior on initial shell route loads#204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BigSimmo merged 10 commits into from
Jul 2, 2026
Merged

Preserve focus=1 behavior on initial shell route loads #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8ff4cb5
Initial plan
Copilot Jul 2, 2026
bfeacdd
Preserve focus=1 on initial shell route loads
Copilot Jul 2, 2026
e51df1e
Merge branch 'main' into copilot/preserve-focus-initial-shell-loads
BigSimmo Jul 2, 2026
f5185d2
Stabilize focus reapply on deep-link shell loads
Copilot Jul 2, 2026
0cc1556
Document focus hydration retry delay constant
Copilot Jul 2, 2026
b0cd9e2
Merge origin/main and resolve shell focus conflict
Copilot Jul 2, 2026
78fb474
Fix ui-smoke focus restoration
Copilot Jul 2, 2026
9f67d92
Merge remote-tracking branch 'origin/copilot/preserve-focus-initial-s…
Copilot Jul 2, 2026
774bbd4
Remove unnecessary as const from focus test array
Copilot Jul 2, 2026
d3a54b6
Merge branch 'main' into copilot/preserve-focus-initial-shell-loads
BigSimmo Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/components/clinical-dashboard/global-mockup-search-shell.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,8 @@ const mockupQueryModeOptions: Array<{ value: ClinicalQueryMode; label: string }>
{ value: "required_documentation", label: "Documentation" },
{ value: "compare_guidance", label: "Compare" },
];
// Re-apply focus shortly after the first frame to survive initial hydration remounts.
const focusHydrationRetryDelayMs = 300;

type GlobalMockupSearchShellProps = {
children: ReactNode;
Expand DownExpand Up@@ -86,6 +88,7 @@ function GlobalMockupSearchShellClient({
const fallbackMode = visibleShellModes[0]?.id ?? initialMode;
const initialSearchMode =
availableModeIds?.length && !availableModeIds.includes(initialMode) ? fallbackMode : initialMode;
const requestedFocus = searchParams.get("focus") === "1";
const requestedRun = searchParams.get("run") === "1";
const currentUrlHasQuery = searchParams.has("q") || searchParams.has("query");
const requestedQuery = (searchParams.get("q") ?? searchParams.get("query") ?? "").trim();
Expand DownExpand Up@@ -137,12 +140,22 @@ function GlobalMockupSearchShellClient({
// because the state above is already seeded from the URL.
if (lastSyncedSearchParamsRef.current === searchParamString) return;
lastSyncedSearchParamsRef.current = searchParamString;

setSearchMode(resolvedSearchMode);
setQuery(currentUrlHasQuery ? requestedQuery : "");
}, [currentUrlHasQuery, requestedQuery, resolvedSearchMode, searchParamString]);

if (searchParams.get("focus") === "1") inputRef.current?.focus({ preventScroll: true });
}, [currentUrlHasQuery, requestedQuery, resolvedSearchMode, searchParamString, searchParams]);
useEffect(() => {
if (!requestedFocus) return undefined;
const focusInput = () => {
inputRef.current?.focus({ preventScroll: true });
};
const frame = window.requestAnimationFrame(focusInput);
const timeout = window.setTimeout(focusInput, focusHydrationRetryDelayMs);
return () => {
window.cancelAnimationFrame(frame);
window.clearTimeout(timeout);
};
}, [pathname, requestedFocus, searchParamString]);

useEffect(() => {
let cancelled = false;
Expand Down
11 changes: 11 additions & 0 deletions tests/ui-tools.spec.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,6 +221,17 @@ test.describe("Clinical KB applications launcher", () => {
}
});

test("mode home deep links preserve focus=1 on initial load", async ({ page }) => {
await page.setViewportSize({ width: 1280, height: 900 });

for (const path of ["/services?focus=1", "/forms?focus=1"]) {
await gotoLauncher(page, path);
const sharedSearch = page.getByTestId("global-search-input");
await expect(sharedSearch).toBeVisible();
await expect(sharedSearch).toBeFocused();
}
});

test("services mode shows source-backed records in search results", async ({ page }) => {
await page.setViewportSize({ width: 1280, height: 900 });
await gotoLauncher(page, "/services?q=13YARN&focus=1&run=1");
Expand Down
Loading