feat(persons): show merge panel inline on edit page, remove Gefahrenzone accordion

Closes #342. The PersonDangerZone collapsible wrapper is removed; PersonMergePanel
is now rendered directly in the edit page with its own red border (border-red-200),
preserving the {#key person.id} state-reset behaviour and the two-step merge flow.

Fix PersonTypeahead mock to use Svelte 5 functional stub (not Svelte 3/4 $$ internals).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

frontend/eslint.config.js

@@ -40,6 +40,26 @@ export default defineConfig(
 				parser: ts.parser,
 				svelteConfig
 			}
+		},
+		rules: {
+			// text-accent resolves to #a1dcd8 in light mode (1.52:1 on white — WCAG fail).
+			// layout.css documents it as decorative-only (borders, icon tints, bg fills).
+			// For any text label use text-primary or text-ink instead. This rule catches
+			// the pattern where text-accent appears inside a JavaScript string literal
+			// (e.g. conditional ternary class expressions in Svelte templates).
+			'no-restricted-syntax': [
+				'error',
+				{
+					selector: 'Literal[value=/\\btext-accent\\b/]',
+					message:
+						'text-accent is decorative-only (#a1dcd8 in light mode = 1.52:1 contrast — WCAG fail). Use text-primary or text-ink-2 for text labels.'
+				},
+				{
+					selector: 'TemplateLiteral > TemplateElement[value.raw=/\\btext-accent\\b/]',
+					message:
+						'text-accent is decorative-only (#a1dcd8 in light mode = 1.52:1 contrast — WCAG fail). Use text-primary or text-ink-2 for text labels.'
+				}
+			]
 		}
 	}
 );

frontend/messages/de.json

@@ -818,6 +818,7 @@
 	"pagination_next": "Weiter",
 	"pagination_page_of": "Seite {page} von {total}",
 	"pagination_nav_label": "Seitennavigation",
+	"pagination_page_button": "Seite {page}",
 
 	"common_opens_new_tab": "(öffnet in neuem Tab)",
 

frontend/messages/en.json

@@ -818,6 +818,7 @@
 	"pagination_next": "Next",
 	"pagination_page_of": "Page {page} of {total}",
 	"pagination_nav_label": "Pagination",
+	"pagination_page_button": "Page {page}",
 
 	"common_opens_new_tab": "(opens in new tab)",
 

frontend/messages/es.json

@@ -818,6 +818,7 @@
 	"pagination_next": "Siguiente",
 	"pagination_page_of": "Página {page} de {total}",
 	"pagination_nav_label": "Paginación",
+	"pagination_page_button": "Página {page}",
 
 	"common_opens_new_tab": "(abre en pestaña nueva)",
 

frontend/src/lib/components/Pagination.svelte

@@ -20,6 +20,48 @@ const controlBase =
 	'inline-flex min-h-[44px] min-w-[44px] items-center justify-center gap-1.5 rounded-sm border border-line bg-white px-4 py-2 font-sans text-sm font-bold text-ink';
 const linkBase = `${controlBase} transition-colors hover:bg-surface focus-visible:ring-2 focus-visible:ring-brand-navy focus-visible:ring-offset-2 focus-visible:outline-none`;
 const disabledBase = `${controlBase} cursor-not-allowed opacity-40`;
