Skip to content

Record your screen, ship a demo. Free and open-source, GPU-accelerated, no watermarks, no subscriptions. Windows, macOS, Linux. Actively maintained.

fix: close menus on Escape and hand focus back to their trigger

EtienneLescot01978b8b290b
diff --git a/src/components/ai-edition/ColorField.test.tsx b/src/components/ai-edition/ColorField.test.tsx
index 636167367..230852f24 100644
--- a/src/components/ai-edition/ColorField.test.tsx
+++ b/src/components/ai-edition/ColorField.test.tsx
@@ -1,6 +1,6 @@
// @vitest-environment jsdom
import "@testing-library/jest-dom";
-import { fireEvent, render, screen } from "@testing-library/react";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
import { beforeAll, describe, expect, it, vi } from "vitest";
// Le traducteur renvoie la clé : une assertion lit mieux contre une clé que contre une phrase qui
@@ -99,4 +99,15 @@ describe("ColorField", () => {
fireEvent.keyDown(document.body, { key: "Escape" });
expect(onCommit).toHaveBeenCalledTimes(1);
});
+
+ it("closes on Escape and hands focus back to the swatch (#1015)", async () => {
+ const { trigger } = renderField();
+ fireEvent.click(trigger);
+ // Radix moves focus into the picker as it opens; the key is pressed from there.
+ const inside = document.activeElement as HTMLElement;
+ expect(screen.getByLabelText("annotation.colorPalette").parentElement).toContainElement(inside);
+ fireEvent.keyDown(inside, { key: "Escape" });
+ expect(screen.queryByLabelText("annotation.colorPalette")).not.toBeInTheDocument();
+ await waitFor(() => expect(trigger).toHaveFocus());
+ });
});
diff --git a/src/components/ai-edition/v4/EditorTopBar.test.tsx b/src/components/ai-edition/v4/EditorTopBar.test.tsx
index f8a5a2e9c..afcb7d719 100644
--- a/src/components/ai-edition/v4/EditorTopBar.test.tsx
+++ b/src/components/ai-edition/v4/EditorTopBar.test.tsx
@@ -302,11 +302,40 @@ describe("AppMenu", () => {
);
});
- it("closes on Escape", () => {
+ it("closes on Escape and hands focus back to the trigger", () => {
renderTopBar("Demo Project");
- fireEvent.click(screen.getByRole("button", { name: /OpenScreen/ }));
- fireEvent.keyDown(screen.getByRole("menu"), { key: "Escape" });
+ const trigger = screen.getByRole("button", { name: /OpenScreen/ });
+ fireEvent.click(trigger);
+ // Pressed on the first row, where the menu put focus.
+ expect(document.activeElement).toHaveAttribute("role", "menuitem");
+ fireEvent.keyDown(document.activeElement as HTMLElement, { key: "Escape" });
+ expect(screen.queryByRole("menu")).not.toBeInTheDocument();
+ expect(trigger).toHaveFocus();
+ });
+
+ // A press on the menu's padding or a separator drops focus to <body>, outside the menu, where
+ // a listener on the menu itself never heard the key (#1015).
+ it("closes on Escape when focus is no longer in the menu", () => {
+ renderTopBar("Demo Project");
+ const trigger = screen.getByRole("button", { name: /OpenScreen/ });
+ fireEvent.click(trigger);
+ act(() => (document.activeElement as HTMLElement).blur());
+ fireEvent.keyDown(document.body, { key: "Escape" });
expect(screen.queryByRole("menu")).not.toBeInTheDocument();
+ expect(trigger).toHaveFocus();
+ });
+
+ it("keeps the Escape that closed it from the window's shortcut handlers", () => {
+ const onWindowKeyDown = vi.fn();
+ window.addEventListener("keydown", onWindowKeyDown);
+ try {
+ renderTopBar("Demo Project");
+ fireEvent.click(screen.getByRole("button", { name: /OpenScreen/ }));
+ fireEvent.keyDown(document.activeElement as HTMLElement, { key: "Escape" });
+ expect(onWindowKeyDown).not.toHaveBeenCalled();
+ } finally {
+ window.removeEventListener("keydown", onWindowKeyDown);
+ }
});
it("hides Check for Updates when the install channel owns updates", async () => {
diff --git a/src/components/ai-edition/v4/EditorTopBar.tsx b/src/components/ai-edition/v4/EditorTopBar.tsx
index 5ee571417..ed391cb55 100644
--- a/src/components/ai-edition/v4/EditorTopBar.tsx
+++ b/src/components/ai-edition/v4/EditorTopBar.tsx
@@ -335,8 +335,23 @@ function AppMenu({ actions }: { actions: TopBarActions }) {
const onDocMouseDown = (e: MouseEvent) => {
if (ref.current && !ref.current.contains(e.target as Node)) setOpen(false);
};
+ // On the document, as the dialogs do (Modals.tsx), not on the menu: a press on the menu's
+ // padding or a separator drops focus to <body>, where a listener on the menu never hears
+ // the key (#1015). Escape hands focus back to the trigger, and goes no further, so nothing
+ // else bound to it acts on the same press.
+ const onDocKeyDown = (e: KeyboardEvent) => {
+ if (e.key !== "Escape") return;
+ e.preventDefault();
+ e.stopPropagation();
+ setOpen(false);
+ triggerRef.current?.focus();
+ };
document.addEventListener("mousedown", onDocMouseDown);
- return () => document.removeEventListener("mousedown", onDocMouseDown);
+ document.addEventListener("keydown", onDocKeyDown);
+ return () => {
+ document.removeEventListener("mousedown", onDocMouseDown);
+ document.removeEventListener("keydown", onDocKeyDown);
+ };
}, [open]);
// Focus the first item as the menu appears, so it is operable from the keyboard without a
@@ -346,20 +361,7 @@ function AppMenu({ actions }: { actions: TopBarActions }) {
menuRef.current?.querySelector<HTMLButtonElement>('[role="menuitem"]')?.focus();
}, [open]);
- const close = (restoreFocus: boolean) => {
- setOpen(false);
- // Escape and Tab-out hand focus back to the trigger; a click does not, because the
- // pointer user did not come from there and a focus ring appearing under the cursor
- // reads as a bug.
- if (restoreFocus) triggerRef.current?.focus();
- };
-
const onMenuKeyDown = (e: ReactKeyboardEvent<HTMLDivElement>) => {
- if (e.key === "Escape") {
- e.preventDefault();
- close(true);
- return;
- }
if (e.key !== "ArrowDown" && e.key !== "ArrowUp") return;
e.preventDefault();
const items = Array.from(
@@ -375,7 +377,9 @@ function AppMenu({ actions }: { actions: TopBarActions }) {
};
const run = (action: () => void) => () => {
- close(false);
+ // Unlike Escape, a click does not hand focus back to the trigger: the pointer user did not
+ // come from there, and a focus ring appearing under the cursor reads as a bug.
+ setOpen(false);
action();
};
diff --git a/src/components/launch/LaunchWindow.test.tsx b/src/components/launch/LaunchWindow.test.tsx
index ee37e40f7..eea0580eb 100644
--- a/src/components/launch/LaunchWindow.test.tsx
+++ b/src/components/launch/LaunchWindow.test.tsx
@@ -1510,6 +1510,22 @@ describe("LaunchWindow popover dismissal", () => {
expect(i18nState.value.setLocale).not.toHaveBeenCalled();
});
+ it("hands focus back to the language button when Escape closes its menu", async () => {
+ renderLaunchWindow();
+ const menu = await openLanguageMenu();
+ // Tabbed into the list: unmounting it must not leave focus on <body>.
+ const item = within(menu).getAllByRole("menuitemradio")[0];
+ act(() => item.focus());
+
+ fireEvent.keyDown(item, { key: "Escape" });
+
+ await waitFor(() => {
+ expect(screen.queryByTestId("hud-language-menu")).not.toBeInTheDocument();
+ });
+ expect(screen.getByRole("button", { name: "Language: English" })).toHaveFocus();
+ expect(i18nState.value.setLocale).not.toHaveBeenCalled();
+ });
+
it("closes the device-settings panel on Escape", async () => {
renderLaunchWindow();
await openDeviceSettings();
@@ -1521,6 +1537,20 @@ describe("LaunchWindow popover dismissal", () => {
});
});
+ it("hands focus back to the gear when Escape closes the device-settings panel", async () => {
+ renderLaunchWindow();
+ const panel = await openDeviceSettings();
+ const close = within(panel).getByRole("button", { name: "Close" });
+ act(() => close.focus());
+
+ fireEvent.keyDown(close, { key: "Escape" });
+
+ await waitFor(() => {
+ expect(screen.queryByTestId("hud-device-settings")).not.toBeInTheDocument();
+ });
+ expect(screen.getByTestId("launch-device-settings-button")).toHaveFocus();
+ });
+
it("closes the device-settings panel on a pointerdown outside the trigger and the panel", async () => {
renderLaunchWindow();
await openDeviceSettings();
diff --git a/src/components/launch/LaunchWindow.tsx b/src/components/launch/LaunchWindow.tsx
index ca9dd076a..715a941b1 100644
--- a/src/components/launch/LaunchWindow.tsx
+++ b/src/components/launch/LaunchWindow.tsx
@@ -331,6 +331,9 @@ export function LaunchWindow() {
const handleEscape = (event: KeyboardEvent) => {
if (event.key === "Escape") {
+ // Back to the control that opened it, as the editor's menus do: with focus inside
+ // the popover, unmounting it would drop focus to <body>.
+ (isLanguageMenuOpen ? languageTriggerRef : settingsTriggerRef).current?.focus();
closePopovers();
}
};
@@ -353,7 +356,7 @@ export function LaunchWindow() {
window.removeEventListener("keydown", handleEscape);
window.removeEventListener("blur", closePopovers);
};
- }, [closePopovers, isPopoverOpen]);
+ }, [closePopovers, isPopoverOpen, isLanguageMenuOpen]);
// ---------------------------------------------------------------------------
// Overlay window sizing