From a0cb3ff091db5aa09841e0f1dcdbbb94370f9204 Mon Sep 17 00:00:00 2001
From: Thazzr <22547926+Thazzr@users.noreply.github.com>
Date: Sat, 14 Nov 2026 19:32:26 +0000
Subject: [PATCH 1/3] fix(icons): hochgeladene SVG-Symbole nehmen die Textfarbe
an
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Ursache (Rückmeldung vom Spiegel): Ein hochgeladenes SVG mit
fill="currentColor" erschien schwarz statt weiß. Hochgeladene Symbole
wurden als
eingebunden; ein SVG im
erbt die Textfarbe nie,
currentColor wird dort schwarz.
Lösung: Hochgeladene SVGs werden als CSS-Maske gezeichnet, gefüllt mit
currentColor (MaskIcon) – weiß am Spiegel, in der Schriftfarbe der
Verwaltung. Es wird kein SVG-Code in die Seite eingefügt. PNGs bleiben
. Der Server liefert dafür bei Upload-Symbolen contentType mit
(IconRef.contentType, nur in Antworten).
Prüfung: Go-Tests (contentType in Einstellungen, Dashboard, Schichten,
Vorschau; unbekannte Id ohne), Web-Tests (Maske bei SVG,
bei PNG
und ohne contentType, Verwaltung); Gegenproben schlagen an; Screenshot
mit currentColor-SVG am Spiegel und in der Verwaltung; npm run verify
-- --race grün, Web-Suite auch unter Node 24.
Co-Authored-By: Claude Opus 5.5
Claude-Session: https://claude.ai/code/session_01BbBgi6nWM5aU7VDrf62V1r
---
api/openapi.yaml | 3 +
server/internal/api/api.gen.go | 3 +
server/internal/api/calendar.go | 41 +++++----
server/internal/api/calendaricon_test.go | 89 +++++++++++++++++++
.../features/admin/components/IconPicker.tsx | 20 +++--
web/src/features/admin/icons.test.tsx | 27 +++++-
web/src/features/admin/pages/IconsPage.tsx | 7 +-
web/src/features/modules/calendar/Icon.tsx | 7 +-
.../features/modules/calendar/Widget.test.tsx | 25 ++++++
.../features/modules/calendar/calendar.css | 1 +
web/src/shared/MaskIcon.tsx | 24 +++++
web/src/shared/api/schema.gen.ts | 2 +
12 files changed, 224 insertions(+), 25 deletions(-)
create mode 100644 server/internal/api/calendaricon_test.go
create mode 100644 web/src/shared/MaskIcon.tsx
diff --git a/api/openapi.yaml b/api/openapi.yaml
index db95e22..08f50aa 100644
--- a/api/openapi.yaml
+++ b/api/openapi.yaml
@@ -1640,6 +1640,9 @@ components:
file:
type: string
description: Id of an uploaded icon, for kind `upload`.
+ contentType:
+ type: string
+ description: Set by the server for kind `upload` in responses (for example `image/svg+xml`, `image/png`); ignored on input.
Icon:
type: object
description: An uploaded icon.
diff --git a/server/internal/api/api.gen.go b/server/internal/api/api.gen.go
index 13bb563..abe6861 100644
--- a/server/internal/api/api.gen.go
+++ b/server/internal/api/api.gen.go
@@ -842,6 +842,9 @@ type IconContentType string
// IconRef A symbol - a Bootstrap icon by name, an uploaded file by icon id, or none.
type IconRef struct {
+ // ContentType Set by the server for kind `upload` in responses (for example `image/svg+xml`, `image/png`); ignored on input.
+ ContentType *string `json:"contentType,omitempty"`
+
// File Id of an uploaded icon, for kind `upload`.
File *string `json:"file,omitempty"`
Kind IconRefKind `json:"kind"`
diff --git a/server/internal/api/calendar.go b/server/internal/api/calendar.go
index 0651abc..18a88be 100644
--- a/server/internal/api/calendar.go
+++ b/server/internal/api/calendar.go
@@ -10,14 +10,23 @@ import (
"github.com/thazzr/mirrornextgen/server/internal/settings"
)
-func iconRefOut(kind, name, file string) IconRef {
+// iconRefOut builds the response form of an icon reference. For an upload the
+// content type comes from the icon store, so the client can tell an SVG (drawn
+// in the text colour) from a PNG; an unknown id leaves it empty.
+func (s *Server) iconRefOut(kind, name, file string) IconRef {
if kind == "" {
kind = string(None)
}
- return IconRef{Kind: IconRefKind(kind), Name: optional(name), File: optional(file)}
+ ref := IconRef{Kind: IconRefKind(kind), Name: optional(name), File: optional(file)}
+ if kind == string(Upload) && file != "" && s.icons != nil {
+ if ic, ok := s.icons.Get(file); ok {
+ ref.ContentType = optional(ic.ContentType)
+ }
+ }
+ return ref
}
-func toIconRef(r settings.IconRef) IconRef { return iconRefOut(r.Kind, r.Name, r.File) }
+func (s *Server) toIconRef(r settings.IconRef) IconRef { return s.iconRefOut(r.Kind, r.Name, r.File) }
func fromIconRef(r IconRef) settings.IconRef {
return settings.IconRef{Kind: string(r.Kind), Name: deref(r.Name), File: deref(r.File)}
@@ -41,7 +50,7 @@ func fromHighlight(h CalendarHighlight) settings.CalendarHighlight {
}
}
-func toCalendarSettings(c settings.CalendarSettings) CalendarSettings {
+func (s *Server) toCalendarSettings(c settings.CalendarSettings) CalendarSettings {
out := CalendarSettings{
RefreshMinutes: c.RefreshMinutes,
Calendars: make([]CalendarSource, 0, len(c.Calendars)),
@@ -51,7 +60,7 @@ func toCalendarSettings(c settings.CalendarSettings) CalendarSettings {
for _, cal := range c.Calendars {
// The address stays on the server; only a shortened hint leaves it.
out.Calendars = append(out.Calendars, CalendarSource{
- Id: cal.ID, Name: cal.Name, Icon: toIconRef(cal.Icon),
+ Id: cal.ID, Name: cal.Name, Icon: s.toIconRef(cal.Icon),
HasUrl: cal.URL != "", UrlHint: settings.URLHint(cal.URL),
})
}
@@ -65,7 +74,7 @@ func toCalendarSettings(c settings.CalendarSettings) CalendarSettings {
for _, sh := range sec.Shifts {
o.Shifts = append(o.Shifts, CalendarShift{
Id: sh.ID, Match: sh.Match, MatchMode: CalendarShiftMatchMode(sh.MatchMode), Label: sh.Label,
- Start: sh.Start, End: sh.End, Icon: toIconRef(sh.Icon),
+ Start: sh.Start, End: sh.End, Icon: s.toIconRef(sh.Icon),
})
}
out.Sections = append(out.Sections, o)
@@ -73,7 +82,7 @@ func toCalendarSettings(c settings.CalendarSettings) CalendarSettings {
for _, r := range c.Rules {
out.Rules = append(out.Rules, CalendarRule{
Id: r.ID, CalendarIds: r.CalendarIDs, MatchMode: CalendarRuleMatchMode(r.MatchMode), Text: r.Text,
- Action: CalendarRuleAction(r.Action), Icon: toIconRef(r.Icon), RenameTo: r.RenameTo,
+ Action: CalendarRuleAction(r.Action), Icon: s.toIconRef(r.Icon), RenameTo: r.RenameTo,
})
}
return out
@@ -144,23 +153,23 @@ func calendarConfig(c settings.CalendarSettings) calendar.Config {
return cfg
}
-func calIcon(r calendar.IconRef) IconRef { return iconRefOut(r.Kind, r.Name, r.File) }
+func (s *Server) calIcon(r calendar.IconRef) IconRef { return s.iconRefOut(r.Kind, r.Name, r.File) }
-func toShiftDays(days []calendar.ShiftDay) []ShiftDay {
+func (s *Server) toShiftDays(days []calendar.ShiftDay) []ShiftDay {
out := make([]ShiftDay, 0, len(days))
for _, d := range days {
date, err := time.Parse(time.DateOnly, d.Date)
if err != nil {
continue // the engine formats the date itself; cannot happen
}
- out = append(out, ShiftDay{Date: openapi_types.Date{Time: date}, DayLabel: d.DayLabel, Title: d.Title, TimeRange: optional(d.TimeRange), Icon: calIcon(d.Icon), Free: d.Free, Ongoing: d.Ongoing, HighlightColor: optional(d.HighlightColor)})
+ out = append(out, ShiftDay{Date: openapi_types.Date{Time: date}, DayLabel: d.DayLabel, Title: d.Title, TimeRange: optional(d.TimeRange), Icon: s.calIcon(d.Icon), Free: d.Free, Ongoing: d.Ongoing, HighlightColor: optional(d.HighlightColor)})
}
return out
}
// GetCalendarSettings returns the calendar settings without the addresses.
func (s *Server) GetCalendarSettings(_ context.Context, _ GetCalendarSettingsRequestObject) (GetCalendarSettingsResponseObject, error) {
- return GetCalendarSettings200JSONResponse(toCalendarSettings(s.settings.Get().Calendar)), nil
+ return GetCalendarSettings200JSONResponse(s.toCalendarSettings(s.settings.Get().Calendar)), nil
}
// UpdateCalendarSettings stores new calendar settings and drops the cached
@@ -178,7 +187,7 @@ func (s *Server) UpdateCalendarSettings(_ context.Context, request UpdateCalenda
return UpdateCalendarSettings400ApplicationProblemPlusJSONResponse{BadRequestApplicationProblemPlusJSONResponse(badRequest(errs))}, nil
}
s.calendar.Invalidate()
- return UpdateCalendarSettings200JSONResponse(toCalendarSettings(stored)), nil
+ return UpdateCalendarSettings200JSONResponse(s.toCalendarSettings(stored)), nil
}
// PreviewCalendar evaluates an unsaved draft against the real feeds.
@@ -199,7 +208,7 @@ func (s *Server) PreviewCalendar(ctx context.Context, request PreviewCalendarReq
o := CalendarPreviewSection{Id: sec.ID, Title: sec.Title, Type: CalendarPreviewSectionType(sec.Type), Error: optional(sec.Error)}
switch {
case sec.Type == calendar.TypeShifts && sec.Days != nil:
- days := toShiftDays(sec.Days)
+ days := s.toShiftDays(sec.Days)
o.Days = &days
case sec.Type == calendar.TypeList:
items := make([]PreviewItem, 0, len(sec.Candidates))
@@ -210,7 +219,7 @@ func (s *Server) PreviewCalendar(ctx context.Context, request PreviewCalendarReq
}
items = append(items, PreviewItem{
Title: p.Title, OriginalTitle: p.OriginalTitle, Location: optional(p.Location), TimeLabel: p.TimeLabel,
- Relative: p.Relative, Icon: calIcon(p.Icon), AllDay: p.AllDay, Ongoing: p.Ongoing, HighlightColor: optional(p.HighlightColor),
+ Relative: p.Relative, Icon: s.calIcon(p.Icon), AllDay: p.AllDay, Ongoing: p.Ongoing, HighlightColor: optional(p.HighlightColor),
Hidden: p.Hidden, Shown: p.Shown, MatchedRules: rules, CalendarId: p.CalendarID, Start: p.Start,
})
}
@@ -231,7 +240,7 @@ func (s *Server) GetDashboardCalendarSection(ctx context.Context, request GetDas
out := GetDashboardCalendarSection200JSONResponse{Id: res.ID, Title: res.Title, Type: DashboardCalendarSectionType(res.Type), Error: optional(res.Error)}
if res.Type == calendar.TypeShifts {
if res.Days != nil {
- days := toShiftDays(res.Days)
+ days := s.toShiftDays(res.Days)
out.Days = &days
}
return out, nil
@@ -240,7 +249,7 @@ func (s *Server) GetDashboardCalendarSection(ctx context.Context, request GetDas
for _, it := range res.Items {
items = append(items, DashboardCalendarItem{
Title: it.Title, Location: optional(it.Location), TimeLabel: it.TimeLabel, Relative: it.Relative,
- Icon: calIcon(it.Icon), AllDay: it.AllDay, Ongoing: it.Ongoing, HighlightColor: optional(it.HighlightColor),
+ Icon: s.calIcon(it.Icon), AllDay: it.AllDay, Ongoing: it.Ongoing, HighlightColor: optional(it.HighlightColor),
})
}
out.Items = &items
diff --git a/server/internal/api/calendaricon_test.go b/server/internal/api/calendaricon_test.go
new file mode 100644
index 0000000..cec6f9e
--- /dev/null
+++ b/server/internal/api/calendaricon_test.go
@@ -0,0 +1,89 @@
+package api
+
+import (
+ "net/http"
+ "testing"
+
+ "github.com/thazzr/mirrornextgen/server/internal/icons"
+)
+
+func uploadPNG(t *testing.T, e *testEnv, c creds) string {
+ t.Helper()
+ rec := upload(e, c, goodPNG, "haus.png", nil)
+ if rec.Code != http.StatusCreated {
+ t.Fatalf("upload %d: %s", rec.Code, rec.Body)
+ }
+ return decode[Icon](t, rec).Id
+}
+
+func ctOf(r IconRef) string {
+ if r.ContentType == nil {
+ return ""
+ }
+ return *r.ContentType
+}
+
+func TestUploadedIconsCarryTheirContentTypeInResponses(t *testing.T) {
+ e := newTestEnv(t)
+ c := e.setup(t)
+ svg, png := uploadSVG(t, e, c), uploadPNG(t, e, c)
+
+ body := calBody(e)
+ body.Calendars[0].Icon = IconRef{Kind: Upload, File: sptr(svg)}
+ body.Sections[1].Shifts[0].Icon = IconRef{Kind: Upload, File: sptr(png)}
+ body.Rules = []CalendarRule{{Id: "r1", CalendarIds: []string{"familie"}, MatchMode: "contains", Text: "Standup", Action: CalendarRuleActionIcon, Icon: IconRef{Kind: Upload, File: sptr(svg)}}}
+ putCalendar(t, e, c, body)
+
+ // Settings GET: calendar, shift and rule icons.
+ got := decode[CalendarSettings](t, e.do(http.MethodGet, calSettingsPath, nil, opts{cookie: c.cookie}))
+ if ctOf(got.Calendars[0].Icon) != "image/svg+xml" || ctOf(got.Sections[1].Shifts[0].Icon) != "image/png" || ctOf(got.Rules[0].Icon) != "image/svg+xml" {
+ t.Errorf("settings = %+v", got)
+ }
+ if got.Calendars[1].Icon.ContentType != nil {
+ t.Error("an icon of kind none carries no content type")
+ }
+
+ // Dashboard list item (public).
+ list := decode[DashboardCalendarSection](t, e.do(http.MethodGet, "/api/v1/dashboard/calendar/termine", nil, opts{}))
+ if len(*list.Items) == 0 || ctOf((*list.Items)[0].Icon) != "image/svg+xml" {
+ t.Errorf("list item = %+v", *list.Items)
+ }
+ // Dashboard shift row.
+ shifts := decode[DashboardCalendarSection](t, e.do(http.MethodGet, "/api/v1/dashboard/calendar/plan", nil, opts{}))
+ days := *shifts.Days
+ if ctOf(days[3].Icon) != "image/png" {
+ t.Errorf("shift day = %+v", days[3])
+ }
+ // Preview.
+ pv := decode[CalendarPreview](t, e.do(http.MethodPost, calPreviewPath, body, opts{cookie: c.cookie, csrf: c.csrf}))
+ found := false
+ for _, sec := range pv.Sections {
+ if sec.Items != nil {
+ for _, it := range *sec.Items {
+ if it.Icon.Kind == Upload {
+ found = true
+ if ctOf(it.Icon) != "image/svg+xml" {
+ t.Errorf("preview item = %+v", it.Icon)
+ }
+ }
+ }
+ }
+ }
+ if !found {
+ t.Error("preview has no upload icon")
+ }
+}
+
+func TestIconRefOutLeavesUnknownIdsWithoutContentType(t *testing.T) {
+ store, err := icons.Load(t.TempDir())
+ if err != nil {
+ t.Fatal(err)
+ }
+ s := &Server{icons: store}
+ if r := s.iconRefOut("upload", "", "abcdefgh12345678"); r.ContentType != nil {
+ t.Errorf("unknown id = %+v", r)
+ }
+ if r := s.iconRefOut("bootstrap", "house", ""); r.ContentType != nil {
+ t.Errorf("bootstrap = %+v", r)
+ }
+}
diff --git a/web/src/features/admin/components/IconPicker.tsx b/web/src/features/admin/components/IconPicker.tsx
index 8425c6a..f72579a 100644
--- a/web/src/features/admin/components/IconPicker.tsx
+++ b/web/src/features/admin/components/IconPicker.tsx
@@ -2,6 +2,7 @@ import { useMemo } from 'react'
import { Group, Select, type ComboboxItem, type ComboboxItemGroup } from '@mantine/core'
import { useQuery } from '@tanstack/react-query'
import 'bootstrap-icons/font/bootstrap-icons.css'
+import { MaskIcon } from '../../../shared/MaskIcon.tsx'
import { fetchIcons, iconFileUrl, iconsQueryKey, type IconRef } from '../api/icons.ts'
import { BOOTSTRAP_ICONS } from './bootstrapIcons.ts'
@@ -16,10 +17,13 @@ function decode(value: string): IconRef {
return { kind: 'none' }
}
-function Preview({ value }: { value: string }) {
+function Preview({ value, svgIds }: { value: string; svgIds: ReadonlySet }) {
if (value.startsWith('bootstrap:')) return
- if (value.startsWith('upload:'))
- return
+ if (value.startsWith('upload:')) {
+ const id = value.slice('upload:'.length)
+ if (svgIds.has(id)) return
+ return
+ }
return null
}
@@ -34,6 +38,12 @@ type Props = {
export function IconPicker({ label, value, onChange, error }: Props) {
const uploads = useQuery({ queryKey: iconsQueryKey, queryFn: fetchIcons })
const current = encode(value)
+ // Ids of SVG uploads; the reference itself may carry the type when the list is not loaded yet.
+ const svgIds = useMemo(() => {
+ const ids = new Set((uploads.data ?? []).filter((i) => i.contentType === 'image/svg+xml').map((i) => i.id))
+ if (value.kind === 'upload' && value.file && value.contentType === 'image/svg+xml') ids.add(value.file)
+ return ids
+ }, [uploads.data, value])
const data = useMemo>>(() => {
const own: ComboboxItem[] = (uploads.data ?? []).map((i) => ({ value: `upload:${i.id}`, label: i.name }))
@@ -60,11 +70,11 @@ export function IconPicker({ label, value, onChange, error }: Props) {
searchable
allowDeselect={false}
nothingFoundMessage="Kein Symbol gefunden"
- leftSection={}
+ leftSection={}
renderOption={({ option }) => (
-
+
{option.label}
diff --git a/web/src/features/admin/icons.test.tsx b/web/src/features/admin/icons.test.tsx
index 9a2f06a..629a645 100644
--- a/web/src/features/admin/icons.test.tsx
+++ b/web/src/features/admin/icons.test.tsx
@@ -56,8 +56,13 @@ describe('icons page', () => {
const { container } = await openIcons()
expectSinglePageTitle('Symbole')
expect(screen.getByRole('group', { name: 'Stern' })).toBeInTheDocument()
+ // A PNG stays an image; an SVG is a mask in the text colour, so it shows on the dark page.
const imgs = [...container.querySelectorAll('img')].map((i) => i.getAttribute('src'))
- expect(imgs).toEqual(['/api/v1/icons/ic1/file', '/api/v1/icons/ic2/file'])
+ expect(imgs).toEqual(['/api/v1/icons/ic1/file'])
+ const masks = [...container.querySelectorAll('span[aria-hidden="true"]')].filter((m) => m.style.maskImage)
+ expect(masks).toHaveLength(1)
+ expect(masks[0].style.maskImage).toContain('/api/v1/icons/ic2/file')
+ expect(within(screen.getByRole('group', { name: 'Stern' })).queryByRole('img', { hidden: true })).toBeNull()
})
it('says so when there are no icons', async () => {
@@ -167,6 +172,26 @@ describe('IconPicker (in the calendar page)', () => {
expect(list.getByRole('option', { name: 'Geburtstag', hidden: true })).toBeInTheDocument()
})
+ it('previews a selected SVG upload as a mask and a PNG upload as an image', async () => {
+ const withIcon = (file: string) => ({ ...calendarSettings, calendars: [{ ...calendarSettings.calendars[0], icon: { kind: 'upload', file } }] })
+ const svg = await openCalendar({ 'GET /api/v1/settings/calendar': () => json(withIcon('ic2')) })
+ await waitFor(() => expect(svg.card.getByRole('combobox', { name: 'Symbol' })).toHaveValue('Stern'))
+ const field = svg.card.getByRole('combobox', { name: 'Symbol' }).closest('.mantine-InputWrapper-root') as HTMLElement
+ const maskOf = () => [...field.querySelectorAll('span[aria-hidden="true"]')].filter((m) => m.style.maskImage)
+ expect(maskOf()[0].style.maskImage).toContain('/api/v1/icons/ic2/file')
+ expect(field.querySelector('img')).toBeNull()
+ })
+
+ it('previews a selected PNG upload as an image', async () => {
+ const png = await openCalendar({
+ 'GET /api/v1/settings/calendar': () => json({ ...calendarSettings, calendars: [{ ...calendarSettings.calendars[0], icon: { kind: 'upload', file: 'ic1' } }] }),
+ })
+ await waitFor(() => expect(png.card.getByRole('combobox', { name: 'Symbol' })).toHaveValue('Logo'))
+ const field = png.card.getByRole('combobox', { name: 'Symbol' }).closest('.mantine-InputWrapper-root') as HTMLElement
+ expect(field.querySelector('img')).toHaveAttribute('src', '/api/v1/icons/ic1/file')
+ expect([...field.querySelectorAll('span')].some((m) => m.style.maskImage)).toBe(false)
+ })
+
it('picking an uploaded icon and a standard icon sends the matching references', async () => {
const { api, card } = await openCalendar({
'PUT /api/v1/settings/calendar': (c) => json({ ...calendarSettings, calendars: [{ ...(c.body as { calendars: object[] }).calendars[0], hasUrl: true, urlHint: 'h' }] }),
diff --git a/web/src/features/admin/pages/IconsPage.tsx b/web/src/features/admin/pages/IconsPage.tsx
index 8c1f46f..e700cd1 100644
--- a/web/src/features/admin/pages/IconsPage.tsx
+++ b/web/src/features/admin/pages/IconsPage.tsx
@@ -3,6 +3,7 @@ import { Alert, Button, Card, FileInput, Group, SimpleGrid, Skeleton, Stack, Tex
import { notifications } from '@mantine/notifications'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { ApiError } from '../../../shared/api/client.ts'
+import { MaskIcon } from '../../../shared/MaskIcon.tsx'
import { DetailHeader } from '../components/DetailHeader.tsx'
import { deleteIcon, fetchIcons, iconFileUrl, iconsQueryKey, uploadIcon, type Icon } from '../api/icons.ts'
@@ -24,7 +25,11 @@ function IconCard({ icon }: { icon: Icon }) {
return (
-
+ {icon.contentType === 'image/svg+xml' ? (
+
+ ) : (
+
+ )}
{icon.name}
diff --git a/web/src/features/modules/calendar/Icon.tsx b/web/src/features/modules/calendar/Icon.tsx
index 5a2ad12..481739a 100644
--- a/web/src/features/modules/calendar/Icon.tsx
+++ b/web/src/features/modules/calendar/Icon.tsx
@@ -1,3 +1,4 @@
+import { MaskIcon } from '../../../shared/MaskIcon.tsx'
import type { components } from '../../../shared/api/schema.gen.ts'
type IconRef = components['schemas']['IconRef']
@@ -5,10 +6,12 @@ type IconRef = components['schemas']['IconRef']
/** Bootstrap icon of an event without an own symbol. */
const defaultIcon = 'calendar-event'
-/** One calendar symbol: a Bootstrap icon (loaded globally), an uploaded image, or the default. Uploads stay unfiltered. */
+/** One calendar symbol: a Bootstrap icon (loaded globally), an uploaded image, or the default. An uploaded SVG is a mask in the text colour (white); a PNG stays an image. */
export function CalendarIcon({ icon }: { icon: IconRef }) {
if (icon.kind === 'upload' && icon.file) {
- return
+ const src = `/api/v1/icons/${encodeURIComponent(icon.file)}/file`
+ if (icon.contentType === 'image/svg+xml') return
+ return
}
const name = icon.kind === 'bootstrap' && icon.name ? icon.name : defaultIcon
return
diff --git a/web/src/features/modules/calendar/Widget.test.tsx b/web/src/features/modules/calendar/Widget.test.tsx
index f3923e3..64da491 100644
--- a/web/src/features/modules/calendar/Widget.test.tsx
+++ b/web/src/features/modules/calendar/Widget.test.tsx
@@ -70,6 +70,31 @@ describe('calendar widget (list)', () => {
expect(symbols[2].querySelector('i')).toHaveClass('bi-calendar-event')
})
+ it('draws an uploaded SVG as a mask in the text colour and keeps a PNG as an image', async () => {
+ setup(
+ listSection({
+ items: [
+ item({ title: 'S', icon: { kind: 'upload', file: 'svg1', contentType: 'image/svg+xml' } }),
+ item({ title: 'P', icon: { kind: 'upload', file: 'png1', contentType: 'image/png' } }),
+ item({ title: 'O', icon: { kind: 'upload', file: 'old1' } }),
+ ],
+ }),
+ )
+ const { container } = renderWithProviders('/')
+ await screen.findByText('S')
+ const symbols = [...container.querySelectorAll('.mirror-agenda__symbol')]
+ const mask = symbols[0].querySelector('.mirror-agenda__icon--mask') as HTMLElement
+ expect(symbols[0].querySelector('img')).toBeNull()
+ expect(mask).toHaveAttribute('aria-hidden', 'true')
+ expect(mask.style.maskImage).toContain('/api/v1/icons/svg1/file')
+ expect(mask.style.getPropertyValue('-webkit-mask-image')).toContain('/api/v1/icons/svg1/file')
+ expect(mask.style.backgroundColor).toBe('currentcolor')
+ expect(symbols[1].querySelector('img')).toHaveAttribute('src', '/api/v1/icons/png1/file')
+ expect(symbols[1].querySelector('.mirror-agenda__icon--mask')).toBeNull()
+ // An older server sends no content type: the image stays.
+ expect(symbols[2].querySelector('img')).toHaveAttribute('src', '/api/v1/icons/old1/file')
+ })
+
it('shows the empty text when there are no events and no error', async () => {
setup(listSection({ items: [] }))
renderWithProviders('/')
diff --git a/web/src/features/modules/calendar/calendar.css b/web/src/features/modules/calendar/calendar.css
index 8c20a0f..bb510c4 100644
--- a/web/src/features/modules/calendar/calendar.css
+++ b/web/src/features/modules/calendar/calendar.css
@@ -26,6 +26,7 @@
.mirror-agenda__symbol { align-items: center; color: #fff; display: inline-flex; height: clamp(2.4rem,3vw,3.2rem); justify-content: center; width: clamp(2.4rem,3vw,3.2rem); }
.mirror-agenda__symbol i { font-size: clamp(1.2rem,2vw,1.6rem); line-height: 1; }
.mirror-agenda__icon { display: block; height: 100%; object-fit: contain; width: 100%; }
+.mirror-agenda__icon--mask { object-fit: initial; }
.mirror-agenda__content { align-items: flex-start; display: flex; flex-direction: column; min-width: 0; overflow: hidden; }
.mirror-agenda__title {
color: #fff;
diff --git a/web/src/shared/MaskIcon.tsx b/web/src/shared/MaskIcon.tsx
new file mode 100644
index 0000000..f3fef62
--- /dev/null
+++ b/web/src/shared/MaskIcon.tsx
@@ -0,0 +1,24 @@
+import type { CSSProperties } from 'react'
+
+/**
+ * An uploaded SVG drawn as a mask over `currentColor`. An SVG inside an
+ * never inherits the page colour, so its `currentColor` would be black; as a
+ * mask every opaque part takes the surrounding text colour instead, and no SVG
+ * markup is injected into the page. No Mantine here: the dashboard uses it too.
+ */
+export function MaskIcon({ src, className, size }: { src: string; className?: string; size?: number }) {
+ const image = `url("${src}")`
+ const style: CSSProperties = {
+ backgroundColor: 'currentColor',
+ maskImage: image,
+ WebkitMaskImage: image,
+ maskSize: 'contain',
+ WebkitMaskSize: 'contain',
+ maskRepeat: 'no-repeat',
+ WebkitMaskRepeat: 'no-repeat',
+ maskPosition: 'center',
+ WebkitMaskPosition: 'center',
+ ...(size ? { display: 'inline-block', flex: 'none', width: size, height: size } : {}),
+ }
+ return
+}
diff --git a/web/src/shared/api/schema.gen.ts b/web/src/shared/api/schema.gen.ts
index 06a5b32..077fe04 100644
--- a/web/src/shared/api/schema.gen.ts
+++ b/web/src/shared/api/schema.gen.ts
@@ -1066,6 +1066,8 @@ export interface components {
name?: string;
/** @description Id of an uploaded icon, for kind `upload`. */
file?: string;
+ /** @description Set by the server for kind `upload` in responses (for example `image/svg+xml`, `image/png`); ignored on input. */
+ contentType?: string;
};
/** @description An uploaded icon. */
Icon: {
From 068b982c6984cb7cb8914cf81515c907f9851bf7 Mon Sep 17 00:00:00 2001
From: Thazzr <22547926+Thazzr@users.noreply.github.com>
Date: Sat, 14 Nov 2026 19:32:27 +0000
Subject: [PATCH 2/3] =?UTF-8?q?docs:=20Tags=20nur=20noch=20f=C3=BCr=20fest?=
=?UTF-8?q?gehaltene=20Versionen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Anlass: Nutzerentscheidung – kleine Korrekturen gehen ohne Tag raus,
der Spiegel holt latest von main.
Prüfung: Durchsicht.
Co-Authored-By: Claude Opus 5.5
Claude-Session: https://claude.ai/code/session_01BbBgi6nWM5aU7VDrf62V1r
---
CLAUDE.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CLAUDE.md b/CLAUDE.md
index 7a9dfd6..bde0763 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -48,7 +48,7 @@ Pi 5 · Ubuntu 26.04 Server · Host: nur Docker
1. **README.md prüfen und ggf. aktualisieren** – wenn die Phase Struktur, Setup, Architektur, Prüfbefehle, Deployment oder Abhängigkeiten ändert.
2. **Commit mit Conventional Commit** – Autor und Committer jedes Commits ist **`Thazzr <22547926+Thazzr@users.noreply.github.com>`** (Nutzerentscheidung 2026-11-14: kein Klarname, keine private oder Firmen-E-Mail in der Historie; die lokale Git-Konfiguration des Repos ist so gesetzt, in einem frischen Klon vor dem ersten Commit `git config user.name Thazzr` und `git config user.email 22547926+Thazzr@users.noreply.github.com`). Ein per cherry-pick übernommener Commit bekommt danach `git commit --amend --no-edit --reset-author`. Format `type(scope): beschreibung`, Betreff auf Deutsch. Der Betreff wird zur Changelog-Zeile, deshalb **immer einen Body** mit Ursache bzw. Anlass, Lösung und Prüfung. Typ → Sektion: `feat`→Added, `fix`→Fixed, `perf`/`refactor`/`docs`/`test`/`chore`/`build`/`style`→Changed, `revert`→Removed, `fix(sec…)`/`sec…`→Security. `ci` erscheint nicht im Changelog.
-3. **Versions-Tag setzen + CHANGELOG.md erzeugen (nie von Hand editieren)** – Bei einer eigenständig abgeschlossenen Phase setzt `node tools/changelog.mjs --tag v0.X.0 --message ""` einen annotierten Tag auf HEAD und erzeugt `CHANGELOG.md` neu. Bei einem Zwischenschritt genügt `node tools/changelog.mjs` ohne Tag. Die neue `CHANGELOG.md` wird als eigener Commit `docs(changelog): update` committet (erscheint selbst nicht im Changelog).
+3. **Versions-Tag setzen + CHANGELOG.md erzeugen (nie von Hand editieren)** – Nutzerentscheidung 2026-11-14: Kleine Korrekturen gehen ohne Tag raus (Merge nach `main` reicht, der Spiegel holt `latest`); ein Tag kommt nur, wenn der Nutzer einen Stand als Version festhalten will. Bei einer eigenständig abgeschlossenen Phase setzt `node tools/changelog.mjs --tag v0.X.0 --message ""` einen annotierten Tag auf HEAD und erzeugt `CHANGELOG.md` neu. Bei einem Zwischenschritt genügt `node tools/changelog.mjs` ohne Tag. Die neue `CHANGELOG.md` wird als eigener Commit `docs(changelog): update` committet (erscheint selbst nicht im Changelog).
4. **Pushen** – den Branch und den neuen Tag pushen. Der Cloud-Container ist flüchtig, lokale Tags gingen sonst verloren (bewusste Abweichung von Core). Verweigert die Umgebung den Tag-Push (die Cloud-Sitzung erlaubt nur Pushes auf ihren Arbeits-Branch, ein Tag-Push endet mit HTTP 403), wird das nicht umgangen: Die Hauptsitzung nennt dem Nutzer Tag, Commit und Tag-Nachricht, damit er ihn selbst setzt (`git tag -a vX.Y.Z -m ""` und `git push origin vX.Y.Z`).
5. **Nächste Schritte vorschlagen.**
6. **Keine offenen Änderungen mitschleifen** – vor Beginn der nächsten Phase ist `git status` sauber.
From c6e28e2ff2e7ec73122123483f23bb68b6f3da22 Mon Sep 17 00:00:00 2001
From: Thazzr <22547926+Thazzr@users.noreply.github.com>
Date: Sat, 14 Nov 2026 19:32:28 +0000
Subject: [PATCH 3/3] docs(changelog): update
Co-Authored-By: Claude Opus 5.5
Claude-Session: https://claude.ai/code/session_01BbBgi6nWM5aU7VDrf62V1r
---
CHANGELOG.md | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index caa5c26..ca72c8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,16 @@ Das Format basiert auf [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
automatisch mit [git-cliff](https://git-cliff.org) aus den Commit-Messages generiert –
**nicht von Hand bearbeiten**.
+## [Unreleased]
+
+### Changed
+
+- Tags nur noch für festgehaltene Versionen
+
+### Fixed
+
+- **icons**: Hochgeladene SVG-Symbole nehmen die Textfarbe an
+
## [0.9.1] - 2026-11-14
### Fixed