Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion desktop/src/features/forum/ui/DeleteActionMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function DeleteActionMenu({ label, onConfirm }: DeleteActionMenuProps) {

return (
<div className="ml-auto opacity-0 transition-opacity group-hover:opacity-100">
<DropdownMenu>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<button
className="rounded-md p-1 text-muted-foreground hover:bg-accent hover:text-foreground"
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/features/messages/ui/MessageActionBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ function MoreActionsMenu({

return (
<>
<DropdownMenu open={open} onOpenChange={onOpenChange}>
<DropdownMenu modal={false} open={open} onOpenChange={onOpenChange}>
<Tooltip>
<TooltipTrigger asChild>
<DropdownMenuTrigger asChild>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ function MemberRow({
</div>

{showActions ? (
<DropdownMenu>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button
data-testid={`relay-member-actions-${member.pubkey}`}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ function TemplateRow({
</div>
</div>

<DropdownMenu>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button
className="h-7 w-7 shrink-0 opacity-0 group-hover:opacity-100"
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/features/sidebar/ui/WorkspaceRail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function WorkspaceButton({
: workspace.name;

return (
<ContextMenu>
<ContextMenu modal={false}>
<Tooltip>
<TooltipTrigger asChild>
<ContextMenuTrigger asChild>
Expand Down
6 changes: 5 additions & 1 deletion desktop/src/features/workspaces/ui/WorkspaceSwitcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,11 @@ export function WorkspaceSwitcher({
) : null;

const switcherDropdown = (
<DropdownMenu open={dropdownOpen} onOpenChange={setDropdownOpen}>
<DropdownMenu
modal={false}
open={dropdownOpen}
onOpenChange={setDropdownOpen}
>
<DropdownMenuTrigger asChild>
{variant === "profile" ? (
<button
Expand Down
32 changes: 32 additions & 0 deletions desktop/tests/e2e/workspace-rail.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,38 @@ test.describe("workspace rail", () => {
await expect(page.getByTestId("workspace-rail-add")).toBeVisible();
});

test("restores pointer events after dismissing workspace settings", async ({
page,
}) => {
await installMockBridge(page, undefined, { skipWorkspaceSeed: true });
await seedWorkspaces(page, [WORKSPACE_A, WORKSPACE_B], WORKSPACE_A.id);
await page.goto("/");

const workspaceButton = page.getByTestId(
`workspace-rail-button-${WORKSPACE_A.id}`,
);
await workspaceButton.click({ button: "right" });
await page.getByRole("menuitem", { name: "Workspace settings" }).click();

await expect(
page.getByRole("dialog", { name: "Edit Workspace" }),
).toBeVisible();
await page.mouse.click(0, 0);

await expect(
page.getByRole("dialog", { name: "Edit Workspace" }),
).toHaveCount(0);
await expect(page.locator("body")).not.toHaveCSS("pointer-events", "none");
await page.getByTestId(`workspace-rail-button-${WORKSPACE_B.id}`).click();
await expect
.poll(() =>
page.evaluate(() =>
window.localStorage.getItem("buzz-active-workspace-id"),
),
)
.toBe(WORKSPACE_B.id);
});

test("switches the active workspace on click", async ({ page }) => {
await installMockBridge(page, undefined, { skipWorkspaceSeed: true });
await seedWorkspaces(page, [WORKSPACE_A, WORKSPACE_B], WORKSPACE_A.id);
Expand Down
Loading