+const activePageBase =
+	'inline-flex min-h-[44px] min-w-[44px] items-center justify-center rounded-sm border border-brand-navy bg-brand-navy px-4 py-2 font-sans text-sm font-bold text-white';
+
+/**
+ * Builds the sliding window of 1-indexed page numbers to render as buttons.
+ * Always shows: first, last, current, one neighbor each side.
+ * null entries represent ellipsis gaps.
+ */
+const pageWindow = $derived.by(() => {
+	const first = 1;
+	const last = totalPages;
+	const current = page + 1; // convert to 1-indexed
+
+	const windowStart = Math.max(first, current - 1);
+	const windowEnd = Math.min(last, current + 1);
+
+	const result: (number | null)[] = [];
+
+	result.push(first);
+
+	if (windowStart > first + 2) {
+		result.push(null); // left ellipsis
+	} else if (windowStart === first + 2) {
+		result.push(first + 1); // bridge: one page gap, show directly instead of ellipsis
+	}
+
+	for (let p = Math.max(windowStart, first + 1); p <= Math.min(windowEnd, last - 1); p++) {
+		result.push(p);
+	}
+
+	if (windowEnd < last - 2) {
+		result.push(null); // right ellipsis
+	} else if (windowEnd === last - 2) {
+		result.push(last - 1); // bridge: one page gap, show directly instead of ellipsis
+	}
+
+	if (last > first) {
+		result.push(last);
+	}
+
+	return result;
+});
 </script>
 
 {#if totalPages > 1}
@@ -52,13 +94,60 @@ const disabledBase = `${controlBase} cursor-not-allowed opacity-40`;
 			</span>
 		{/if}
 
+		<!-- Mobile: "Seite X von Y" label (hidden on sm: and above) -->
+		<!-- aria-hidden: decorative visual label; AT uses the sr-only span below for aria-current -->
 		<span
 			data-testid="pagination-page-label"
-			aria-current="page"
+			aria-hidden="true"
-			class="font-sans text-sm text-ink-2"
+			class="font-sans text-sm text-ink-2 sm:hidden"
 		>
 			{m.pagination_page_of({ page: page + 1, total: totalPages })}
 		</span>
+		<!-- Always in the AT tree: announces current page regardless of breakpoint.
+		     On mobile, the desktop button container is display:none so this is the only AT anchor.
+		     On desktop, the active page button also carries aria-current — both announce the same info. -->
+		<span data-testid="pagination-current-page-sr" aria-current="page" class="sr-only">
+			{m.pagination_page_of({ page: page + 1, total: totalPages })}
+		</span>
+
+		<!-- Desktop: numbered page buttons (hidden below sm:) -->
+		<div data-testid="pagination-pages" class="hidden items-center gap-1 sm:flex">
+			{#each pageWindow as entry, i (entry === null ? 'ellipsis-' + i : entry)}
+				{#if entry === null}
+					{#if i === 1}
+						<span
+							data-testid="pagination-ellipsis-left"
+							aria-hidden="true"
+							class="px-2 text-sm text-ink-2">…</span
+						>
+					{:else}
+						<span
+							data-testid="pagination-ellipsis-right"
+							aria-hidden="true"
+							class="px-2 text-sm text-ink-2">…</span
+						>
+					{/if}
+				{:else if entry === page + 1}
+					<span
+						data-testid="pagination-page-{entry}"
+						aria-current="page"
+						aria-label={m.pagination_page_button({ page: entry })}
+						class={activePageBase}
+					>
+						{entry}
+					</span>
+				{:else}
+					<a
+						data-testid="pagination-page-{entry}"
+						aria-label={m.pagination_page_button({ page: entry })}
+						href={makeHref(entry - 1)}
+						class={linkBase}
+					>
+						{entry}
+					</a>
+				{/if}
+			{/each}
+		</div>
 
 		{#if hasNext}
 			<a

frontend/src/lib/components/Pagination.svelte.spec.ts

@@ -19,11 +19,145 @@ describe('Pagination', () => {
 		await expect.element(label).toHaveTextContent(/10/);
 	});
 
-	it('marks the current page label with aria-current="page"', async () => {
+	it('mobile page label is aria-hidden (desktop buttons carry the aria-current role)', async () => {
 		render(Pagination, { page: 0, totalPages: 3, makeHref });
 
 		const label = page.getByTestId('pagination-page-label');
-		await expect.element(label).toHaveAttribute('aria-current', 'page');
+		await expect.element(label).toHaveAttribute('aria-hidden', 'true');
+	});
+
+	describe('page number buttons', () => {
+		it('renders page number buttons when totalPages > 1', async () => {
+			render(Pagination, { page: 4, totalPages: 12, makeHref });
+
+			const nav = page.getByRole('navigation');
+			// active page button — the current page (5, 1-indexed)
+			const activeBtn = nav.getByTestId('pagination-page-5');
+			await expect.element(activeBtn).toBeInTheDocument();
+		});
+
+		it('does not render page number buttons when totalPages <= 1', async () => {
+			render(Pagination, { page: 0, totalPages: 1, makeHref });
+
+			// entire nav is hidden
+			const nav = page.getByRole('navigation');
+			await expect.element(nav).not.toBeInTheDocument();
+		});
+
+		it('marks the active page button with aria-current="page"', async () => {
+			render(Pagination, { page: 4, totalPages: 12, makeHref });
+
+			const nav = page.getByRole('navigation');
+			const activeBtn = nav.getByTestId('pagination-page-5');
+			await expect.element(activeBtn).toHaveAttribute('aria-current', 'page');
+		});
+
+		it('active page button has brand-navy background', async () => {
+			render(Pagination, { page: 4, totalPages: 12, makeHref });
+
+			const nav = page.getByRole('navigation');
+			const activeBtn = nav.getByTestId('pagination-page-5');
+			await expect.element(activeBtn).toHaveClass(/bg-brand-navy/);
+		});
+
+		it('active page button has 44px touch target', async () => {
+			render(Pagination, { page: 4, totalPages: 12, makeHref });
+
+			const nav = page.getByRole('navigation');
+			const activeBtn = nav.getByTestId('pagination-page-5');
+			await expect.element(activeBtn).toHaveClass(/min-h-\[44px\]/);
+			await expect.element(activeBtn).toHaveClass(/min-w-\[44px\]/);
+		});
+
+		it('inactive page buttons link to their target page via makeHref', async () => {
+			const spy = vi.fn(makeHref);
+			render(Pagination, { page: 4, totalPages: 12, makeHref: spy });
+
+			const nav = page.getByRole('navigation');
+			// page button for page 1 (0-indexed: 0) should link to /documents?page=0
+			const firstPageBtn = nav.getByTestId('pagination-page-1');
+			await expect.element(firstPageBtn).toHaveAttribute('href', '/documents?page=0');
+		});
+
+		it('renders first and last page buttons always visible', async () => {
+			render(Pagination, { page: 5, totalPages: 12, makeHref });
+
+			const nav = page.getByRole('navigation');
+			await expect.element(nav.getByTestId('pagination-page-1')).toBeInTheDocument();
+			await expect.element(nav.getByTestId('pagination-page-12')).toBeInTheDocument();
+		});
+
+		it('renders ellipsis span between first page and window when gap exists', async () => {
+			// page 6 (0-indexed: 5) — window is 5,6,7 — gap between 1 and 5
+			render(Pagination, { page: 5, totalPages: 12, makeHref });
+
+			const nav = page.getByRole('navigation');
+			const ellipses = nav.getByTestId('pagination-ellipsis-left');
+			await expect.element(ellipses).toBeInTheDocument();
+		});
+
+		it('renders ellipsis span between window and last page when gap exists', async () => {
+			// page 1 (0-indexed: 0) — window is 1,2 — gap between 2 and 12
+			render(Pagination, { page: 0, totalPages: 12, makeHref });
+
+			const nav = page.getByRole('navigation');
+			const ellipsis = nav.getByTestId('pagination-ellipsis-right');
+			await expect.element(ellipsis).toBeInTheDocument();
+		});
+
+		it('does not render left ellipsis when window is adjacent to first page', async () => {
+			// page 1 (0-indexed: 0) — window starts at 1, adjacent to first page
+			render(Pagination, { page: 0, totalPages: 12, makeHref });
+
+			const nav = page.getByRole('navigation');
+			const leftEllipsis = nav.getByTestId('pagination-ellipsis-left');
+			await expect.element(leftEllipsis).not.toBeInTheDocument();
+		});
+
+		it('does not render right ellipsis when window is adjacent to last page', async () => {
+			// last page (0-indexed: 11) — window ends at 12, adjacent to last page
+			render(Pagination, { page: 11, totalPages: 12, makeHref });
+
+			const nav = page.getByRole('navigation');
+			const rightEllipsis = nav.getByTestId('pagination-ellipsis-right');
+			await expect.element(rightEllipsis).not.toBeInTheDocument();
+		});
+
+		it('page buttons container has hidden class on mobile (sm: prefix)', async () => {
+			// The page buttons container must be hidden below sm: breakpoint
+			render(Pagination, { page: 4, totalPages: 12, makeHref });
+
+			const nav = page.getByRole('navigation');
+			const pageButtons = nav.getByTestId('pagination-pages');
+			await expect.element(pageButtons).toHaveClass(/hidden/);
+			await expect.element(pageButtons).toHaveClass(/sm:flex/);
+		});
+
+		it('renders both pages without ellipsis when totalPages is 2', async () => {
+			render(Pagination, { page: 0, totalPages: 2, makeHref });
+
+			const nav = page.getByRole('navigation');
+			await expect.element(nav.getByTestId('pagination-page-1')).toBeInTheDocument();
+			await expect.element(nav.getByTestId('pagination-page-2')).toBeInTheDocument();
+			await expect.element(nav.getByTestId('pagination-ellipsis-left')).not.toBeInTheDocument();
+			await expect.element(nav.getByTestId('pagination-ellipsis-right')).not.toBeInTheDocument();
+		});
+	});
+
+	it('mobile page label is aria-hidden so screen readers skip it on wide screens', async () => {
+		render(Pagination, { page: 2, totalPages: 10, makeHref });
+
+		const label = page.getByTestId('pagination-page-label');
+		await expect.element(label).toHaveAttribute('aria-hidden', 'true');
+	});
+
+	it('sr-only span always provides aria-current="page" for screen readers at all breakpoints', async () => {
+		render(Pagination, { page: 2, totalPages: 10, makeHref });
+
+		const nav = page.getByRole('navigation');
+		const srLabel = nav.getByTestId('pagination-current-page-sr');
+		await expect.element(srLabel).toBeInTheDocument();
+		await expect.element(srLabel).toHaveAttribute('aria-current', 'page');
 	});
 
 	it('renders prev as a link pointing at page - 1 when not on first page', async () => {

frontend/src/lib/components/PdfControls.svelte

@@ -91,7 +91,7 @@ let {
 			aria-label={showAnnotations ? m.pdf_annotations_hide() : m.pdf_annotations_show()}
 			class="flex items-center gap-1.5 rounded px-2 py-1 font-sans text-xs transition {showAnnotations
 				? 'text-ink-2 hover:bg-surface/10'
-				: 'bg-surface/10 text-accent'}"
+				: 'bg-surface/10 text-primary'}"
 		>
 			<svg
 				class="h-3.5 w-3.5 shrink-0"

frontend/src/lib/components/PdfControls.svelte.spec.ts

@@ -0,0 +1,67 @@
+import { vi, describe, it, expect, afterEach } from 'vitest';
+import { cleanup, render } from 'vitest-browser-svelte';
+import { page } from 'vitest/browser';
+
+import PdfControls from './PdfControls.svelte';
+
+afterEach(cleanup);
+
+const defaultProps = {
+	currentPage: 1,
+	totalPages: 3,
+	isLoaded: true,
+	showAnnotations: false,
+	annotationCount: 0,
+	onPrev: vi.fn(),
+	onNext: vi.fn(),
+	onZoomIn: vi.fn(),
+	onZoomOut: vi.fn(),
+	onToggleAnnotations: vi.fn()
+};
+
+describe('PdfControls — annotation toggle visibility', () => {
+	it('renders annotation toggle when annotationCount is greater than zero', async () => {
+		render(PdfControls, { ...defaultProps, annotationCount: 3 });
+		await expect
+			.element(page.getByRole('button', { name: /annotierungen anzeigen/i }))
+			.toBeInTheDocument();
+	});
+
+	it('does not render annotation toggle when annotationCount is zero', async () => {
+		render(PdfControls, { ...defaultProps, annotationCount: 0 });
+		await expect
+			.element(page.getByRole('button', { name: /annotierungen/i }))
+			.not.toBeInTheDocument();
+	});
+});
+
+describe('PdfControls — annotation toggle label', () => {
+	it('shows "Annotierungen anzeigen" label when annotations are hidden', async () => {
+		render(PdfControls, { ...defaultProps, annotationCount: 2, showAnnotations: false });
+		const btn = page.getByRole('button', { name: /annotierungen anzeigen/i });
+		await expect.element(btn).toBeInTheDocument();
+	});
+
+	it('shows "Annotierungen verbergen" label when annotations are visible', async () => {
+		render(PdfControls, { ...defaultProps, annotationCount: 2, showAnnotations: true });
+		const btn = page.getByRole('button', { name: /annotierungen verbergen/i });
+		await expect.element(btn).toBeInTheDocument();
+	});
+});
+
+describe('PdfControls — annotation toggle contrast (WCAG 2.1 AA)', () => {
+	it('uses text-primary class on annotation toggle button when annotations are hidden', async () => {
+		const { container } = render(PdfControls, {
+			...defaultProps,
+			annotationCount: 2,
+			showAnnotations: false
+		});
+		const allButtons = container.querySelectorAll('button');
+		const annotationBtn = Array.from(allButtons).find((b) =>
+			b.getAttribute('aria-label')?.toLowerCase().includes('annotierungen')
+		);
+		expect(annotationBtn).not.toBeNull();
+		expect(annotationBtn!.className).toContain('text-primary');
+		expect(annotationBtn!.className).not.toContain('text-accent');
+	});
+});

frontend/src/lib/components/ProgressRing.svelte

@@ -19,7 +19,7 @@ let { percentage }: { percentage: number } = $props();
 		/>
 	</svg>
 	<span
-		class="block text-center font-sans text-xs font-bold {percentage > 0 ? 'text-accent' : 'text-gray-400'}"
+		class="block text-center font-sans text-xs font-bold {percentage > 0 ? 'text-primary' : 'text-gray-400'}"
 	>
 		{percentage}%
 	</span>

frontend/src/lib/components/ProgressRing.svelte.spec.ts

@@ -25,12 +25,12 @@ describe('ProgressRing', () => {
 		expect(el.className).toContain('text-gray-400');
 	});
 
-	it('renders a mint-colored label when percentage is > 0', async () => {
+	it('renders a primary-colored label when percentage is > 0', async () => {
 		render(ProgressRing, { percentage: 75 });
 		const label = page.getByText('75%');
 		await expect.element(label).toBeInTheDocument();
 		const el = (await label.element()) as HTMLElement;
-		expect(el.className).toContain('text-accent');
+		expect(el.className).toContain('text-primary');
 	});
 
 	it('renders a fully filled arc for 100%', async () => {

frontend/src/routes/persons/[id]/PersonMergePanel.svelte

@@ -15,7 +15,7 @@ let mergeTargetId = $state('');
 let showMergeConfirm = $state(false);
 </script>
 
-<div class="mb-10 overflow-hidden rounded-sm border border-line bg-surface shadow-sm">
+<div class="mb-10 overflow-hidden rounded-sm border border-red-200 bg-surface shadow-sm">
 	<div class="p-6 md:p-8">
 		<h2 class="mb-1 font-serif text-lg text-ink">{m.person_merge_heading()}</h2>
 		<p class="mb-5 font-sans text-sm text-ink-2">

frontend/src/routes/persons/[id]/PersonMergePanel.svelte.spec.ts

@@ -0,0 +1,55 @@
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import { cleanup, render } from 'vitest-browser-svelte';
+import { page } from 'vitest/browser';
+import PersonMergePanel from './PersonMergePanel.svelte';
+
+vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
+vi.mock('$lib/components/PersonTypeahead.svelte', () => ({
+	default: () => null
+}));
+
+afterEach(cleanup);
+
+const makePerson = (overrides = {}) => ({
+	displayName: 'Hans Müller',
+	...overrides
+});
+
+// ─── Danger indicator ────────────────────────────────────────────────────────
+
+describe('PersonMergePanel — danger indicator', () => {
+	it('renders outer container with red border class', () => {
+		const { container } = render(PersonMergePanel, {
+			props: { person: makePerson(), form: null }
+		});
+		const panel = container.firstElementChild as HTMLElement;
+		expect(panel?.classList.contains('border-red-200')).toBe(true);
+	});
+});
+
+// ─── Initial state ────────────────────────────────────────────────────────────
+
+describe('PersonMergePanel — initial state', () => {
+	it('renders merge heading', async () => {
+		render(PersonMergePanel, { props: { person: makePerson(), form: null } });
+		const heading = page.getByRole('heading', { level: 2 });
+		await expect.element(heading).toBeInTheDocument();
+	});
+
+	it('merge button is disabled when no target selected', async () => {
+		render(PersonMergePanel, { props: { person: makePerson(), form: null } });
+		const mergeBtn = page.getByRole('button', { name: /zusammenführen/i });
+		await expect.element(mergeBtn).toBeDisabled();
+	});
+});
+
+// ─── Error state ──────────────────────────────────────────────────────────────
+
+describe('PersonMergePanel — error state', () => {
+	it('renders mergeError when form contains error', async () => {
+		render(PersonMergePanel, {
+			props: { person: makePerson(), form: { mergeError: 'Zielperson nicht gefunden.' } }
+		});
+		await expect.element(page.getByText('Zielperson nicht gefunden.')).toBeInTheDocument();
+	});
+});

frontend/src/routes/persons/[id]/edit/+page.svelte

@@ -5,7 +5,7 @@ import BackButton from '$lib/components/BackButton.svelte';
 import PersonEditForm from './PersonEditForm.svelte';
 import PersonEditSaveBar from './PersonEditSaveBar.svelte';
 import NameHistoryEditCard from './NameHistoryEditCard.svelte';
-import PersonDangerZone from './PersonDangerZone.svelte';
+import PersonMergePanel from '../PersonMergePanel.svelte';
 
 let { data, form } = $props();
 const person = $derived(data.person);
@@ -35,7 +35,9 @@ const person = $derived(data.person);
 
 	<NameHistoryEditCard aliases={data.aliases} canWrite={true} aliasError={form?.aliasError} />
 
-	<PersonDangerZone person={person} form={form} />
+	{#key person.id}
+		<PersonMergePanel person={person} form={form} />
+	{/key}
 
 	<PersonEditSaveBar discardHref="/persons/{person.id}" formId="person-edit-form" />
 </div>

frontend/src/routes/persons/[id]/edit/PersonDangerZone.svelte

@@ -1,44 +0,0 @@
-<script lang="ts">
-import { m } from '$lib/paraglide/messages.js';
-import PersonMergePanel from '../PersonMergePanel.svelte';
-
-let {
-	person,
-	form
-}: {
-	person: { id: string; firstName?: string | null; lastName: string; displayName: string };
-	form?: { mergeError?: string } | null;
-} = $props();
-
-let open = $state(false);
-</script>
-
-<div class="mt-8 overflow-hidden rounded-sm border border-red-200 bg-surface shadow-sm">
-	<button
-		type="button"
-		onclick={() => (open = !open)}
-		class="flex w-full items-center justify-between px-6 py-4 text-left"
-		aria-expanded={open}
-	>
-		<span class="text-sm font-bold tracking-widest text-red-600 uppercase">
-			{m.person_danger_zone_heading()}
-		</span>
-		<svg
-			class="h-4 w-4 text-red-400 transition-transform {open ? 'rotate-180' : ''}"
-			fill="none"
-			stroke="currentColor"
-			viewBox="0 0 24 24"
-			aria-hidden="true"
-		>
-			<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
-		</svg>
-	</button>
-
-	{#if open}
-		<div class="border-t border-red-100 px-6 py-4">
-			{#key person.id}
-				<PersonMergePanel person={person} form={form} />
-			{/key}
-		</div>
-	{/if}
-</div>