Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

fix(frontend): keep a dialog opened from a dropdown menu open on phones (#15064)

Reinier van der Leerd2a51bfd2711
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatInput/components/AutopilotModeSelector/AutopilotModeSelector.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatInput/components/AutopilotModeSelector/AutopilotModeSelector.tsx
index 62550cd9a1..baa2c6d661 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatInput/components/AutopilotModeSelector/AutopilotModeSelector.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatInput/components/AutopilotModeSelector/AutopilotModeSelector.tsx
@@ -25,7 +25,6 @@ export function AutopilotModeSelector({ sessionId, persistedMode }: Props) {
mode,
isDefault,
selectMode,
- handleMenuClosed,
isConfirmOpen,
confirmUnsupervised,
cancelUnsupervised,
@@ -55,11 +54,7 @@ export function AutopilotModeSelector({ sessionId, persistedMode }: Props) {
{!isDefault && <span>{current.label}</span>}
</button>
</DropdownMenuTrigger>
- <DropdownMenuContent
- align="end"
- className="w-72"
- onCloseAutoFocus={handleMenuClosed}
- >
+ <DropdownMenuContent align="end" className="w-72">
<DropdownMenuLabel className="text-xs font-medium text-zinc-500">
Approvals in this chat
</DropdownMenuLabel>
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatInput/components/AutopilotModeSelector/useAutopilotModeSelector.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatInput/components/AutopilotModeSelector/useAutopilotModeSelector.ts
index 5cbe44014f..0724f7d1e7 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatInput/components/AutopilotModeSelector/useAutopilotModeSelector.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatInput/components/AutopilotModeSelector/useAutopilotModeSelector.ts
@@ -15,28 +15,18 @@ interface Args {
export function useAutopilotModeSelector({ sessionId, persistedMode }: Args) {
const choice = useAutopilotModeChoice(sessionId);
const choose = useAutopilotModeStore((state) => state.choose);
- const [isConfirmPending, setIsConfirmPending] = useState(false);
const [isConfirmOpen, setIsConfirmOpen] = useState(false);
const mode = choice ?? persistedMode ?? DEFAULT_AUTOPILOT_MODE;
function selectMode(value: string) {
if (!isAutopilotMode(value) || value === mode) return;
if (value === "unsupervised") {
- setIsConfirmPending(true);
+ setIsConfirmOpen(true);
return;
}
choose(sessionId, value);
}
- // Opened only once the menu has closed: on narrow screens the confirm is a
- // drawer, and the click that picked the item otherwise dismisses it.
- function handleMenuClosed(event: Event) {
- if (!isConfirmPending) return;
- event.preventDefault();
- setIsConfirmPending(false);
- setIsConfirmOpen(true);
- }
-
function confirmUnsupervised() {
choose(sessionId, "unsupervised");
setIsConfirmOpen(false);
@@ -50,7 +40,6 @@ export function useAutopilotModeSelector({ sessionId, persistedMode }: Args) {
mode,
isDefault: mode === DEFAULT_AUTOPILOT_MODE,
selectMode,
- handleMenuClosed,
isConfirmOpen,
confirmUnsupervised,
cancelUnsupervised,
diff --git a/autogpt_platform/frontend/src/components/molecules/Dialog/__tests__/Drawer.test.tsx b/autogpt_platform/frontend/src/components/molecules/Dialog/__tests__/Drawer.test.tsx
index f1b6591af6..229fd376c9 100644
--- a/autogpt_platform/frontend/src/components/molecules/Dialog/__tests__/Drawer.test.tsx
+++ b/autogpt_platform/frontend/src/components/molecules/Dialog/__tests__/Drawer.test.tsx
@@ -1,4 +1,4 @@
-import { fireEvent, render, screen } from "@testing-library/react";
+import { act, fireEvent, render, screen } from "@testing-library/react";
import { describe, expect, test, vi } from "vitest";
import { Dialog } from "../Dialog";
@@ -64,6 +64,29 @@ describe("Dialog rendered as a drawer", () => {
expect(set).toHaveBeenCalledWith(false);
});
+ // A DropdownMenu that opened this drawer hands focus back to its trigger as
+ // it closes; Radix vetoes that focus-outside, and the drawer must honour it.
+ test("stays open when focus moves to an element outside it", () => {
+ const set = vi.fn();
+ render(<button type="button">Menu trigger</button>);
+ renderDrawer({ set });
+
+ act(() => screen.getByText("Menu trigger").focus());
+
+ expect(set).not.toHaveBeenCalled();
+ });
+
+ test("closes on a pointer-down outside it", async () => {
+ const set = vi.fn();
+ renderDrawer({ set });
+ // Radix attaches its outside-pointer listener one tick after mount.
+ await act(() => new Promise((resolve) => setTimeout(resolve, 0)));
+
+ fireEvent.pointerDown(document.body);
+
+ expect(set).toHaveBeenCalledWith(false);
+ });
+
test("associates an sr-only Description with constant text Dialog", () => {
renderDrawer({ set: vi.fn() });
diff --git a/autogpt_platform/frontend/src/components/molecules/Dialog/components/DrawerWrap.tsx b/autogpt_platform/frontend/src/components/molecules/Dialog/components/DrawerWrap.tsx
index 5feb96b438..cdfcf4107d 100644
--- a/autogpt_platform/frontend/src/components/molecules/Dialog/components/DrawerWrap.tsx
+++ b/autogpt_platform/frontend/src/components/molecules/Dialog/components/DrawerWrap.tsx
@@ -58,7 +58,8 @@ export function DrawerWrap({
)}
data-testid={testId}
onEscapeKeyDown={handleEscapeKeyDown}
- onInteractOutside={handleClose}
+ // No onInteractOutside close: Radix dismisses outside taps itself and
+ // vetoes the focus a closing DropdownMenu hands back to its trigger.
>
<div
className={cn(