Skip to content

Commit 7f81d93

Browse files
wesbillmanPinky
andauthored
fix(desktop): prevent menu-to-dialog UI lockups (#1839)
Signed-off-by: Wes <[email protected]> Co-authored-by: Pinky <44b8e82baa6e0e254e0208d68f335c283c94e7b78dd1fa10d5a49d3f13dd0435@sprout-oss.stage.blox.sqprod.co>
1 parent 2b15a72 commit 7f81d93

7 files changed

Lines changed: 42 additions & 6 deletions

File tree

‎desktop/src/features/forum/ui/DeleteActionMenu.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function DeleteActionMenu({ label, onConfirm }: DeleteActionMenuProps) {
2222

2323
return (
2424
<div className="ml-auto opacity-0 transition-opacity group-hover:opacity-100">
25-
<DropdownMenu>
25+
<DropdownMenu modal={false}>
2626
<DropdownMenuTrigger asChild>
2727
<button
2828
className="rounded-md p-1 text-muted-foreground hover:bg-accent hover:text-foreground"

‎desktop/src/features/messages/ui/MessageActionBar.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ function MoreActionsMenu({
116116

117117
return (
118118
<>
119-
<DropdownMenu open={open} onOpenChange={onOpenChange}>
119+
<DropdownMenu modal={false} open={open} onOpenChange={onOpenChange}>
120120
<Tooltip>
121121
<TooltipTrigger asChild>
122122
<DropdownMenuTrigger asChild>

‎desktop/src/features/relay-members/ui/RelayMembersCard.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ function MemberRow({
116116
</div>
117117

118118
{showActions ? (
119-
<DropdownMenu>
119+
<DropdownMenu modal={false}>
120120
<DropdownMenuTrigger asChild>
121121
<Button
122122
data-testid={`relay-member-actions-${member.pubkey}`}

‎desktop/src/features/settings/ui/ChannelTemplatesSettingsCard.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ function TemplateRow({
234234
</div>
235235
</div>
236236

237-
<DropdownMenu>
237+
<DropdownMenu modal={false}>
238238
<DropdownMenuTrigger asChild>
239239
<Button
240240
className="h-7 w-7 shrink-0 opacity-0 group-hover:opacity-100"

‎desktop/src/features/sidebar/ui/WorkspaceRail.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ function WorkspaceButton({
9999
: workspace.name;
100100

101101
return (
102-
<ContextMenu>
102+
<ContextMenu modal={false}>
103103
<Tooltip>
104104
<TooltipTrigger asChild>
105105
<ContextMenuTrigger asChild>

‎desktop/src/features/workspaces/ui/WorkspaceSwitcher.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,11 @@ export function WorkspaceSwitcher({
281281
) : null;
282282

283283
const switcherDropdown = (
284-
<DropdownMenu open={dropdownOpen} onOpenChange={setDropdownOpen}>
284+
<DropdownMenu
285+
modal={false}
286+
open={dropdownOpen}
287+
onOpenChange={setDropdownOpen}
288+
>
285289
<DropdownMenuTrigger asChild>
286290
{variant === "profile" ? (
287291
<button

‎desktop/tests/e2e/workspace-rail.spec.ts‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,38 @@ test.describe("workspace rail", () => {
5555
await expect(page.getByTestId("workspace-rail-add")).toBeVisible();
5656
});
5757

58+
test("restores pointer events after dismissing workspace settings", async ({
59+
page,
60+
}) => {
61+
await installMockBridge(page, undefined, { skipWorkspaceSeed: true });
62+
await seedWorkspaces(page, [WORKSPACE_A, WORKSPACE_B], WORKSPACE_A.id);
63+
await page.goto("/");
64+
65+
const workspaceButton = page.getByTestId(
66+
`workspace-rail-button-${WORKSPACE_A.id}`,
67+
);
68+
await workspaceButton.click({ button: "right" });
69+
await page.getByRole("menuitem", { name: "Workspace settings" }).click();
70+
71+
await expect(
72+
page.getByRole("dialog", { name: "Edit Workspace" }),
73+
).toBeVisible();
74+
await page.mouse.click(0, 0);
75+
76+
await expect(
77+
page.getByRole("dialog", { name: "Edit Workspace" }),
78+
).toHaveCount(0);
79+
await expect(page.locator("body")).not.toHaveCSS("pointer-events", "none");
80+
await page.getByTestId(`workspace-rail-button-${WORKSPACE_B.id}`).click();
81+
await expect
82+
.poll(() =>
83+
page.evaluate(() =>
84+
window.localStorage.getItem("buzz-active-workspace-id"),
85+
),
86+
)
87+
.toBe(WORKSPACE_B.id);
88+
});
89+
5890
test("switches the active workspace on click", async ({ page }) => {
5991
await installMockBridge(page, undefined, { skipWorkspaceSeed: true });
6092
await seedWorkspaces(page, [WORKSPACE_A, WORKSPACE_B], WORKSPACE_A.id);

0 commit comments

Comments
 (0)