From d5d7d39ef4da588fd0ef4910cdb2572737981f59 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Thu, 29 Oct 2026 15:33:51 +0100
Subject: [PATCH] feat: show the calendar's name on events when names next to
 colours is on

---
 components/calendar/__tests__/event-card.test.tsx | 11 +++++++++++
 components/calendar/event-card.tsx                | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/components/calendar/__tests__/event-card.test.tsx b/components/calendar/__tests__/event-card.test.tsx
index e9e7b2616..11316f99e 100644
--- a/components/calendar/__tests__/event-card.test.tsx
+++ b/components/calendar/__tests__/event-card.test.tsx
@@ -120,6 +120,17 @@ describe('EventCard colour settings', () => {
     useSettingsStore.setState({ showColorNames: false, colorBlindPalette: false });
   });
 
+  it.each(['chip', 'span', 'block'] as const)('shows the calendar name on the %s with "Show names next to colours"', (variant) => {
+    useSettingsStore.setState({ showColorNames: true });
+    render(<EventCard event={makeOccurrence('a', 'accepted')} calendar={calendar} variant={variant} currentUserEmails={me} />);
+    expect(screen.getByText('Work')).toBeInTheDocument();
+  });
+
+  it('shows only the colour without it', () => {
+    render(<EventCard event={makeOccurrence('a', 'accepted')} calendar={calendar} variant="block" currentUserEmails={me} />);
+    expect(screen.queryByText('Work')).not.toBeInTheDocument();
+  });
+
   it("draws the event in the colour-blind-safe colour and keeps the calendar's own", () => {
     useSettingsStore.setState({ colorBlindPalette: true });
     render(<EventCard event={makeOccurrence('a', 'accepted')} calendar={calendar} variant="block" currentUserEmails={me} />);
diff --git a/components/calendar/event-card.tsx b/components/calendar/event-card.tsx
index 7bd91f642..41c0fa219 100644
--- a/components/calendar/event-card.tsx
+++ b/components/calendar/event-card.tsx
@@ -124,9 +124,13 @@ export function EventCard({ event, calendar, variant, onClick, onMouseEnter, onM
   const timeFormat = useSettingsStore((state) => state.timeFormat);
   const showTimeInMonthView = useSettingsStore((state) => state.showTimeInMonthView);
   const tinted = useSettingsStore((state) => state.calendarTintedEvents);
+  // "Show names next to colours": the calendar's name on the event, so the
+  // colour is not the only way to tell Work from Personal (WCAG 1.4.1).
+  const showColorNames = useSettingsStore((state) => state.showColorNames);
   const timeFmt = timeFormat === "12h" ? "h:mm a" : "HH:mm";
 
   const calendarName = calendar?.name || "";
+  const visibleCalendarName = showColorNames && calendarName ? calendarName : null;
   const durationMinutes = parseDuration(event.duration);
   const endTime = getEventEndDate(event);
   const safeFormat = (d: Date, fmt: string) => {
@@ -218,6 +222,9 @@ export function EventCard({ event, calendar, variant, onClick, onMouseEnter, onM
         {/* The whole width, aligned to the title's own start: a short English
             title in Arabic sat at the right, a cut one filled to the left. */}
         <span dir="auto" className={cn("flex-1 min-w-0 truncate text-start", isInactive && "line-through")}>{event.title || t("events.no_title")}</span>
+        {visibleCalendarName && (
+          <span data-calendar-name dir="auto" className="ms-1 min-w-0 max-w-[45%] shrink truncate font-normal opacity-85">{visibleCalendarName}</span>
+        )}
       </button>
     );
   }
@@ -249,6 +256,9 @@ export function EventCard({ event, calendar, variant, onClick, onMouseEnter, onM
             <span className="flex-shrink-0 font-normal opacity-85">{format(startDate, timeFmt)}</span>
           )}
           <span dir="auto" className={cn("flex-1 min-w-0 truncate text-start font-medium", isInactive && "line-through")}>{event.title || t("events.no_title")}</span>
+          {visibleCalendarName && (
+            <span data-calendar-name dir="auto" className="min-w-0 max-w-[45%] shrink truncate font-normal opacity-85">{visibleCalendarName}</span>
+          )}
         </div>
       </button>
     );
@@ -302,6 +312,9 @@ export function EventCard({ event, calendar, variant, onClick, onMouseEnter, onM
           <bdi dir="ltr">{timeString}</bdi>
         </div>
       )}
+      {visibleCalendarName && (
+        <div data-calendar-name dir="auto" className="opacity-85 text-[10.5px] truncate">{visibleCalendarName}</div>
+      )}
       {getParticipantCount(event) > 0 && (
         <div
           className="flex items-center gap-0.5 opacity-85 text-[10.5px]"