@remit/web-client 0.0.207 → 0.0.208

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/web-client",
-  "version": "0.0.207",
+  "version": "0.0.208",
   "type": "module",
   "description": "Remit web client, published as composable primitives — the app shell, auth shells, and runtime config. A distributor imports what it composes and bundles it.",
   "exports": {

package/src/components/mail/MoveToTrigger.render.test.ts

@@ -65,8 +65,40 @@ const FOLDERS = [
 	makeMailbox({ mailboxId: "mbx-receipts", fullPath: "Receipts" }),
 ];
 
+// The desktop picker renders through a portal into document.body, so its
+// content sits outside the render container these helpers normally scope to.
+const pickerRoot = (dom: DomHarness): ParentNode => {
+	const trigger = dom.byLabel("Move to folder");
+	return trigger.getAttribute("aria-haspopup") === "dialog"
+		? dom.container
+		: dom.document.body;
+};
+
 const rowText = (dom: DomHarness): string[] =>
-	dom.queryAll("[role=treeitem]").map((row) => row.textContent ?? "");
+	[...pickerRoot(dom).querySelectorAll("[role=treeitem]")].map(
+		(row) => row.textContent ?? "",
+	);
+
+const pickerText = (dom: DomHarness): string =>
+	pickerRoot(dom).textContent ?? "";
+
+const pickerByLabel = (dom: DomHarness, label: string): HTMLElement => {
+	const found = pickerRoot(dom).querySelector(`[aria-label="${label}"]`);
+	if (!found) throw new Error(`no picker element labelled "${label}"`);
+	return found as HTMLElement;
+};
+
+const pickerByText = (
+	dom: DomHarness,
+	selector: string,
+	text: string,
+): HTMLElement => {
+	const found = [...pickerRoot(dom).querySelectorAll(selector)].find((node) =>
+		(node.textContent ?? "").includes(text),
+	);
+	if (!found) throw new Error(`no picker ${selector} containing "${text}"`);
+	return found as HTMLElement;
+};
 
 describe("MoveToTrigger", () => {
 	it("reports itself as collapsed until it is opened", () => {
@@ -103,7 +135,7 @@ describe("MoveToTrigger", () => {
 			false,
 		);
 
-		dom.click(dom.byLabel("Move to Work"));
+		dom.click(pickerByLabel(dom, "Move to Work"));
 		assert.ok(rowText(dom).some((label) => label.includes("Clients")));
 	});
 
@@ -117,10 +149,10 @@ describe("MoveToTrigger", () => {
 
 		// Picking a folder also opens it, so the move is a separate press —
 		// otherwise the first tap would fire before anything nested was reachable.
-		dom.click(dom.byLabel("Move to Work"));
+		dom.click(pickerByLabel(dom, "Move to Work"));
 		assert.deepEqual(moved, []);
 
-		dom.click(dom.byText("button", "Move to Work"));
+		dom.click(pickerByText(dom, "button", "Move to Work"));
 		assert.deepEqual(moved, ["mbx-work"]);
 		assert.equal(
 			dom.byLabel("Move to folder").getAttribute("aria-expanded"),
@@ -131,10 +163,10 @@ describe("MoveToTrigger", () => {
 	it("names the destination on the button that runs the move", () => {
 		const dom = mount({ mailboxes: FOLDERS });
 		dom.click(dom.byLabel("Move to folder"));
-		dom.click(dom.byLabel("Move to Work"));
-		dom.click(dom.byLabel("Move to Clients"));
+		dom.click(pickerByLabel(dom, "Move to Work"));
+		dom.click(pickerByLabel(dom, "Move to Clients"));
 
-		assert.match(dom.text(), /Move to Clients/);
+		assert.match(pickerText(dom), /Move to Clients/);
 	});
 
 	it("closes on Escape and on a click outside it", () => {
@@ -159,6 +191,56 @@ describe("MoveToTrigger", () => {
 		assert.equal(isOpen(), false);
 	});
 
+	it("renders the desktop picker outside its own subtree (#601)", () => {
+		// Regression: an in-place absolute popover is clipped by the reading
+		// pane's overflow-hidden shell and painted underneath the thread list.
+		const dom = mount({ mailboxes: FOLDERS });
+		dom.click(dom.byLabel("Move to folder"));
+
+		const trigger = dom.byLabel("Move to folder");
+		const tree = pickerRoot(dom).querySelector("[role=tree]");
+		assert.ok(tree, "the picker is open");
+		assert.ok(
+			!trigger.parentElement?.contains(tree),
+			"the picker escapes the trigger's subtree via a portal",
+		);
+	});
+
+	it("stays open when the press lands inside the portalled panel (#601)", () => {
+		// The panel is not in the trigger's subtree any more, so the outside-press
+		// guard has to recognise it by its own ref — otherwise the first press on
+		// a folder closes the picker before it can be picked.
+		const dom = mount({ mailboxes: FOLDERS });
+		dom.click(dom.byLabel("Move to folder"));
+
+		dom.dispatch(
+			pickerByLabel(dom, "Move to Work"),
+			new dom.window.MouseEvent("mousedown", { bubbles: true }),
+		);
+
+		assert.equal(
+			dom.byLabel("Move to folder").getAttribute("aria-expanded"),
+			"true",
+		);
+	});
+
+	it("takes the keyboard into the picker and hands it back on close", () => {
+		// Regression: with the panel on the body, Tab from the trigger walked on
+		// to the next toolbar button instead of entering the picker.
+		const dom = mount({ mailboxes: FOLDERS });
+		dom.click(dom.byLabel("Move to folder"));
+
+		const filter = pickerRoot(dom).querySelector('input[type="search"]');
+		assert.ok(filter, "the picker has a filter field");
+		assert.equal(dom.document.activeElement, filter);
+
+		dom.dispatch(
+			dom.window.document,
+			new dom.window.KeyboardEvent("keydown", { key: "Escape" }),
+		);
+		assert.equal(dom.document.activeElement, dom.byLabel("Move to folder"));
+	});
+
 	it("refuses to open, and says why, when the selection spans accounts", () => {
 		const hint = "Select messages from one account to move them";
 		const dom = mount({ mailboxes: FOLDERS, disabledHint: hint });
@@ -212,6 +294,6 @@ describe("MoveToTrigger", () => {
 		dom.click(dom.byLabel("Move to folder"));
 		// No cached mailboxes and no network in the test harness: the picker
 		// shows its loading state rather than an empty list of destinations.
-		assert.match(dom.text(), /Loading folders/);
+		assert.match(pickerText(dom), /Loading folders/);
 	});
 });

package/src/components/mail/MoveToTrigger.tsx

@@ -1,5 +1,11 @@
 import { mailboxOperationsListMailboxesOptions } from "@remit/api-http-client/@tanstack/react-query.gen.ts";
-import { Button, cn, type FolderTreeNode, FolderTreePicker } from "@remit/ui";
+import {
+	Button,
+	cn,
+	type FolderTreeNode,
+	FolderTreePicker,
+	PopoverMenuPortal,
+} from "@remit/ui";
 import { useQuery } from "@tanstack/react-query";
 import { FolderInput } from "lucide-react";
 import {
@@ -75,6 +81,8 @@ export const MoveToTrigger = ({
 	const [pickedId, setPickedId] = useState<string>();
 	const isDesktop = useIsDesktop();
 	const containerRef = useRef<HTMLDivElement>(null);
+	const panelRef = useRef<HTMLDivElement>(null);
+	const triggerRef = useRef<HTMLButtonElement>(null);
 	const triggerLabel = label ?? "Move to folder";
 	const popoverId = useId();
 	const { t } = useTranslation("mail", { useSuspense: false });
@@ -119,6 +127,13 @@ export const MoveToTrigger = ({
 	const close = useCallback(() => {
 		setIsOpen(false);
 		setPickedId(undefined);
+		// The panel is about to unmount. Where the keyboard was inside it, hand
+		// focus back to the trigger rather than dropping it on the body; where it
+		// was elsewhere — a press that landed outside — leave it where it is.
+		const active = document.activeElement;
+		if (active && panelRef.current?.contains(active)) {
+			triggerRef.current?.focus();
+		}
 	}, []);
 
 	// Tapping a folder both picks it and opens it, so the move waits for a
@@ -134,12 +149,13 @@ export const MoveToTrigger = ({
 	useEffect(() => {
 		if (!isOpen || !isDesktop) return;
 		const handlePointer = (event: MouseEvent) => {
-			if (
-				containerRef.current &&
-				!containerRef.current.contains(event.target as Node)
-			) {
-				close();
-			}
+			const target = event.target as Node;
+			if (containerRef.current?.contains(target)) return;
+			// The picker renders through a portal into document.body, so it
+			// sits outside the trigger's subtree — count presses on it as
+			// inside, or picking a folder would close the picker first.
+			if (panelRef.current?.contains(target)) return;
+			close();
 		};
 		// The popover owns Escape while it is open (#732). The global triage
 		// layer listens on window and maps Escape to `back`, which closes the
@@ -159,11 +175,15 @@ export const MoveToTrigger = ({
 		};
 	}, [isOpen, isDesktop, close]);
 
+	const anchorRect = () =>
+		containerRef.current?.getBoundingClientRect() ?? null;
+
 	const isTriggerDisabled = disabled || !!disabledHint;
 
 	const TriggerButton = (
 		<button
 			type="button"
+			ref={triggerRef}
 			onClick={(event) => {
 				event.stopPropagation();
 				if (isTriggerDisabled) return;
@@ -204,6 +224,10 @@ export const MoveToTrigger = ({
 			onSelect={setPickedId}
 			onCreateFolder={createFolderIn}
 			onCancel={close}
+			// The desktop panel is portalled onto the body, so Tab from the
+			// trigger would otherwise walk on to the next toolbar button. The
+			// drawer runs its own focus and must not raise a phone keyboard.
+			autoFocusFilter={isDesktop}
 			labels={{
 				filterPlaceholder: t("move_picker_filter_placeholder", {
 					defaultValue: "Filter folders…",
@@ -260,18 +284,27 @@ export const MoveToTrigger = ({
 	return (
 		<div ref={containerRef} className="relative inline-block">
 			{TriggerButton}
-			{isOpen && (
+			{/* Portalled + fixed-positioned: an in-place absolute popover is
+			    clipped by the reading pane's overflow-hidden shell and ends up
+			    painted underneath the thread list (#601). */}
+			<PopoverMenuPortal
+				open={isOpen}
+				align="end"
+				panelRef={panelRef}
+				getAnchor={anchorRect}
+			>
 				<div
 					id={popoverId}
+					ref={panelRef}
 					className={cn(
-						"absolute right-0 mt-1 z-50 w-72 max-h-96 flex flex-col",
+						"w-72 max-h-96 flex flex-col",
 						"bg-surface border border-line rounded-md shadow-lg",
 					)}
 				>
 					{pickerBody}
 					{confirmBar}
 				</div>
-			)}
+			</PopoverMenuPortal>
 		</div>
 	);
 };