Skip to content

Commit d5fe9e0

Browse files
Ignore opening gesture in context menu fallback
- Prevent the initial pointer click from selecting a menu item - Add coverage for delayed pointer selection
1 parent f61fa94 commit d5fe9e0

2 files changed

Lines changed: 20 additions & 1 deletion

File tree

‎apps/web/src/contextMenuFallback.test.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,23 @@ describe("showContextMenuFallback", () => {
196196
await expect(selectionPromise).resolves.toBe("rename");
197197
});
198198

199+
it("ignores a click from the gesture that opened the menu", async () => {
200+
let enablePointerSelection: ((time: number) => void) | undefined;
201+
vi.stubGlobal("requestAnimationFrame", (callback: (time: number) => void) => {
202+
enablePointerSelection = callback;
203+
return 0;
204+
});
205+
206+
const selectionPromise = showContextMenuFallback([{ id: "rename", label: "Rename" }]);
207+
const renameButton = findButton("Rename");
208+
209+
renameButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
210+
enablePointerSelection?.(0);
211+
renameButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
212+
213+
await expect(selectionPromise).resolves.toBe("rename");
214+
});
215+
199216
it("opens nested submenus and resolves the clicked leaf id", async () => {
200217
const selectionPromise = showContextMenuFallback([
201218
{

‎apps/web/src/contextMenuFallback.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@ export function showContextMenuFallback<T extends string>(
272272
button.addEventListener("mouseenter", () => {
273273
closeMenusFromLevel(level + 1);
274274
});
275-
button.addEventListener("click", () => cleanup(item.id));
275+
button.addEventListener("click", () => {
276+
if (canDismissFromPointer) cleanup(item.id);
277+
});
276278
}
277279
}
278280

0 commit comments

Comments
 (0)