feat(ui): bulk-action UX + keyboard nav (PHASE 4) #40

Closed
cesnimda wants to merge 1 commits from feat/ui-bulk-keyboard into develop
2 changed files with 106 additions and 43 deletions
+34 -5
View File
@@ -1,5 +1,5 @@
import { useState } from 'react'; import { useState } from 'react';
import { MailOpen, Mail, Star, Archive, Trash2 } from 'lucide-react'; import { MailOpen, Mail, Star, Archive, Trash2, X } from 'lucide-react';
import { BulkApi } from '../api/client.js'; import { BulkApi } from '../api/client.js';
import { import {
Button, useToast, Button, useToast,
@@ -49,9 +49,38 @@ export default function BulkToolbar({ selectedIds, onDone, onClear }) {
}; };
return ( return (
<div className="flex flex-wrap items-center gap-2 rounded-lg border border-border bg-card px-3 py-2 shadow-sm"> <div
<span className="text-sm font-medium">{count} selected</span> role="toolbar"
<div className="flex-1" /> aria-label={`${count} email${count === 1 ? '' : 's'} selected`}
className="flex flex-wrap items-center gap-x-3 gap-y-2 rounded-lg border border-border bg-card px-3 py-2 shadow-sm"
>
{/* Selection count — primary emphasis so it reads first. */}
<div className="flex items-center gap-2">
<span
aria-hidden="true"
className="inline-flex h-7 min-w-7 items-center justify-center rounded-full bg-primary px-2 text-sm font-semibold tabular-nums text-primary-foreground"
>
{count}
</span>
<span className="text-sm font-medium text-foreground">
selected
</span>
{/* Obvious clear-selection affordance, kept next to the count. */}
<Button
variant="ghost"
size="icon-sm"
disabled={busy}
onClick={onClear}
aria-label="Clear selection"
title="Clear selection"
>
<X />
</Button>
</div>
<div className="flex-1 basis-full sm:basis-0" />
<div className="flex flex-wrap items-center gap-2">
<Button variant="ghost" size="sm" disabled={busy} onClick={() => apply(BulkApi.markRead, 'read', 'Marked read')}> <Button variant="ghost" size="sm" disabled={busy} onClick={() => apply(BulkApi.markRead, 'read', 'Marked read')}>
<MailOpen /> Read <MailOpen /> Read
</Button> </Button>
@@ -67,7 +96,7 @@ export default function BulkToolbar({ selectedIds, onDone, onClear }) {
<Button variant="danger-outline" size="sm" disabled={busy} onClick={() => setConfirmTrash(true)}> <Button variant="danger-outline" size="sm" disabled={busy} onClick={() => setConfirmTrash(true)}>
<Trash2 /> Trash <Trash2 /> Trash
</Button> </Button>
<Button variant="ghost" size="sm" disabled={busy} onClick={onClear}>Cancel</Button> </div>
<Dialog open={confirmTrash} onOpenChange={(o) => !busy && setConfirmTrash(o)}> <Dialog open={confirmTrash} onOpenChange={(o) => !busy && setConfirmTrash(o)}>
<DialogContent> <DialogContent>
+43 -9
View File
@@ -2,9 +2,15 @@ import { useEffect, useState } from 'react';
import { BulkApi } from '../api/client.js'; import { BulkApi } from '../api/client.js';
/// <summary> /// <summary>
/// j/k move focus down/up the list, e archives the focused email, # (shift+3) /// Keyboard navigation for an email list. Shortcuts:
/// trashes it. Ignored while an input/textarea/select has focus, or while /// j / ArrowDown move focus down
/// the "/" search shortcut is active, so typing is never hijacked. /// k / ArrowUp move focus up
/// e archive the focused email
/// u mark the focused email unread
/// # (shift+3) trash the focused email
/// All shortcuts are ignored while an input/textarea/select (or any
/// contenteditable) has focus, and modifier chords (Ctrl/Cmd/Alt) are left
/// alone, so typing and browser/OS shortcuts are never hijacked.
/// `onRemoved(id)` lets the caller drop the row from local state after a /// `onRemoved(id)` lets the caller drop the row from local state after a
/// successful archive/trash. /// successful archive/trash.
/// </summary> /// </summary>
@@ -12,31 +18,59 @@ export default function useListKeyboardNav(emails, onRemoved) {
const [focusedId, setFocusedId] = useState(null); const [focusedId, setFocusedId] = useState(null);
useEffect(() => { useEffect(() => {
const isEditable = (el) => {
if (!el) return false;
const tag = el.tagName;
return tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT' || el.isContentEditable;
};
const handler = async (e) => { const handler = async (e) => {
const tag = document.activeElement?.tagName; // Never hijack typing or modifier chords (Ctrl+C, Cmd+K, Alt+…).
if (tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT') return; if (isEditable(document.activeElement)) return;
if (e.ctrlKey || e.metaKey || e.altKey) return;
if (!emails.length) return; if (!emails.length) return;
const idx = emails.findIndex((x) => x.id === focusedId); const idx = emails.findIndex((x) => x.id === focusedId);
if (e.key === 'j') { switch (e.key) {
case 'j':
case 'ArrowDown': {
e.preventDefault(); e.preventDefault();
const next = idx < 0 ? 0 : Math.min(idx + 1, emails.length - 1); const next = idx < 0 ? 0 : Math.min(idx + 1, emails.length - 1);
setFocusedId(emails[next].id); setFocusedId(emails[next].id);
} else if (e.key === 'k') { break;
}
case 'k':
case 'ArrowUp': {
e.preventDefault(); e.preventDefault();
const prev = idx < 0 ? 0 : Math.max(idx - 1, 0); const prev = idx < 0 ? 0 : Math.max(idx - 1, 0);
setFocusedId(emails[prev].id); setFocusedId(emails[prev].id);
} else if (e.key === 'e' && idx >= 0) { break;
}
case 'e': {
if (idx < 0) break;
e.preventDefault(); e.preventDefault();
const id = emails[idx].id; const id = emails[idx].id;
await BulkApi.archive([id]); await BulkApi.archive([id]);
onRemoved(id); onRemoved(id);
} else if (e.key === '#' && idx >= 0) { break;
}
case 'u': {
if (idx < 0) break;
e.preventDefault();
await BulkApi.markUnread([emails[idx].id]);
break;
}
case '#': {
if (idx < 0) break;
e.preventDefault(); e.preventDefault();
const id = emails[idx].id; const id = emails[idx].id;
await BulkApi.trash([id]); await BulkApi.trash([id]);
onRemoved(id); onRemoved(id);
break;
}
default:
break;
} }
}; };