@remit/ui 0.0.67 → 0.0.69

package/src/components/folder-tree-picker.tsx

@@ -1,36 +1,46 @@
-import { Check, ChevronRight, Folder, FolderPlus, Search } from "lucide-react";
+import { Search } from "lucide-react";
 import {
 	type KeyboardEvent as ReactKeyboardEvent,
+	type ReactNode,
 	useCallback,
 	useEffect,
-	useId,
 	useMemo,
 	useRef,
 	useState,
 } from "react";
 import { isAbortError } from "../lib/abort.js";
-import { cn } from "../lib/cn.js";
-import { Button } from "./button.js";
-import { FieldLabel } from "./field-label.js";
+import {
+	collapseFolderTree,
+	type FolderTreeDisplayRow,
+	type FolderTreeNode,
+	type FolderTreeRow,
+	filterFolderTree,
+	folderAncestors,
+	orderFolderNodes,
+	queryExpandedPaths,
+	withCreateRows,
+} from "../lib/folder-tree.js";
+import {
+	findFirstFocusable,
+	findLastFocusable,
+	findNextFocusable,
+	findParentRow,
+	isFocusable,
+	isSelectable,
+} from "../lib/folder-tree-focus.js";
+import { FolderRow } from "./folder-row.js";
 import { Input } from "./input.js";
+import { NewFolderAction } from "./new-folder-action.js";
+import {
+	defaultNewFolderFormLabels,
+	NewFolderForm,
+} from "./new-folder-form.js";
 
