Erweitere die Paperless-Suche um Suchart, weitere Filter und eine Vorschau je Treffer, damit sich das richtige Dokument finden und erkennen lässt.
Deploy Development / deploy (push) Successful in 44s
Test Suite / pytest-backend (push) Successful in 6m5s
Test Suite / smoke-dev (push) Successful in 0s
Test Suite / frontend-build (push) Successful in 22s

Standard ist jetzt Titel und Inhalt ohne Index; Titel, Inhalt und Volltextindex sind wählbar. Neue Filter: Speicherpfad, Tag-Verknüpfung (alle, eines, keines), "ohne" bei Korrespondent, Typ und Pfad, Hinzugefügt-Datum und Archivnummer. Treffer zeigen Vorschaubild, Textauszug, Tags, Typ und Seitenzahl; die Vorschaubilder laufen über den Server.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
StommerandClaude Sonnet 5.5 committed 2026-10-24 20:41:06 +02:00
1 parent 4327f5a434
commit 9089d830b3
10 files changed
+760 -185

No files matched your search

+283 -69
View File
@@ -7,7 +7,7 @@ import { NewConnector, useSourceModules } from "../sources/connector-config.jsx"
import { SourceFrame, registerSourceModule } from "../sources/registry.jsx";
const SEARCH_LIMITS = {
paperless: "Suchtext gilt für Titel und Dokumentinhalt. Zusätzlich gibt es Titel, Korrespondent, Dokumenttyp, Tags, Dokumentdatum und Sortierung.",
paperless: "Die Suche läuft in Paperless selbst, über Titel und Inhalt, den Titel allein, den Inhalt allein oder den Volltextindex. Filter nach Korrespondent, Dokumenttyp, Speicherpfad, Tags, Dokumentdatum, Hinzugefügt-Datum und Archivnummer grenzen sie ein.",
imap: "Die Suche gilt für das ganze gewählte Fach, auch über die erste Seite hinaus. Betreff, Absender und Nachrichtentext werden auf dem Server geprüft.",
};
import { formatDate } from "./content.jsx";
@@ -69,25 +69,106 @@ function paperlessLabel(item) {
return dated !== "Ohne Datum" ? `${dated} · ${item.title}` : item.title;
}
function paperlessFacts(item) {
return [
formatDate(item.document_on) !== "Ohne Datum" ? formatDate(item.document_on) : "",
item.correspondent,
item.document_type,
item.pages ? `${item.pages} ${item.pages === 1 ? "Seite" : "Seiten"}` : "",
item.asn ? `ASN ${item.asn}` : "",
].filter(Boolean);
}
const PAPERLESS_MODES = [
["title_content", "Titel und Inhalt"],
["title", "Nur Titel"],
["content", "Nur Inhalt"],
["index", "Volltextindex"],
];
const PAPERLESS_MODE_HINTS = {
title_content: "Sucht den Text im Titel und im erkannten Inhalt, wie „Titel & Inhalt“ in Paperless.",
title: "Sucht den Text nur im Titel.",
content: "Sucht den Text nur im erkannten Inhalt der Dokumente.",
index: "Der Volltextindex von Paperless findet ganze Wörter, auch mit AND, OR und Anführungszeichen, und ordnet nach Relevanz. Ein neues Dokument erscheint erst, wenn Paperless es indexiert hat.",
};
const NO_FACETS = { correspondents: [], document_types: [], storage_paths: [], tags: [] };
const EMPTY_FILTERS = {
query: "",
mode: "title_content",
title: "",
correspondent: "",
documentType: "",
storagePath: "",
tags: [],
tagMode: "all",
documentFrom: "",
documentTo: "",
addedFrom: "",
addedTo: "",
asn: "",
sort: "-created",
};
function activeFilterCount(filters) {
return [
filters.title.trim(),
filters.correspondent,
filters.documentType,
filters.storagePath,
filters.tags.length ? "tags" : "",
filters.documentFrom,
filters.documentTo,
filters.addedFrom,
filters.addedTo,
filters.asn.trim(),
].filter(Boolean).length;
}
// The thumbnail comes through the server like every other Paperless call, so the key stays there.
function PaperlessThumb({ connectorId, id }) {
const [url, setUrl] = useState("");
const [failed, setFailed] = useState(false);
useEffect(() => {
let alive = true;
let made = "";
setUrl("");
setFailed(false);
fetchBlob(`/api/v1/sources/paperless/documents/${id}/thumb?connector_id=${connectorId}`)
.then((blob) => {
if (!alive) return;
made = URL.createObjectURL(blob);
setUrl(made);
})
.catch(() => {
if (alive) setFailed(true);
});
return () => {
alive = false;
if (made) URL.revokeObjectURL(made);
};
}, [connectorId, id]);
if (url) return <img src={url} alt="" className="paperless-thumb__image" />;
return <span className="paperless-thumb__empty" aria-hidden="true">{failed ? "Kein Bild" : ""}</span>;
}
export function PaperlessPicker({ context, placement, chapterId = "", chapterTitle = "", targetLabel = "", onDone, onInserted }) {
const [filters, setFilters] = useState(EMPTY_FILTERS);
const [items, setItems] = useState([]);
const [connectors, setConnectors] = useState([]);
const [connectorId, setConnectorId] = useState("");
const [facets, setFacets] = useState({ correspondents: [], document_types: [], tags: [] });
const [facets, setFacets] = useState(NO_FACETS);
const [page, setPage] = useState(1);
const [nextPage, setNextPage] = useState(null);
const [previousPage, setPreviousPage] = useState(null);
const [total, setTotal] = useState(null);
const [searched, setSearched] = useState(false);
const [picked, setPicked] = useState(() => new Map());
const [previewKey, setPreviewKey] = useState("");
const [previewUrl, setPreviewUrl] = useState("");
const [pending, setPending] = useState(false);
const [error, setError] = useState("");
@@ -107,7 +188,7 @@ export function PaperlessPicker({ context, placement, chapterId = "", chapterTit
useEffect(() => {
if (!connectorId) {
setFacets({ correspondents: [], document_types: [], tags: [] });
setFacets(NO_FACETS);
return undefined;
}
const token = facetRef.current + 1;
@@ -115,7 +196,7 @@ export function PaperlessPicker({ context, placement, chapterId = "", chapterTit
let alive = true;
api(`/api/v1/sources/paperless/facets?connector_id=${connectorId}`)
.then((data) => {
if (alive && token === facetRef.current) setFacets(data);
if (alive && token === facetRef.current) setFacets({ ...NO_FACETS, ...data });
})
.catch((err) => {
if (alive && token === facetRef.current) setError(err.message);
@@ -129,32 +210,49 @@ export function PaperlessPicker({ context, placement, chapterId = "", chapterTit
if (previewUrl) URL.revokeObjectURL(previewUrl);
}, [previewUrl]);
function paramsFor(page) {
function paramsFor(pageNumber) {
const params = new URLSearchParams();
const text = filters.query.trim();
if (connectorId) params.set("connector_id", connectorId);
if (filters.query.trim()) params.set("q", filters.query.trim());
if (filters.title.trim()) params.set("title", filters.title.trim());
if (text) params.set("q", text);
if (text && filters.mode !== "title_content") params.set("mode", filters.mode);
// The search text already is the title in this mode.
if (filters.title.trim() && !(text && filters.mode === "title")) params.set("title", filters.title.trim());
if (filters.correspondent) params.set("correspondent", filters.correspondent);
if (filters.documentType) params.set("document_type", filters.documentType);
if (filters.tags.length) params.set("tag", filters.tags.join(","));
if (filters.storagePath) params.set("storage_path", filters.storagePath);
if (filters.tags.length) {
params.set("tag", filters.tags.join(","));
if (filters.tagMode !== "all") params.set("tag_mode", filters.tagMode);
}
if (filters.documentFrom) params.set("document_from", filters.documentFrom);
if (filters.documentTo) params.set("document_to", filters.documentTo);
if (filters.addedFrom) params.set("added_from", filters.addedFrom);
if (filters.addedTo) params.set("added_to", filters.addedTo);
if (filters.asn.trim()) params.set("asn", filters.asn.trim());
if (filters.sort === "-score") {
if (filters.query.trim()) params.set("sort", "-score");
if (text && filters.mode === "index") params.set("sort", "-score");
} else if (filters.sort) {
params.set("sort", filters.sort);
}
if (page) params.set("cursor", String(page));
if (pageNumber) params.set("cursor", String(pageNumber));
return params;
}
function closePreview() {
previewRef.current += 1;
if (previewUrl) URL.revokeObjectURL(previewUrl);
setPreviewUrl("");
setPreviewKey("");
}
function invalidate() {
searchRef.current += 1;
previewRef.current += 1;
facetRef.current += 1;
}
async function runSearch(event, page = "") {
async function runSearch(event, wanted = "") {
event?.preventDefault();
setError("");
if (connectors.length > 1 && !connectorId) {
@@ -165,10 +263,15 @@ export function PaperlessPicker({ context, placement, chapterId = "", chapterTit
searchRef.current = token;
const asked = connectorId;
try {
const data = await api(`/api/v1/sources/paperless/documents?${paramsFor(page)}`);
const data = await api(`/api/v1/sources/paperless/documents?${paramsFor(wanted)}`);
if (token !== searchRef.current) return;
closePreview();
setItems(data.items || []);
setPage(Number(wanted) || 1);
setNextPage(data.next_page || data.continuation || null);
setPreviousPage(data.previous_page || null);
setTotal(typeof data.total === "number" ? data.total : null);
setSearched(true);
if (!asked && data.connector_id) setConnectorId(data.connector_id);
} catch (err) {
if (token !== searchRef.current) return;
@@ -177,9 +280,15 @@ export function PaperlessPicker({ context, placement, chapterId = "", chapterTit
}
function resetFilters() {
invalidate();
closePreview();
setFilters(EMPTY_FILTERS);
setItems([]);
setNextPage(null);
setPreviousPage(null);
setTotal(null);
setSearched(false);
setPage(1);
}
function toggle(item) {
@@ -195,17 +304,23 @@ export function PaperlessPicker({ context, placement, chapterId = "", chapterTit
async function preview(item) {
setError("");
if (previewUrl) URL.revokeObjectURL(previewUrl);
setPreviewUrl("");
const bound = item.connector_id || connectorId;
const key = `${bound}:${item.id}`;
if (key === previewKey) {
closePreview();
return;
}
closePreview();
const token = previewRef.current + 1;
previewRef.current = token;
const bound = item.connector_id || connectorId;
setPreviewKey(key);
try {
const blob = await fetchBlob(`/api/v1/sources/paperless/documents/${item.id}/preview?connector_id=${bound}`);
if (token !== previewRef.current) return;
setPreviewUrl(URL.createObjectURL(blob));
} catch (err) {
if (token !== previewRef.current) return;
setPreviewKey("");
setError(err.message);
}
}
@@ -262,6 +377,10 @@ export function PaperlessPicker({ context, placement, chapterId = "", chapterTit
setFilters((current) => ({ ...current, [name]: value }));
}
function setMode(mode) {
setFilters((current) => ({ ...current, mode, sort: current.sort === "-score" && mode !== "index" ? "-created" : current.sort }));
}
function toggleTag(id) {
setFilters((current) => {
const tags = current.tags.includes(id) ? current.tags.filter((item) => item !== id) : [...current.tags, id];
@@ -270,6 +389,18 @@ export function PaperlessPicker({ context, placement, chapterId = "", chapterTit
}
const held = [...picked.values()].filter((item) => !items.some((entry) => `${connectorId}:${entry.id}` === `${item.connector_id}:${item.id}`));
const active = activeFilterCount(filters);
const relevance = filters.mode === "index" && filters.query.trim() !== "";
function choiceSelect(name, value, entries, empty) {
return (
<select value={value} onChange={(event) => setFilter(name, event.target.value)}>
<option value="">Alle</option>
<option value="none">{empty}</option>
{entries.map((item) => <option key={item.id} value={item.id}>{item.name}</option>)}
</select>
);
}
return (
<SourceFrame targetLabel={targetLabel} chapterId={chapterId} chapterTitle={chapterTitle}>
@@ -278,13 +409,16 @@ export function PaperlessPicker({ context, placement, chapterId = "", chapterTit
Paperless-Zugang
<select value={connectorId} onChange={(event) => {
invalidate();
if (previewUrl) URL.revokeObjectURL(previewUrl);
setPreviewUrl("");
closePreview();
setConnectorId(event.target.value);
setFilters(EMPTY_FILTERS);
setItems([]);
setNextPage(null);
setFacets({ correspondents: [], document_types: [], tags: [] });
setPreviousPage(null);
setTotal(null);
setSearched(false);
setPage(1);
setFacets(NO_FACETS);
}}>
<option value="">Zugang wählen</option>
{connectors.map((item) => (
@@ -294,57 +428,96 @@ export function PaperlessPicker({ context, placement, chapterId = "", chapterTit
</label>
) : null}
<form onSubmit={(event) => runSearch(event)} className="stack source-filters">
<label>
Suchtext in Titel und Inhalt
<input value={filters.query} onChange={(event) => setFilter("query", event.target.value)} />
</label>
<label>
Titel
<input value={filters.title} onChange={(event) => setFilter("title", event.target.value)} />
</label>
<label>
Korrespondent
<select value={filters.correspondent} onChange={(event) => setFilter("correspondent", event.target.value)}>
<option value="">Alle</option>
{facets.correspondents.map((item) => <option key={item.id} value={item.id}>{item.name}</option>)}
</select>
</label>
<label>
Dokumenttyp
<select value={filters.documentType} onChange={(event) => setFilter("documentType", event.target.value)}>
<option value="">Alle</option>
{facets.document_types.map((item) => <option key={item.id} value={item.id}>{item.name}</option>)}
</select>
</label>
<fieldset>
<legend>Tags, alle gewählten</legend>
{facets.tags.length ? facets.tags.map((item) => (
<label key={item.id} className="paperless-pick">
<input type="checkbox" checked={filters.tags.includes(item.id)} onChange={() => toggleTag(item.id)} />
<span>{item.name}</span>
<div className="paperless-search">
<label>
Suche in
<select value={filters.mode} onChange={(event) => setMode(event.target.value)}>
{PAPERLESS_MODES.map(([value, label]) => <option key={value} value={value}>{label}</option>)}
</select>
</label>
<label className="paperless-search__text">
Suchtext
<input value={filters.query} onChange={(event) => setFilter("query", event.target.value)} />
</label>
<button type="submit">Suchen</button>
</div>
<p className="muted">{PAPERLESS_MODE_HINTS[filters.mode]}</p>
<details className="paperless-more" open={active > 0 ? true : undefined}>
<summary>{active ? `Weitere Filter (${active} aktiv)` : "Weitere Filter"}</summary>
<div className="source-filters">
<label>
Titel enthält
<input value={filters.title} onChange={(event) => setFilter("title", event.target.value)} />
{filters.mode === "title" && filters.query.trim() && filters.title.trim() ? (
<span className="muted">Bei „Nur Titel“ gilt der Suchtext als Titel. Dieses Feld bleibt unberücksichtigt.</span>
) : null}
</label>
)) : <p className="muted">Keine Tags an diesem Zugang.</p>}
</fieldset>
<label>
Dokumentdatum von
<input type="date" value={filters.documentFrom} onChange={(event) => setFilter("documentFrom", event.target.value)} />
</label>
<label>
Dokumentdatum bis
<input type="date" value={filters.documentTo} onChange={(event) => setFilter("documentTo", event.target.value)} />
</label>
<label>
Korrespondent
{choiceSelect("correspondent", filters.correspondent, facets.correspondents, "Ohne Korrespondent")}
</label>
<label>
Dokumenttyp
{choiceSelect("documentType", filters.documentType, facets.document_types, "Ohne Dokumenttyp")}
</label>
<label>
Speicherpfad
{choiceSelect("storagePath", filters.storagePath, facets.storage_paths, "Ohne Speicherpfad")}
</label>
<fieldset>
<legend>Tags</legend>
<label>
Verknüpfung
<select value={filters.tagMode} onChange={(event) => setFilter("tagMode", event.target.value)}>
<option value="all">Alle gewählten Tags</option>
<option value="any">Mindestens eines der gewählten Tags</option>
<option value="none">Keines der gewählten Tags</option>
</select>
</label>
<div className="paperless-tags">
{facets.tags.length ? facets.tags.map((item) => (
<label key={item.id} className="paperless-pick">
<input type="checkbox" checked={filters.tags.includes(item.id)} onChange={() => toggleTag(item.id)} />
<span>{item.name}</span>
</label>
)) : <p className="muted">Keine Tags an diesem Zugang.</p>}
</div>
</fieldset>
<label>
Dokumentdatum von
<input type="date" value={filters.documentFrom} onChange={(event) => setFilter("documentFrom", event.target.value)} />
</label>
<label>
Dokumentdatum bis
<input type="date" value={filters.documentTo} onChange={(event) => setFilter("documentTo", event.target.value)} />
</label>
<label>
Hinzugefügt von
<input type="date" value={filters.addedFrom} onChange={(event) => setFilter("addedFrom", event.target.value)} />
</label>
<label>
Hinzugefügt bis
<input type="date" value={filters.addedTo} onChange={(event) => setFilter("addedTo", event.target.value)} />
</label>
<label>
Archivnummer (ASN)
<input inputMode="numeric" value={filters.asn} onChange={(event) => setFilter("asn", event.target.value)} />
</label>
</div>
</details>
<label>
Sortierung
<select value={filters.sort} onChange={(event) => setFilter("sort", event.target.value)}>
<option value="-created">Dokumentdatum, neueste zuerst</option>
<option value="created">Dokumentdatum, älteste zuerst</option>
<option value="-added">Hinzugefügt, neueste zuerst</option>
<option value="added">Hinzugefügt, älteste zuerst</option>
<option value="title">Titel aufsteigend</option>
<option value="-title">Titel absteigend</option>
<option value="-score" disabled={!filters.query.trim()}>Relevanz zum Suchtext</option>
<option value="-score" disabled={!relevance}>Relevanz (nur Volltextindex mit Suchtext)</option>
</select>
</label>
<div className="row">
<button type="submit">Suchen</button>
<button type="button" className="quiet" onClick={resetFilters}>Filter zurücksetzen</button>
</div>
</form>
@@ -356,7 +529,13 @@ export function PaperlessPicker({ context, placement, chapterId = "", chapterTit
{picked.size ? `${picked.size} Belege einfügen` : "Belege auswählen"}
</button>
) : null}
{previewUrl ? <DocumentView title="Paperless-Vorschau" url={previewUrl} /> : null}
{searched ? (
<p className="muted" role="status">
{items.length
? `${total !== null ? `${total} Treffer` : "Treffer"}, Seite ${page}`
: "Dazu gibt es in Paperless keinen Treffer."}
</p>
) : null}
<div className="stack">
{held.map((item) => (
<div key={`held-${item.connector_id}:${item.id}`} className="paperless-pick">
@@ -366,17 +545,52 @@ export function PaperlessPicker({ context, placement, chapterId = "", chapterTit
</label>
</div>
))}
{items.map((item) => (
<div key={`${connectorId}:${item.id}`} className="paperless-pick">
<label>
<input type="checkbox" checked={picked.has(`${connectorId}:${item.id}`)} disabled={pending} onChange={() => toggle(item)} />
<span>{paperlessLabel(item)}</span>
</label>
<button type="button" className="quiet" onClick={() => preview(item)}>Ansehen</button>
</div>
))}
{items.map((item) => {
const key = `${connectorId}:${item.id}`;
const open = previewKey === key;
const facts = paperlessFacts(item);
return (
<article key={key} className={open ? "paperless-card is-open" : "paperless-card"}>
<input
type="checkbox"
checked={picked.has(key)}
disabled={pending}
onChange={() => toggle(item)}
aria-label={`${item.title} auswählen`}
/>
<button type="button" className="paperless-thumb" onClick={() => preview(item)} aria-label={`${item.title} ansehen`}>
<PaperlessThumb connectorId={connectorId} id={item.id} />
</button>
<div className="paperless-card__body">
<strong>{item.title}</strong>
{facts.length ? <span className="paperless-card__facts">{facts.join(" · ")}</span> : null}
{item.tags?.length ? (
<ul className="paperless-card__tags" aria-label="Tags">
{item.tags.map((tag) => <li key={tag}>{tag}</li>)}
</ul>
) : null}
{item.snippet ? <p className="paperless-card__snippet">{item.snippet}</p> : null}
<div className="row">
<button type="button" className="quiet" onClick={() => preview(item)} aria-expanded={open}>
{open ? "Ansicht schließen" : "Ansehen"}
</button>
</div>
</div>
{open ? (
<div className="paperless-card__view">
{previewUrl ? <DocumentView title={`Paperless-Vorschau: ${item.title}`} url={previewUrl} /> : <p className="muted">Vorschau wird geladen …</p>}
</div>
) : null}
</article>
);
})}
</div>
{nextPage ? <button type="button" onClick={(event) => runSearch(event, nextPage)}>Weitere Treffer</button> : null}
{previousPage || nextPage ? (
<div className="row">
{previousPage ? <button type="button" className="quiet" onClick={(event) => runSearch(event, previousPage)}>Vorherige Treffer</button> : null}
{nextPage ? <button type="button" onClick={(event) => runSearch(event, nextPage)}>Weitere Treffer</button> : null}
</div>
) : null}
</SourceFrame>
);
}
@@ -35,13 +35,19 @@ const OPERATIONS = [
const SEARCH_FILTERS = [
["query", "Suchtext"],
["mode", "Suchart (Titel und Inhalt, Titel, Inhalt, Volltextindex)"],
["title", "Titel"],
["correspondent", "Korrespondent"],
["document_type", "Dokumenttyp"],
["storage_path", "Speicherpfad"],
["tags", "Tags"],
["tag_mode", "Tag-Verknüpfung (alle, mindestens eines, keines)"],
["document_range", "Dokumentdatum"],
["added_range", "Hinzugefügt am"],
["asn", "Archivnummer"],
["sort", "Sortierung"],
["continuation", "Weitere Seiten"],
["result_preview", "Vorschaubild und Textauszug je Treffer"],
];
function Availability({ items, source }) {
+49
View File
@@ -1718,6 +1718,55 @@ button.pick-tree__twist {
.note-source__bar { display: flex; flex-wrap: wrap; gap: 6px; }
.note-source textarea { width: 100%; min-height: 8rem; }
.source-filters { display: grid; gap: 8px; }
.paperless-search { display: grid; grid-template-columns: minmax(9rem, 12rem) minmax(0, 1fr) auto; gap: 8px; align-items: end; }
.paperless-more > summary { cursor: pointer; font-weight: 600; min-height: 32px; }
.paperless-tags { display: grid; gap: 2px; max-height: 12rem; overflow: auto; }
.paperless-card {
display: grid;
grid-template-columns: auto 5rem minmax(0, 1fr);
gap: 4px 10px;
align-items: start;
padding: 10px 2px;
border-top: 1px solid var(--border);
}
.paperless-card > input { width: 20px; min-width: 20px; min-height: 20px; margin-top: 2px; }
.paperless-card.is-open { background: var(--accent-light); }
.paperless-card__body { display: grid; gap: 4px; min-width: 0; }
.paperless-card__body strong { overflow-wrap: anywhere; }
.paperless-card__facts { color: var(--text2); font-size: 13px; }
.paperless-card__snippet {
display: -webkit-box;
margin: 0;
overflow: hidden;
color: var(--text2);
font-size: 13px;
line-height: 1.4;
overflow-wrap: anywhere;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
.paperless-card__tags { display: flex; flex-wrap: wrap; gap: 4px; margin: 0; padding: 0; list-style: none; }
.paperless-card__tags li { padding: 0 8px; border-radius: 999px; background: var(--surface2); color: var(--text2); font-size: 12px; }
.paperless-card__view { grid-column: 1 / -1; }
.paperless-thumb {
display: grid;
place-items: center;
width: 5rem;
min-width: 5rem;
min-height: 6.5rem;
padding: 0;
overflow: hidden;
border: 1px solid var(--border);
border-radius: 4px;
background: var(--surface2);
}
.paperless-thumb__image { display: block; width: 100%; height: 100%; object-fit: cover; object-position: top; }
.paperless-thumb__empty { color: var(--text3); font-size: 11px; }
@media (max-width: 600px) {
.paperless-search { grid-template-columns: minmax(0, 1fr); }
.paperless-card { grid-template-columns: auto 4rem minmax(0, 1fr); }
.paperless-thumb { width: 4rem; min-width: 4rem; min-height: 5.5rem; }
}
.markdown pre, .markdown blockquote { margin: 0.4em 0; }
.markdown blockquote { border-left: 3px solid var(--border2); padding-left: 10px; }
.markdown pre { overflow: auto; padding: 8px; background: var(--surface2); border-radius: 6px; }