Skip to content

Email for professionals and teams

Second round of accessibility fixes (#131)

Can K.0e3fba433bb0
diff --git a/public/locales/tr.json b/public/locales/tr.json
index 002dffd..8641284 100644
--- a/public/locales/tr.json
+++ b/public/locales/tr.json
@@ -40,6 +40,7 @@
"common.reportSpam": "Spam olarak bildir",
"common.restore": "Geri yükle",
"common.delete": "Sil",
+ "common.opensInNewTab": "yeni sekmede açılır",
"common.deleteForever": "Kalıcı olarak sil",
"common.markRead": "Okundu olarak işaretle",
"common.markUnread": "Okunmadı olarak işaretle",
diff --git a/src/app/(admin)/accounts/[id]/permissions/page.tsx b/src/app/(admin)/accounts/[id]/permissions/page.tsx
index 0852e56..62908a0 100644
--- a/src/app/(admin)/accounts/[id]/permissions/page.tsx
+++ b/src/app/(admin)/accounts/[id]/permissions/page.tsx
@@ -117,8 +117,8 @@ export default function AccountPermissionsPage() {
<table className="w-full text-left">
<thead className="border-b border-neutral-100 bg-neutral-50 text-xs font-semibold uppercase tracking-wide text-neutral-500">
<tr>
- <th className="px-5 py-3">{t("account.permissions.permission")}</th>
- <th className="w-28 px-5 py-3 text-center">{t("account.permissions.allowed")}</th>
+ <th scope="col" className="px-5 py-3">{t("account.permissions.permission")}</th>
+ <th scope="col" className="w-28 px-5 py-3 text-center">{t("account.permissions.allowed")}</th>
</tr>
</thead>
<tbody className="divide-y divide-neutral-100">
diff --git a/src/app/(admin)/activity/page.tsx b/src/app/(admin)/activity/page.tsx
index 2d3420f..90c0335 100644
--- a/src/app/(admin)/activity/page.tsx
+++ b/src/app/(admin)/activity/page.tsx
@@ -28,14 +28,14 @@ export default function ActivityPage() {
</p>
</div>
- <section className="overflow-x-auto rounded-3xl bg-white">
+ <section role="region" tabIndex={0} aria-label={t("activity.title")} className="overflow-x-auto rounded-3xl bg-white">
<table className="w-full min-w-[760px] table-fixed text-left">
<thead className="border-b border-neutral-100 bg-neutral-50 text-xs font-semibold uppercase tracking-wide text-neutral-500">
<tr>
- <th className="w-32 px-5 py-3">{t("activity.col.activity")}</th>
- <th className="px-5 py-3">{t("activity.col.user")}</th>
- <th className="w-64 px-5 py-3">{t("activity.col.device")}</th>
- <th className="w-48 px-5 py-3">{t("activity.col.time")}</th>
+ <th scope="col" className="w-32 px-5 py-3">{t("activity.col.activity")}</th>
+ <th scope="col" className="px-5 py-3">{t("activity.col.user")}</th>
+ <th scope="col" className="w-64 px-5 py-3">{t("activity.col.device")}</th>
+ <th scope="col" className="w-48 px-5 py-3">{t("activity.col.time")}</th>
</tr>
</thead>
<tbody className="divide-y divide-neutral-100">
diff --git a/src/app/(admin)/ai-usage/page.tsx b/src/app/(admin)/ai-usage/page.tsx
index 40d28cc..5d319cb 100644
--- a/src/app/(admin)/ai-usage/page.tsx
+++ b/src/app/(admin)/ai-usage/page.tsx
@@ -30,7 +30,7 @@ export default function AiUsagePage() {
<section className="rounded-2xl bg-white p-5"><p className="text-sm text-neutral-500">{t("aiUsage.spend")}</p><p className="mt-2 text-2xl font-semibold text-neutral-900">{totals && totals.pricedRequests ? formatEstimatedUsd(totals.costUsdMicros) : "—"}</p>{totals && totals.pricedRequests < totals.requests && <p className="mt-1 text-xs text-neutral-500">{t("aiUsage.noRate", { count: formatTokenCount(totals.requests - totals.pricedRequests) })}</p>}</section>
</div>
<UsageChart daily={data?.daily ?? []} timeZone={data?.timeZone} />
- <section className="overflow-x-auto rounded-2xl bg-white" aria-busy={loadingPage}><table className="w-full min-w-[850px] text-left text-sm"><thead className="border-b border-neutral-100 bg-neutral-50 text-xs font-semibold uppercase tracking-wide text-neutral-500"><tr><th className="px-4 py-3">{t("aiUsage.col.dateTime")}</th><th className="px-4 py-3">{t("aiUsage.col.model")}</th><th className="px-4 py-3">{t("aiUsage.col.provider")}</th><th className="px-4 py-3 text-right">{t("aiUsage.col.input")}</th><th className="px-4 py-3 text-right">{t("aiUsage.col.output")}</th><th className="px-4 py-3 text-right">{t("aiUsage.col.spending")}</th></tr></thead><tbody className="divide-y divide-neutral-100">{data?.rows.map((row) => <tr key={row.id}><td className="whitespace-nowrap px-4 py-3 text-neutral-600">{formatUsageDate(row.createdAt)}</td><td className="max-w-56 break-all px-4 py-3">{row.model}</td><td className="px-4 py-3">{formatUsageProvider(row.provider)}</td><td className="px-4 py-3 text-right tabular-nums">{formatTokenCount(row.inputTokens)}</td><td className="px-4 py-3 text-right tabular-nums">{formatTokenCount(row.outputTokens)}</td><td className="px-4 py-3 text-right tabular-nums">{formatEstimatedUsd(row.costUsdMicros)}</td></tr>)}{data && data.rows.length === 0 && <tr><td colSpan={6} className="px-4 py-8 text-center text-neutral-500">{t("aiUsage.none")}</td></tr>}{!data && !error && <tr><td colSpan={6} className="px-4 py-8 text-center text-neutral-500">{t("aiUsage.loading")}</td></tr>}</tbody></table></section>
+ <section role="region" tabIndex={0} aria-label={t("aiUsage.title")} className="overflow-x-auto rounded-2xl bg-white" aria-busy={loadingPage}><table className="w-full min-w-[850px] text-left text-sm"><thead className="border-b border-neutral-100 bg-neutral-50 text-xs font-semibold uppercase tracking-wide text-neutral-500"><tr><th scope="col" className="px-4 py-3">{t("aiUsage.col.dateTime")}</th><th scope="col" className="px-4 py-3">{t("aiUsage.col.model")}</th><th scope="col" className="px-4 py-3">{t("aiUsage.col.provider")}</th><th scope="col" className="px-4 py-3 text-right">{t("aiUsage.col.input")}</th><th scope="col" className="px-4 py-3 text-right">{t("aiUsage.col.output")}</th><th scope="col" className="px-4 py-3 text-right">{t("aiUsage.col.spending")}</th></tr></thead><tbody className="divide-y divide-neutral-100">{data?.rows.map((row) => <tr key={row.id}><td className="whitespace-nowrap px-4 py-3 text-neutral-600">{formatUsageDate(row.createdAt)}</td><td className="max-w-56 break-all px-4 py-3">{row.model}</td><td className="px-4 py-3">{formatUsageProvider(row.provider)}</td><td className="px-4 py-3 text-right tabular-nums">{formatTokenCount(row.inputTokens)}</td><td className="px-4 py-3 text-right tabular-nums">{formatTokenCount(row.outputTokens)}</td><td className="px-4 py-3 text-right tabular-nums">{formatEstimatedUsd(row.costUsdMicros)}</td></tr>)}{data && data.rows.length === 0 && <tr><td colSpan={6} className="px-4 py-8 text-center text-neutral-500">{t("aiUsage.none")}</td></tr>}{!data && !error && <tr><td colSpan={6} className="px-4 py-8 text-center text-neutral-500">{t("aiUsage.loading")}</td></tr>}</tbody></table></section>
{data && <div className="flex items-center justify-end gap-3 text-sm text-neutral-600"><span>{t("aiUsage.pageOf", { page: data.page, total: data.totalPages, size: data.pageSize })}</span><Button type="button" variant="outline" size="sm" disabled={loadingPage || data.page <= 1} onClick={() => { setLoadingPage(true); setError(null); void fetchAiUsage(data.page - 1).then(setData).catch((cause) => setError(cause instanceof Error ? cause.message : t("aiUsage.pageFailed"))).finally(() => setLoadingPage(false)); }}>{t("aiUsage.previous")}</Button><Button type="button" variant="outline" size="sm" disabled={loadingPage || data.page >= data.totalPages} onClick={() => { setLoadingPage(true); setError(null); void fetchAiUsage(data.page + 1).then(setData).catch((cause) => setError(cause instanceof Error ? cause.message : t("aiUsage.pageFailed"))).finally(() => setLoadingPage(false)); }}>{t("aiUsage.next")}</Button></div>}
<p className="text-xs text-neutral-500">{t("aiUsage.note")}</p>
</div>;
diff --git a/src/app/(admin)/webhooks/deliveries.tsx b/src/app/(admin)/webhooks/deliveries.tsx
index dc86a34..409b32d 100644
--- a/src/app/(admin)/webhooks/deliveries.tsx
+++ b/src/app/(admin)/webhooks/deliveries.tsx
@@ -50,17 +50,17 @@ export function WebhookDeliveries({ webhookId }: { webhookId: string }) {
}
return (
- <div className="overflow-x-auto rounded-xl border border-neutral-200">
+ <div role="region" tabIndex={0} aria-label={t("webhooks.stat.deliveries")} className="overflow-x-auto rounded-xl border border-neutral-200">
<table className="w-full min-w-[820px] text-left text-sm">
<thead className="bg-neutral-50 text-xs uppercase tracking-wide text-neutral-500">
<tr>
- <th className="px-3 py-2 font-medium">{t("webhooks.col.event")}</th>
- <th className="px-3 py-2 font-medium">{t("webhooks.col.status")}</th>
- <th className="px-3 py-2 font-medium">{t("webhooks.col.attempts")}</th>
- <th className="px-3 py-2 font-medium">{t("webhooks.col.response")}</th>
- <th className="px-3 py-2 font-medium">{t("webhooks.col.lastAttempt")}</th>
- <th className="px-3 py-2 font-medium">{t("webhooks.col.nextRetry")}</th>
- <th className="px-3 py-2 font-medium" />
+ <th scope="col" className="px-3 py-2 font-medium">{t("webhooks.col.event")}</th>
+ <th scope="col" className="px-3 py-2 font-medium">{t("webhooks.col.status")}</th>
+ <th scope="col" className="px-3 py-2 font-medium">{t("webhooks.col.attempts")}</th>
+ <th scope="col" className="px-3 py-2 font-medium">{t("webhooks.col.response")}</th>
+ <th scope="col" className="px-3 py-2 font-medium">{t("webhooks.col.lastAttempt")}</th>
+ <th scope="col" className="px-3 py-2 font-medium">{t("webhooks.col.nextRetry")}</th>
+ <th scope="col" className="px-3 py-2 font-medium" />
</tr>
</thead>
<tbody>
diff --git a/src/app/(calendar)/calendar/page.tsx b/src/app/(calendar)/calendar/page.tsx
index 74fcd11..9aa0ea1 100644
--- a/src/app/(calendar)/calendar/page.tsx
+++ b/src/app/(calendar)/calendar/page.tsx
@@ -33,6 +33,7 @@ import {
monthGridDates, PAST_EVENT_COLOR_CLASSES, rescheduleCalendarOccurrence, resizeEventTimes, startOfDay, startOfMonth, startOfWeek, WEEKDAY_OPTIONS,
} from "./utils";
import clsx from "clsx";
+import { DialogFrame } from "@/components/dialog-frame";
const eventFieldClass = "h-9 border-transparent bg-transparent px-2 shadow-none hover:bg-white/60 focus:border-blue-600 focus:bg-white focus:shadow-sm";
@@ -532,7 +533,7 @@ export default function CalendarPage() {
{adding && (
<div className={clsx("dialog-overlay fixed inset-0 z-50 flex items-center justify-center bg-neutral-950/35 p-4", closingEventEditor && "pointer-events-none")} data-state={closingEventEditor ? "closed" : "open"}>
- <div role="dialog" aria-modal="true" aria-label={editing ? t("calendar.editEvent") : t("calendar.createEvent")} className="dialog-content max-h-[calc(100dvh-2rem)] w-full max-w-xl overflow-y-auto rounded-2xl bg-white p-5 shadow-2xl sm:p-6" data-state={closingEventEditor ? "closed" : "open"}
+ <DialogFrame label={editing ? t("calendar.editEvent") : t("calendar.createEvent")} onClose={() => { if (pendingAction !== "save") setClosingEventEditor(true); }} className="dialog-content max-h-[calc(100dvh-2rem)] w-full max-w-xl overflow-y-auto rounded-2xl bg-white p-5 shadow-2xl sm:p-6" data-state={closingEventEditor ? "closed" : "open"}
onAnimationEnd={(event) => {
if (!closingEventEditor || event.target !== event.currentTarget) return;
setAdding(false);
@@ -629,7 +630,7 @@ export default function CalendarPage() {
</div>
</div>
</div>
- </div>
+ </DialogFrame>
</div>
)}
</div>
diff --git a/src/app/(dashboard)/inbox/[messageId]/page.tsx b/src/app/(dashboard)/inbox/[messageId]/page.tsx
index 5868ad4..95fa8a9 100644
--- a/src/app/(dashboard)/inbox/[messageId]/page.tsx
+++ b/src/app/(dashboard)/inbox/[messageId]/page.tsx
@@ -330,7 +330,8 @@ export default function MessageDetailPage() {
{t("message.openFrom", { provider: attachment.provider })}
</span>
</span>
- <ExternalLink className="h-4 w-4 shrink-0 text-neutral-400" />
+ <ExternalLink className="h-4 w-4 shrink-0 text-neutral-400" aria-hidden="true" />
+ <span className="sr-only"> ({t("common.opensInNewTab")})</span>
</a>
))}
</div>
diff --git a/src/app/(drive)/drive/page.tsx b/src/app/(drive)/drive/page.tsx
index 9637e6d..9a2edc5 100644
--- a/src/app/(drive)/drive/page.tsx
+++ b/src/app/(drive)/drive/page.tsx
@@ -288,7 +288,7 @@ export default function DrivePage() {
<span className="relative hidden min-w-0 md:block">{headerButton("size", t("drive.fileSize"))}<ColumnResizeHandle column="size" width={columns.widths.size} onResize={columns.resize} label={t("drive.fileSize")} /></span>
<span />
</div>
- <div className="min-h-0 flex-1 overflow-y-auto overscroll-contain px-2 space-y-px pt-px">
+ <div role={!failed && !loading && sorted.length > 0 ? "list" : undefined} aria-label={!failed && !loading && sorted.length > 0 ? t("drive.title") : undefined} className="min-h-0 flex-1 overflow-y-auto overscroll-contain px-2 space-y-px pt-px">
{failed ? <p className="p-8 text-center text-sm text-neutral-500">{t("drive.loadFailed")}</p>
: loading ? Array.from({ length: 8 }, (_, index) => (
<div key={index} aria-hidden="true" style={gridStyle} className="grid grid-cols-[2rem_minmax(0,1fr)_2.5rem] items-center gap-x-4 px-3 py-3.5 md:grid-cols-[var(--drive-columns)]">
@@ -308,7 +308,7 @@ export default function DrivePage() {
? driveDropHandlers({ kind: "folder", id: item.id }, () => canDropDrive({ kind: "folder", id: item.id }), t, (over) => setDropFolder((current) => (over ? item.id : current === item.id ? null : current)))
: {};
return (
- <div key={item.id} style={gridStyle} draggable={isDriveDraggable(item)} onDragStart={(event) => onItemDragStart(event, item)} onDragEnd={onItemDragEnd} {...dropTarget} className={clsx("group grid grid-cols-[2rem_minmax(0,1fr)_2.5rem] items-center gap-x-4 rounded-lg px-3 text-sm md:grid-cols-[var(--drive-columns)]", dropFolder === item.id ? "bg-blue-100 ring-2 ring-inset ring-blue-500" : selectedIds.has(item.id) ? "bg-blue-50" : "hover:bg-neutral-50", movingIds.has(item.id) && "opacity-50")}>
+ <div key={item.id} role="listitem" style={gridStyle} draggable={isDriveDraggable(item)} onDragStart={(event) => onItemDragStart(event, item)} onDragEnd={onItemDragEnd} {...dropTarget} className={clsx("group grid grid-cols-[2rem_minmax(0,1fr)_2.5rem] items-center gap-x-4 rounded-lg px-3 text-sm md:grid-cols-[var(--drive-columns)]", dropFolder === item.id ? "bg-blue-100 ring-2 ring-inset ring-blue-500" : selectedIds.has(item.id) ? "bg-blue-50" : "hover:bg-neutral-50", movingIds.has(item.id) && "opacity-50")}>
<Checkbox checked={selectedIds.has(item.id)} onChange={() => toggleItem(item.id)} disabled={!selectable.includes(item)} aria-label={t("drive.selectItem", { name: item.name })} className={clsx("ml-1", !selectable.includes(item) && "invisible")} />
<button type="button" onClick={() => open(item)} aria-disabled={item.trashedAt ? true : undefined} className="flex min-w-0 items-center gap-3 py-3 text-left aria-disabled:cursor-default">
<Icon size={16} className={clsx("shrink-0", className)} fill={item.kind === "folder" ? "currentColor" : "none"} />
@@ -326,7 +326,7 @@ export default function DrivePage() {
<DropdownMenu.Content align="end" sideOffset={4} className="z-[200] min-w-52 rounded-xl border border-neutral-200 bg-white p-1.5 shadow-xl">
{!item.trashedAt && <DropdownMenu.Item className={menuItemClass} onSelect={() => open(item)}>{t("drive.open")}</DropdownMenu.Item>}
{item.kind === "file" && !(item.source && item.trashedAt) && <DropdownMenu.Item asChild className={menuItemClass}><a href={driveFileUrl(item, true)}><Download size={16} />{t("drive.download")}</a></DropdownMenu.Item>}
- {item.source && !item.trashedAt && <DropdownMenu.Item asChild className={menuItemClass}><a href={emailUrl(item.source)} target="_blank" rel="noopener noreferrer"><Mail size={16} />{t("drive.openEmail")}</a></DropdownMenu.Item>}
+ {item.source && !item.trashedAt && <DropdownMenu.Item asChild className={menuItemClass}><a href={emailUrl(item.source)} target="_blank" rel="noopener noreferrer"><Mail size={16} />{t("drive.openEmail")}<span className="sr-only"> ({t("common.opensInNewTab")})</span></a></DropdownMenu.Item>}
{item.role === "owner" && !item.trashedAt && <DropdownMenu.Item className={menuItemClass} onSelect={() => setSharing(item)}><Share2 size={16} />{t("drive.share")}</DropdownMenu.Item>}
{canEditDrive(item.role) && !item.trashedAt && <DropdownMenu.Item className={menuItemClass} onSelect={() => setNaming({ mode: "rename", item, value: item.name })}><Pencil size={16} />{t("drive.rename")}</DropdownMenu.Item>}
{item.source?.canDelete && !item.trashedAt && <DropdownMenu.Item className={menuItemClass} onSelect={() => void mutate("/api/drive/attachments", json("POST", { action: "trash", ids: [item.id] }), t("drive.trashed"))}><Trash2 size={16} />{t("drive.moveToTrash")}</DropdownMenu.Item>}
@@ -363,7 +363,7 @@ export default function DrivePage() {
<DialogTitle className="flex h-14 shrink-0 items-center justify-between gap-3 pl-5 pr-14 text-white">
<span className="truncate text-base font-medium">{preview.name}</span>
<span className="flex shrink-0 items-center gap-1">
- {preview.source && <a href={emailUrl(preview.source)} target="_blank" rel="noopener noreferrer" className="flex items-center gap-2 rounded-full px-3 py-2 text-sm hover:bg-[rgb(255_255_255/0.15)]"><Mail size={16} />{t("drive.openEmail")}<ExternalLink size={12} /></a>}
+ {preview.source && <a href={emailUrl(preview.source)} target="_blank" rel="noopener noreferrer" className="flex items-center gap-2 rounded-full px-3 py-2 text-sm hover:bg-[rgb(255_255_255/0.15)]"><Mail size={16} />{t("drive.openEmail")}<ExternalLink size={12} aria-hidden="true" /><span className="sr-only"> ({t("common.opensInNewTab")})</span></a>}
<a href={driveFileUrl(preview, true)} aria-label={t("drive.download")} className="rounded-full p-2 hover:bg-[rgb(255_255_255/0.15)]"><Download size={18} /></a>
</span>
</DialogTitle>
diff --git a/src/components/admin-update-card.tsx b/src/components/admin-update-card.tsx
index e8517d3..6baac46 100644
--- a/src/components/admin-update-card.tsx
+++ b/src/components/admin-update-card.tsx
@@ -203,6 +203,7 @@ export function AdminUpdateCard() {
{result.runUrl && (
<a className="font-medium underline" href={result.runUrl} target="_blank" rel="noreferrer">
{t("update.viewWorkflow")}
+ <span className="sr-only"> ({t("common.opensInNewTab")})</span>
</a>
)}
</p>
diff --git a/src/components/dialog-frame.tsx b/src/components/dialog-frame.tsx
new file mode 100644
index 0000000..1264c7f
--- /dev/null
+++ b/src/components/dialog-frame.tsx
@@ -0,0 +1,27 @@
+"use client";
+
+import { useRef } from "react";
+import type { HTMLAttributes, KeyboardEvent } from "react";
+import { useDialogFocus } from "./use-dialog-focus";
+
+type DialogFrameProps = Omit<HTMLAttributes<HTMLDivElement>, "role" | "onKeyDown"> & {
+ label: string;
+ onClose: () => void;
+};
+
+export function DialogFrame({ label, onClose, children, ...props }: DialogFrameProps) {
+ const ref = useRef<HTMLDivElement>(null);
+ useDialogFocus(ref);
+
+ function onKeyDown(event: KeyboardEvent<HTMLDivElement>) {
+ if (event.key !== "Escape" || event.defaultPrevented) return;
+ event.stopPropagation();
+ onClose();
+ }
+
+ return (
+ <div ref={ref} role="dialog" aria-modal="true" aria-label={label} tabIndex={-1} onKeyDown={onKeyDown} {...props}>
+ {children}
+ </div>
+ );
+}
diff --git a/src/components/settings/domain-routing/domain-routing.tsx b/src/components/settings/domain-routing/domain-routing.tsx
index 0177d87..a253c19 100644
--- a/src/components/settings/domain-routing/domain-routing.tsx
+++ b/src/components/settings/domain-routing/domain-routing.tsx
@@ -259,7 +259,7 @@ export function DomainRouting({ domain }: DomainRoutingProps = {}) {
<div className="flex items-center gap-2">
<Label htmlFor="rule-value">{t("routing.matchValue")}</Label>
<Tooltip label={t("routing.matchAllHint")}>
- <span className="text-neutral-500"><Info className="h-4 w-4" /></span>
+ <button type="button" aria-label={t("routing.matchAllHint")} className="text-neutral-500"><Info className="h-4 w-4" /></button>
</Tooltip>
</div>
<Input
@@ -274,7 +274,7 @@ export function DomainRouting({ domain }: DomainRoutingProps = {}) {
<div className="flex items-center gap-2">
<Label htmlFor="rule-priority">{t("routing.priority")}</Label>
<Tooltip label={t("routing.priorityHint")}>
- <span className="text-neutral-500"><Info className="h-4 w-4" /></span>
+ <button type="button" aria-label={t("routing.priorityHint")} className="text-neutral-500"><Info className="h-4 w-4" /></button>
</Tooltip>
</div>
<Input
@@ -329,7 +329,7 @@ export function DomainRouting({ domain }: DomainRoutingProps = {}) {
<div className="flex items-center gap-2">
<p className="text-sm font-medium">{t("routing.keepCopy")}</p>
<Tooltip label={t("routing.keepCopyHint")}>
- <span className="text-neutral-500"><Info className="h-4 w-4" /></span>
+ <button type="button" aria-label={t("routing.keepCopyHint")} className="text-neutral-500"><Info className="h-4 w-4" /></button>
</Tooltip>
</div>
</div>
@@ -398,7 +398,7 @@ function RuleSection({
<div className="flex items-center gap-2">
<CardTitle className="text-xs uppercase">{title}</CardTitle>
<Tooltip label={description}>
- <span className="text-neutral-500"><Info className="h-4 w-4" /></span>
+ <button type="button" aria-label={description} className="text-neutral-500"><Info className="h-4 w-4" /></button>
</Tooltip>
</div>
</CardHeader>
diff --git a/src/components/sidebar-aside.tsx b/src/components/sidebar-aside.tsx
index 80d1cbc..34b4e4c 100644
--- a/src/components/sidebar-aside.tsx
+++ b/src/components/sidebar-aside.tsx
@@ -2,6 +2,7 @@
import clsx from "clsx";
import { Menu } from "lucide-react";
+import { useEffect } from "react";
import type { ReactNode } from "react";
import { useSidebar } from "./sidebar-state";
import { useLanguage } from "./language-provider";
@@ -10,6 +11,17 @@ export function SidebarAside({ children, className }: { children: ReactNode; cla
const { mobile, mobileOpen, toggle } = useSidebar();
const hidden = mobile && !mobileOpen;
+ useEffect(() => {
+ if (!mobile || !mobileOpen) return;
+ function onKeyDown(event: KeyboardEvent) {
+ if (event.key !== "Escape") return;
+ toggle();
+ document.querySelector<HTMLElement>("[data-mobile-menu]")?.focus();
+ }
+ document.addEventListener("keydown", onKeyDown);
+ return () => document.removeEventListener("keydown", onKeyDown);
+ }, [mobile, mobileOpen, toggle]);
+
return (
<>
<div
@@ -38,7 +50,7 @@ export function MobileMenuButton({ className }: { className?: string }) {
const { mobile, mobileOpen, toggle } = useSidebar();
if (!mobile) return null;
return (
- <button type="button" onClick={toggle} aria-label={t("navigation.openMenu")} aria-expanded={mobileOpen} className={clsx("flex h-10 w-10 shrink-0 items-center justify-center rounded-full text-neutral-600 hover:bg-neutral-200 md:hidden", className)}>
+ <button type="button" data-mobile-menu onClick={toggle} aria-label={t("navigation.openMenu")} aria-expanded={mobileOpen} className={clsx("flex h-10 w-10 shrink-0 items-center justify-center rounded-full text-neutral-600 hover:bg-neutral-200 md:hidden", className)}>
<Menu size={20} />
</button>
);
diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json
index 686650b..c2ab972 100644
--- a/src/lib/i18n/en.json
+++ b/src/lib/i18n/en.json
@@ -41,6 +41,7 @@
"common.reportSpam": "Report spam",
"common.restore": "Restore",
"common.delete": "Delete",
+ "common.opensInNewTab": "opens in a new tab",
"common.deleteForever": "Delete forever",
"common.markRead": "Mark as read",
"common.markUnread": "Mark as unread",