Skip to content

Native iCloud apps for Windows and Linux, built in Rust. Notes, Reminders, Calendar, Contacts, Drive and Photos, offline and in sync with your iPhone.

Menus: macOS menu aim, ⋯ closes its own menu, Escape from anywhere

Yashwanth Kamireddi20405bef557f
diff --git a/.uiverify/menus.mjs b/.uiverify/menus.mjs
index 520b6a9..54b2896 100644
--- a/.uiverify/menus.mjs
+++ b/.uiverify/menus.mjs
@@ -110,6 +110,48 @@ for (const size of [{ width: 1280, height: 800 }, { width: 760, height: 520 }])
await page.waitForTimeout(80);
ok((await page.locator(".cx-popover").count()) === 1 && (await picker.innerText()) !== was, `${label} a choice made with the mouse keeps the popover open`);
await page.keyboard.press("Escape");
+
+ // Menu aim: from "Add to List" to its submenu, diagonally across "Edit Contact". The
+ // submenu stays up the whole way — it used to close on the line crossed and open again.
+ await openScreen(page, "Contacts");
+ await page.waitForTimeout(300);
+ await page.locator(".contact-row").first().click({ button: "right" });
+ const parentLine = page.getByRole("menuitem", { name: "Add to List" });
+ await parentLine.hover();
+ await page.waitForTimeout(120);
+ const crossed = await page.getByRole("menuitem", { name: "Edit Contact" }).boundingBox();
+ const target = await page.locator(".row-menu").nth(1).getByRole("menuitem").last().boundingBox();
+ await page.evaluate(() => {
+ window.__subGone = false;
+ const tick = () => { if (document.querySelectorAll(".row-menu").length < 2) window.__subGone = true; if (!window.__stopAim) requestAnimationFrame(tick); };
+ window.__stopAim = false;
+ requestAnimationFrame(tick);
+ });
+ await page.mouse.move(crossed.x + crossed.width - 30, crossed.y + crossed.height / 2, { steps: 3 });
+ await page.mouse.move(target.x + 20, target.y + target.height / 2, { steps: 3 });
+ await page.waitForTimeout(400);
+ const gone = await page.evaluate(() => { window.__stopAim = true; return window.__subGone; });
+ ok(!gone && (await page.locator(".row-menu").count()) === 2, `${label} a submenu stays open while the pointer crosses a line on its way in`);
+ // Resting on another line does still switch to it, a moment later.
+ await page.getByRole("menuitem", { name: "Export vCard…" }).hover();
+ await page.waitForTimeout(450);
+ ok((await page.locator(".row-menu").count()) === 1, `${label} resting on another line closes the submenu`);
+ await page.keyboard.press("Escape");
+
+ // The ⋯ that opened a menu closes it again, in one press, and it does not blink back.
+ const listRow = page.locator(".contacts-lists .notes-folder-row").nth(1);
+ if (await listRow.isVisible()) {
+ await listRow.hover();
+ const dots = listRow.locator("button[aria-haspopup=menu]");
+ await dots.click();
+ await page.waitForTimeout(150);
+ const opened = await page.locator(".row-menu").count();
+ await watch(page);
+ await dots.click();
+ await page.waitForTimeout(250);
+ const reopened = await page.evaluate(() => window.__menus);
+ ok(opened === 1 && (await page.locator(".row-menu").count()) === 0 && reopened === 0, `${label} pressing ⋯ again closes its menu, without it opening again [${opened} open, ${reopened} redrawn]`);
+ }
await ctx.close();
}
await b.close();
diff --git a/src/components/RowMenu.tsx b/src/components/RowMenu.tsx
index aeda59c..53f80b0 100644
--- a/src/components/RowMenu.tsx
+++ b/src/components/RowMenu.tsx
@@ -22,13 +22,39 @@ export function RowMenu({ at, entries, onClose }: { at: Anchor; entries: MenuEnt
useEffect(() => {
// Any press outside every level of this menu dismisses it.
const down = (e: MouseEvent) => {
- if (!(e.target as HTMLElement | null)?.closest?.(".row-menu")) onClose();
+ const target = e.target as HTMLElement | null;
+ if (target?.closest?.(".row-menu")) return;
+ onClose();
+ // A press on a button that opens a menu — this one's ⋯, or another row's — only closes
+ // the open menu, as on the Mac, where the click that dismisses a menu is used up by it.
+ // Let through, it opened the menu again under the pointer: the menu blinked, and could
+ // not be closed from the button that opened it.
+ const opener = target?.closest?.('[aria-haspopup="menu"]');
+ if (!opener) return;
+ const swallow = (c: MouseEvent) => {
+ if (opener.contains(c.target as Node)) {
+ c.stopPropagation();
+ c.preventDefault();
+ }
+ };
+ document.addEventListener("click", swallow, { capture: true, once: true });
+ window.setTimeout(() => document.removeEventListener("click", swallow, true), 700);
};
const away = () => onClose();
+ // Escape closes the menu wherever the keys are: focus is not always in it — a submenu
+ // that closed under the pointer took the focus it held with it.
+ const key = (e: KeyboardEvent) => {
+ if (e.key !== "Escape" || (e.target as HTMLElement | null)?.closest?.(".row-menu")) return;
+ e.preventDefault();
+ e.stopPropagation();
+ onClose();
+ };
+ window.addEventListener("keydown", key, true);
document.addEventListener("mousedown", down);
window.addEventListener("blur", away);
window.addEventListener("resize", away);
return () => {
+ window.removeEventListener("keydown", key, true);
document.removeEventListener("mousedown", down);
window.removeEventListener("blur", away);
window.removeEventListener("resize", away);
@@ -52,6 +78,7 @@ function Panel({
onDone,
onBack,
focusFirst,
+ onArrive,
}: {
entries: MenuEntry[];
anchor: PanelAnchor;
@@ -61,6 +88,8 @@ function Panel({
onBack: () => void;
/** Opened by the keyboard: the first line is highlighted, as on the Mac. */
focusFirst: boolean;
+ /** The pointer came into this submenu. */
+ onArrive?: () => void;
}) {
const box = useRef<HTMLDivElement | null>(null);
const lines = useRef<(HTMLButtonElement | null)[]>([]);
@@ -69,6 +98,18 @@ function Panel({
// Nothing highlighted until the pointer or a key says so, as a Mac menu opens.
const [active, setActive] = useState(focusFirst ? 0 : -1);
const [sub, setSub] = useState<{ index: number; byKeyboard: boolean } | null>(null);
+ /**
+ * Menu aim, as macOS has it: with a submenu open, crossing another line on the way to it
+ * does not close it at once. The switch waits a moment, and is called off if the pointer
+ * arrives in the submenu — moving diagonally from "Add to List" to its lists used to pass
+ * over "Edit Contact", close the submenu, and open it again: the flicker.
+ */
+ const aim = useRef<number | null>(null);
+ const stopAim = () => {
+ if (aim.current !== null) window.clearTimeout(aim.current);
+ aim.current = null;
+ };
+ useEffect(() => stopAim, []);
useLayoutEffect(() => {
const el = box.current;
@@ -121,6 +162,7 @@ function Panel({
role="menu"
tabIndex={-1}
style={pos ? { left: pos.left, top: pos.top } : { left: 0, top: 0, visibility: "hidden" }}
+ onMouseEnter={onArrive}
onKeyDown={(e) => {
// Keys belong to the deepest open level.
if (sub) return;
@@ -157,9 +199,17 @@ function Panel({
aria-expanded={entry.submenu ? sub?.index === index : undefined}
className={`row-menu-item${entry.danger ? " is-danger" : ""}${index === active ? " is-active" : ""}${entry.submenu ? " has-submenu" : ""}`}
onMouseEnter={() => {
- setActive(index);
- // Hovering a line with a submenu opens it; any other line closes one.
- setSub(entry.submenu ? { index, byKeyboard: false } : null);
+ const go = () => {
+ aim.current = null;
+ // The submenu going takes its focus with it: the keys come back here.
+ if (sub && !entry.submenu) box.current?.focus({ preventScroll: true });
+ setActive(index);
+ // Hovering a line with a submenu opens it; any other line closes one.
+ setSub(entry.submenu ? { index, byKeyboard: false } : null);
+ };
+ stopAim();
+ if (sub && sub.index !== index) aim.current = window.setTimeout(go, 280);
+ else go();
}}
onClick={() => choose(index, false)}
>
@@ -179,6 +229,11 @@ function Panel({
setSub(null);
box.current?.focus({ preventScroll: true });
}}
+ onArrive={() => {
+ // The pointer made it: the line that opened this stays the highlighted one.
+ stopAim();
+ setActive(sub.index);
+ }}
focusFirst={sub.byKeyboard}
/>
)}