-export interface FolderTreeNode {
-	/** Stable identity passed back to `onSelect`. */
-	id: string;
-	/**
-	 * What the row reads as. An appointed folder is labelled by its role, so
-	 * `Deleted Messages` shows as "Trash" while still nesting under its real
-	 * path — which is why the label is not derived from the path.
-	 */
-	label: string;
-	/** The provider path. Nesting, indentation and filtering all read this. */
-	path: string;
-	/**
-	 * Where the messages live now. A "you are here" marker: never a target, and
-	 * rendered as a marker rather than a disabled control.
-	 */
-	isCurrent?: boolean;
-}
+export type {
+	FolderTreeDisplayRow,
+	FolderTreeNode,
+	FolderTreeRow,
+} from "../lib/folder-tree.js";
 
 export interface FolderTreePickerLabels {
 	filterPlaceholder?: string;
@@ -63,8 +73,14 @@ export interface FolderTreePickerProps {
 	folders: readonly FolderTreeNode[];
 	/** The destination chosen so far. */
 	selectedId?: string;
-	/** Marks the row. Choosing a destination advances nothing on its own. */
-	onSelect: (folderId: string) => void;
+	/**
+	 * Marks the row. Choosing a destination advances nothing on its own. Absent
+	 * means the tree is browsed rather than chosen from, and a row does nothing
+	 * beyond opening and closing.
+	 */
+	onSelect?: (folderId: string) => void;
+	/** Controls beside each row, for a surface that acts on folders themselves. */
+	rowActions?: (folder: FolderTreeNode) => ReactNode;
 	/**
 	 * Creating a folder is an IMAP mutation, so this resolves only once the mail
 	 * server confirms the folder (docs/architecture/imap-mutations.md). The form
@@ -86,6 +102,7 @@ export interface FolderTreePickerProps {
 }
 
 const defaultLabels: Required<FolderTreePickerLabels> = {
+	...defaultNewFolderFormLabels,
 	filterPlaceholder: "Filter folders…",
 	filterAriaLabel: "Filter folders",
 	treeAriaLabel: "Destination folders",
@@ -96,264 +113,11 @@ const defaultLabels: Required<FolderTreePickerLabels> = {
 	optionLabel: (label) => `Move to ${label}`,
 	newFolder: "New folder",
 	newSubfolder: (label) => `New folder inside ${label}`,
-	nameLabel: "Folder name",
-	namePlaceholder: "Hotels",
-	insideLabel: "Inside",
 	topLevel: "Top level",
-	create: "Create folder",
-	cancel: "Cancel",
 	nameRequired: "Give the folder a name.",
-	createPending: "Creating folder…",
 	createError: "Couldn't create that folder. Please try again.",
 };
 
-const ROW_BASE =
-	"flex min-h-11 min-w-0 flex-1 items-center gap-2 px-3 py-2.5 text-left text-sm transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-inset";
-
-const INDENT_STEP = 14;
-
-/**
- * Where a row's text starts: `px-3` plus the chevron and folder icon columns
- * with their gaps. The hairline separator is inset to it, so the line begins
- * under the label the way a native mobile list draws it.
- */
-const ROW_TEXT_INSET = 60;
-
-const folderParent = (path: string, delimiter: string): string => {
-	const cut = path.lastIndexOf(delimiter);
-	return cut === -1 ? "" : path.slice(0, cut);
-};
-
-const folderDepth = (path: string, delimiter: string): number =>
-	path.split(delimiter).length - 1;
-
-const folderAncestors = (path: string, delimiter: string): string[] => {
-	const out: string[] = [];
-	let parent = folderParent(path, delimiter);
-	while (parent) {
-		out.push(parent);
-		parent = folderParent(parent, delimiter);
-	}
-	return out;
-};
-
-/**
- * Puts every child straight after its parent so the list reads as a tree, while
- * leaving the order of unrelated folders alone. A folder whose parent is absent
- * from the list renders as a root rather than disappearing.
- */
-const orderFolderNodes = (
-	folders: readonly FolderTreeNode[],
-	delimiter: string,
-): FolderTreeNode[] => {
-	const present = new Set(folders.map((folder) => folder.path));
-	const emitted = new Set<string>();
-	const out: FolderTreeNode[] = [];
-
-	const emit = (folder: FolderTreeNode) => {
-		if (emitted.has(folder.path)) return;
-		emitted.add(folder.path);
-		out.push(folder);
-		for (const candidate of folders) {
-			if (folderParent(candidate.path, delimiter) === folder.path) {
-				emit(candidate);
-			}
-		}
-	};
-
-	for (const folder of folders) {
-		const parent = folderParent(folder.path, delimiter);
-		if (parent && present.has(parent)) continue;
-		emit(folder);
-	}
-	return out;
-};
-
-const matchesQuery = (folder: FolderTreeNode, query: string): boolean =>
-	folder.label.toLowerCase().includes(query) ||
-	folder.path.toLowerCase().includes(query);
-
-export interface FolderTreeRow {
-	folder: FolderTreeNode;
-	depth: number;
-	/**
-	 * On screen only to keep a match below it in place. It reads as the branch
-	 * it is, not as an answer to what was typed.
-	 */
-	context: boolean;
-	/** Its children and its create action are on screen. */
-	expanded: boolean;
-}
-
-/**
- * The ancestors a query has to open for its matches to be on screen. Held apart
- * from what the user opened by hand, so clearing the filter puts the list back
- * the way they left it.
- */
-const queryExpandedPaths = (
-	folders: readonly FolderTreeNode[],
-	query: string,
-	delimiter: string,
-): Set<string> => {
-	const out = new Set<string>();
-	if (!query) return out;
-	for (const folder of folders) {
-		if (!matchesQuery(folder, query)) continue;
-		for (const ancestor of folderAncestors(folder.path, delimiter)) {
-			out.add(ancestor);
-		}
-	}
-	return out;
-};
-
-/**
- * The rows a filtered tree shows: every match, plus the ancestors holding it on
- * screen. Depth still comes from the path, so a match stays indented under the
- * branch it belongs to.
- */
-const filterFolderTree = (
-	ordered: readonly FolderTreeNode[],
-	query: string,
-	delimiter: string,
-	expanded: ReadonlySet<string> = new Set(),
-): FolderTreeRow[] => {
-	const row = (folder: FolderTreeNode, context: boolean): FolderTreeRow => ({
-		folder,
-		depth: folderDepth(folder.path, delimiter),
-		context,
-		expanded: expanded.has(folder.path),
-	});
-	if (!query) return ordered.map((folder) => row(folder, false));
-
-	const matched = new Set<string>();
-	for (const folder of ordered) {
-		if (matchesQuery(folder, query)) matched.add(folder.path);
-	}
-	const visible = new Set(matched);
-	for (const path of matched) {
-		for (const ancestor of folderAncestors(path, delimiter)) {
-			visible.add(ancestor);
-		}
-	}
-	return ordered
-		.filter((folder) => visible.has(folder.path))
-		.map((folder) => row(folder, !matched.has(folder.path)));
-};
-
-/**
- * The unfiltered list: roots always, and a child only while every ancestor it
- * has on screen is open. A folder whose parent is absent from the list is a
- * root, so it never hides behind something that was never there.
- */
-const collapseFolderTree = (
-	ordered: readonly FolderTreeNode[],
-	expanded: ReadonlySet<string>,
-	delimiter: string,
-): FolderTreeRow[] => {
-	const present = new Set(ordered.map((folder) => folder.path));
-	return ordered
-		.filter((folder) =>
-			folderAncestors(folder.path, delimiter).every(
-				(ancestor) => !present.has(ancestor) || expanded.has(ancestor),
-			),
-		)
-		.map((folder) => ({
-			folder,
-			depth: folderDepth(folder.path, delimiter),
-			context: false,
-			expanded: expanded.has(folder.path),
-		}));
-};
-
-export type FolderTreeDisplayRow =
-	| { kind: "folder"; row: FolderTreeRow; index: number }
-	| { kind: "create"; parent: FolderTreeNode; depth: number };
-
-/**
- * Drops a create action at the end of every open folder's children, so "New
- * folder" reads as the last folder inside the one you opened.
- */
-const withCreateRows = (
-	rows: readonly FolderTreeRow[],
-	delimiter: string,
-): FolderTreeDisplayRow[] => {
-	const out: FolderTreeDisplayRow[] = [];
-	const open: FolderTreeRow[] = [];
-
-	const closeDownTo = (path: string | null) => {
-		while (open.length > 0) {
-			const last = open[open.length - 1];
-			if (!last) break;
-			if (path?.startsWith(`${last.folder.path}${delimiter}`)) break;
-			open.pop();
-			out.push({
-				kind: "create",
-				parent: last.folder,
-				depth: last.depth + 1,
-			});
-		}
-	};
-
-	rows.forEach((row, index) => {
-		closeDownTo(row.folder.path);
-		out.push({ kind: "folder", row, index });
-		if (row.expanded) open.push(row);
-	});
-	closeDownTo(null);
-	return out;
-};
-
-/** Every folder can hold a new one, so every row but a context row can open. */
-const isFocusable = (row: FolderTreeRow | undefined): boolean =>
-	row !== undefined && !row.context;
-
-const isSelectable = (row: FolderTreeRow | undefined): boolean =>
-	row !== undefined && !row.folder.isCurrent && !row.context;
-
-const findFirstFocusable = (rows: readonly FolderTreeRow[]): number => {
-	for (let i = 0; i < rows.length; i += 1) {
-		if (isFocusable(rows[i])) return i;
-	}
-	return -1;
-};
-
-const findLastFocusable = (rows: readonly FolderTreeRow[]): number => {
-	for (let i = rows.length - 1; i >= 0; i -= 1) {
-		if (isFocusable(rows[i])) return i;
-	}
-	return -1;
-};
-
-const findNextFocusable = (
-	rows: readonly FolderTreeRow[],
-	from: number,
-	step: 1 | -1,
-): number => {
-	const count = rows.length;
-	if (count <= 0) return -1;
-	const start = from < 0 ? (step === 1 ? -1 : count) : from;
-	for (let offset = 1; offset <= count; offset += 1) {
-		const candidate = (((start + step * offset) % count) + count) % count;
-		if (isFocusable(rows[candidate])) return candidate;
-	}
-	return -1;
-};
-
-const findParentRow = (
-	rows: readonly FolderTreeRow[],
-	from: number,
-	delimiter: string,
-): number => {
-	const child = rows[from];
-	if (!child) return -1;
-	const parent = folderParent(child.folder.path, delimiter);
-	if (!parent) return -1;
-	for (let i = from - 1; i >= 0; i -= 1) {
-		if (rows[i]?.folder.path === parent) return isFocusable(rows[i]) ? i : -1;
-	}
-	return -1;
-};
-
 interface Draft {
 	/** The row the form was opened from; `null` is the top-level row. */
 	anchorId: string | null;
@@ -361,57 +125,6 @@ interface Draft {
 	parentLabel: string;
 }
 
-const NewFolderAction = ({
-	label,
-	ariaLabel,
-	depth,
-	separated,
-	onOpen,
-}: {
-	label: string;
-	ariaLabel: string;
-	depth: number;
-	separated: boolean;
-	onOpen: () => void;
-}) => (
-	<div className="relative">
-		<button
-			type="button"
-			onClick={onOpen}
-			aria-label={ariaLabel}
-			className={cn(
-				ROW_BASE,
-				"group relative w-full font-medium text-accent-2",
-			)}
-		>
-			{/* The tint starts at the row's indent, so nested actions read as a
-			    staircase instead of merging into one block. */}
-			<span
-				aria-hidden="true"
-				className="absolute inset-y-0 right-0 bg-accent-2-soft transition-colors group-active:bg-accent-2/25"
-				style={{ left: depth * INDENT_STEP }}
-			/>
-			{depth > 0 && (
-				<span
-					aria-hidden="true"
-					className="relative shrink-0"
-					style={{ width: depth * INDENT_STEP }}
-				/>
-			)}
-			<span aria-hidden="true" className="relative size-4 shrink-0" />
-			<FolderPlus className="relative size-4 shrink-0" aria-hidden="true" />
-			<span className="relative min-w-0 flex-1 truncate">{label}</span>
-		</button>
-		{separated && (
-			<span
-				aria-hidden="true"
-				className="pointer-events-none absolute right-0 bottom-0 h-px bg-line"
-				style={{ left: ROW_TEXT_INSET + depth * INDENT_STEP }}
-			/>
-		)}
-	</div>
-);
-
 /**
  * Browsable destination picker: the folders as a tree that starts at its top
  * level, opens a folder where you tap it, and makes a new folder wherever you
@@ -422,6 +135,7 @@ export const FolderTreePicker = ({
 	folders,
 	selectedId,
 	onSelect,
+	rowActions,
 	onCreateFolder,
 	onCancel,
 	delimiter = "/",
@@ -436,9 +150,7 @@ export const FolderTreePicker = ({
 	const [creating, setCreating] = useState(false);
 	const [focusedIndex, setFocusedIndex] = useState(-1);
 
-	const nameFieldId = useId();
 	const rowRefs = useRef<Array<HTMLButtonElement | null>>([]);
-	const nameRef = useRef<HTMLInputElement>(null);
 	const roving = useRef(false);
 	const createAbort = useRef<AbortController | null>(null);
 	useEffect(() => () => createAbort.current?.abort(), []);
@@ -481,18 +193,26 @@ export const FolderTreePicker = ({
 		rowRefs.current[focusedIndex]?.focus();
 	}, [focusedIndex]);
 
-	const setExpanded = useCallback((path: string, open: boolean) => {
-		setOpened((current) => {
-			const next = new Set(current);
-			if (open) next.add(path);
-			else next.delete(path);
-			return next;
-		});
-	}, []);
+	/**
+	 * One open branch: opening a folder closes every folder that is not an
+	 * ancestor of it, so the list never grows past what a phone screen holds.
+	 * Its ancestors stay open because otherwise it could not be on screen.
+	 */
+	const setExpanded = useCallback(
+		(path: string, open: boolean) => {
+			setOpened((current) => {
+				if (open) return new Set([...folderAncestors(path, delimiter), path]);
+				const next = new Set(current);
+				next.delete(path);
+				return next;
+			});
+		},
+		[delimiter],
+	);
 
 	const activateRow = useCallback(
 		(row: FolderTreeRow) => {
-			if (isSelectable(row)) onSelect(row.folder.id);
+			if (isSelectable(row)) onSelect?.(row.folder.id);
 			setExpanded(row.folder.path, !row.expanded);
 		},
 		[onSelect, setExpanded],
@@ -521,10 +241,6 @@ export const FolderTreePicker = ({
 		[text.topLevel],
 	);
 
-	useEffect(() => {
-		if (draft) nameRef.current?.focus();
-	}, [draft]);
-
 	const submitDraft = useCallback(() => {
 		if (!onCreateFolder || !draft || creating) return;
 		const name = draftName.trim();
@@ -544,7 +260,7 @@ export const FolderTreePicker = ({
 				setDraft(null);
 				setDraftName("");
 				if (parentPath) setExpanded(parentPath, true);
-				onSelect(created.id);
+				onSelect?.(created.id);
 			})
 			.catch((error: unknown) => {
 				if (isAbortError(error)) return;
@@ -622,157 +338,49 @@ export const FolderTreePicker = ({
 	);
 
 	const draftForm = draft && (
-		<div className="space-y-3 border-y border-line bg-surface-sunken px-3 py-3">
-			<div>
-				<FieldLabel htmlFor={nameFieldId}>{text.nameLabel}</FieldLabel>
-				<Input
-					id={nameFieldId}
-					ref={nameRef}
-					value={draftName}
-					placeholder={text.namePlaceholder}
-					onChange={(event) => {
-						setDraftName(event.target.value);
-						setDraftError(undefined);
-					}}
-					onKeyDown={(event) => {
-						if (event.key === "Enter") {
-							event.preventDefault();
-							submitDraft();
-						}
-						if (event.key === "Escape") {
-							event.preventDefault();
-							closeDraft();
-						}
-					}}
-				/>
-			</div>
-			<p className="text-xs text-fg-muted">
-				{text.insideLabel}{" "}
-				<span className="font-medium text-fg">{draft.parentLabel}</span>
-			</p>
-			{draftError && (
-				<p className="text-xs text-danger" role="alert">
-					{draftError}
-				</p>
-			)}
-			<div className="flex items-center gap-2">
-				<Button
-					variant="ghost"
-					size="touch"
-					onClick={closeDraft}
-					className="w-auto shrink-0 px-3"
-				>
-					{text.cancel}
-				</Button>
-				<Button
-					variant="primary"
-					size="touch"
-					onClick={submitDraft}
-					disabled={creating}
-					className="w-auto flex-1 px-3"
-				>
-					{creating ? text.createPending : text.create}
-				</Button>
-			</div>
-		</div>
+		<NewFolderForm
+			parentLabel={draft.parentLabel}
+			name={draftName}
+			onNameChange={(value) => {
+				setDraftName(value);
+				setDraftError(undefined);
+			}}
+			onSubmit={submitDraft}
+			onCancel={closeDraft}
+			pending={creating}
+			error={draftError}
+			labels={text}
+		/>
 	);
 
-	const renderFolderRow = (
-		row: FolderTreeRow,
-		index: number,
-		separated: boolean,
-	) => {
+	const rowAriaLabel = (row: FolderTreeRow): string => {
+		if (row.context) return `${row.folder.label} ${text.contextSuffix}`;
+		if (isSelectable(row)) return text.optionLabel(row.folder.label);
+		return `${row.folder.label} ${text.currentSuffix}`;
+	};
+
+	const folderRow = (row: FolderTreeRow, index: number, separated: boolean) => {
 		const { folder, depth } = row;
 		const selectable = isSelectable(row);
-		const focusable = isFocusable(row);
-		const indent = depth > 0 && (
-			<span
-				aria-hidden="true"
-				className="shrink-0"
-				style={{ width: depth * INDENT_STEP }}
-			/>
-		);
-		const chevron = (
-			<ChevronRight
-				className={cn(
-					"size-4 shrink-0 text-fg-subtle transition-transform",
-					row.expanded && "rotate-90",
-				)}
-				aria-hidden="true"
-			/>
-		);
-		const icon = (
-			<Folder className="size-4 shrink-0 text-fg-subtle" aria-hidden="true" />
-		);
-		const separator = separated && (
-			<span
-				aria-hidden="true"
-				className="pointer-events-none absolute right-0 bottom-0 h-px bg-line"
-				style={{ left: ROW_TEXT_INSET + depth * INDENT_STEP }}
-			/>
-		);
-		if (!focusable) {
-			return (
-				<div className="relative flex items-center">
-					{/* biome-ignore lint/a11y/useFocusableInteractive: an ancestor held on screen by a match below it — a branch, not a destination */}
-					<div
-						role="treeitem"
-						aria-level={depth + 1}
-						aria-selected={false}
-						aria-expanded={row.expanded}
-						aria-label={`${folder.label} ${text.contextSuffix}`}
-						className={cn(ROW_BASE, "opacity-60")}
-					>
-						{indent}
-						{chevron}
-						{icon}
-						<span className="min-w-0 flex-1 truncate">{folder.label}</span>
-					</div>
-					{separator}
-				</div>
-			);
-		}
 		return (
-			<div className="relative flex items-center">
-				<button
-					ref={(node) => {
-						rowRefs.current[index] = node;
-					}}
-					type="button"
-					role="treeitem"
-					aria-level={depth + 1}
-					aria-selected={selectable ? folder.id === selectedId : false}
-					aria-expanded={row.expanded}
-					aria-current={folder.isCurrent ? "true" : undefined}
-					aria-label={
-						selectable
-							? text.optionLabel(folder.label)
-							: `${folder.label} ${text.currentSuffix}`
-					}
-					tabIndex={index === focusedIndex ? 0 : -1}
-					onClick={() => activateRow(row)}
-					onFocus={() => setFocusedIndex(index)}
-					className={cn(
-						ROW_BASE,
-						"hover:bg-surface-raised active:bg-surface-sunken",
-						folder.isCurrent && "text-fg-muted",
-					)}
-				>
-					{indent}
-					{chevron}
-					{icon}
-					<span className="min-w-0 flex-1 truncate">{folder.label}</span>
-					{folder.isCurrent && (
-						<span className="shrink-0 text-xs text-fg-muted">
-							{text.currentTag}
-						</span>
-					)}
-					{selectable && folder.id === selectedId && (
-						<Check className="size-4 shrink-0 text-accent" aria-hidden="true" />
-					)}
-				</button>
-				{separator}
-			</div>
+			<FolderRow
+				ref={(node) => {
+					rowRefs.current[index] = node;
+				}}
+				label={folder.label}
+				depth={depth}
+				expanded={row.expanded}
+				context={row.context}
+				current={folder.isCurrent}
+				currentTag={text.currentTag}
+				selected={selectable && folder.id === selectedId}
+				separated={separated}
+				actions={rowActions?.(folder)}
+				ariaLabel={rowAriaLabel(row)}
+				tabIndex={index === focusedIndex ? 0 : -1}
+				onActivate={() => activateRow(row)}
+				onFocus={() => setFocusedIndex(index)}
+			/>
 		);
 	};
 
@@ -806,15 +414,17 @@ export const FolderTreePicker = ({
 			/>
 
 			{onCreateFolder && (
-				<div className="shrink-0 border-b border-line">
-					<NewFolderAction
-						label={text.newFolder}
-						ariaLabel={text.newFolder}
-						depth={0}
-						separated={false}
-						onOpen={() => openDraft(null)}
-					/>
-					{draft?.anchorId === null && draftForm}
+				<div className="shrink-0 border-b border-line" data-create-anchor="top">
+					{draft?.anchorId === null ? (
+						draftForm
+					) : (
+						<NewFolderAction
+							label={text.newFolder}
+							ariaLabel={text.newFolder}
+							prominence="prominent"
+							onOpen={() => openDraft(null)}
+						/>
+					)}
 				</div>
 			)}
 
@@ -824,13 +434,13 @@ export const FolderTreePicker = ({
 				</p>
 			) : (
 				// A flattened tree: `aria-level` carries the nesting the indentation
-				// shows. The row wrapper is presentational and the button itself is
-				// the treeitem — a role on a wrapper around a separately-interactive
+				// shows. The row wrapper is presentational and the row itself is the
+				// treeitem — a role on a wrapper around a separately-interactive
 				// button is invalid ARIA.
 				<div
 					role="tree"
 					aria-label={text.treeAriaLabel}
-					className="min-h-0 flex-1 overflow-y-auto overflow-x-hidden"
+					className="min-h-0 flex-1 overflow-y-auto overflow-x-hidden pb-24"
 					onKeyDown={handleTreeKeyDown}
 				>
 					{(
@@ -846,21 +456,29 @@ export const FolderTreePicker = ({
 						const separated = position < all.length - 1;
 						if (entry.kind === "create") {
 							return (
-								<div key={`new:${entry.parent.id}`} role="none">
-									<NewFolderAction
-										label={text.newFolder}
-										ariaLabel={text.newSubfolder(entry.parent.label)}
-										depth={entry.depth}
-										separated={separated}
-										onOpen={() => openDraft(entry.parent)}
-									/>
-									{draft?.anchorId === entry.parent.id && draftForm}
+								<div
+									key={`new:${entry.parent.id}`}
+									role="none"
+									data-create-anchor={entry.parent.id}
+								>
+									{draft?.anchorId === entry.parent.id ? (
+										draftForm
+									) : (
+										<NewFolderAction
+											label={text.newFolder}
+											ariaLabel={text.newSubfolder(entry.parent.label)}
+											depth={entry.depth}
+											prominence="quiet"
+											separated={separated}
+											onOpen={() => openDraft(entry.parent)}
+										/>
+									)}
 								</div>
 							);
 						}
 						return (
 							<div key={entry.row.folder.id} role="none">
-								{renderFolderRow(entry.row, entry.index, separated)}
+								{folderRow(entry.row, entry.index, separated)}
 							</div>
 						);
 					})}
@@ -869,25 +487,3 @@ export const FolderTreePicker = ({
 		</div>
 	);
 };
-
-/**
- * Pure ordering, filtering, expansion and roving-focus helpers, exposed for unit
- * testing without a DOM. Consumers should use {@link FolderTreePicker}.
- */
-export const folderTreePickerInternals = {
-	folderParent,
-	folderDepth,
-	folderAncestors,
-	orderFolderNodes,
-	filterFolderTree,
-	collapseFolderTree,
-	queryExpandedPaths,
-	withCreateRows,
-	matchesQuery,
-	isFocusable,
-	isSelectable,
-	findFirstFocusable,
-	findLastFocusable,
-	findNextFocusable,
-	findParentRow,
-};