Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(calendar): multi-day events rendering (#5641)

dev-rb5ca7ab16d498
diff --git a/apps/web/src/features/calendar/CalendarPage.tsx b/apps/web/src/features/calendar/CalendarPage.tsx
index d788a7d8fa..5d9dc47775 100644
--- a/apps/web/src/features/calendar/CalendarPage.tsx
+++ b/apps/web/src/features/calendar/CalendarPage.tsx
@@ -57,6 +57,10 @@ import {
canEditCalendarEventTime,
} from './events/event-interaction';
import { mapCalendarEventToFullCalendar } from './events/event-mapper';
+import {
+ isMultiDaySelectionPreview,
+ multiDaySelectionRenderingPlugin,
+} from './events/multi-day-selection-rendering';
import type { CalendarTimeFormat } from './events/types';
import { FullCalendar, useFullCalendar } from './fullcalendar-solid';
import {
@@ -443,7 +447,12 @@ export function CalendarPage(props: { id: CalendarPageId; initialDate: Date }) {
return (
<FullCalendar.Root
- plugins={[dayGridPlugin, interactionPlugin, timeGridPlugin]}
+ plugins={[
+ dayGridPlugin,
+ interactionPlugin,
+ timeGridPlugin,
+ multiDaySelectionRenderingPlugin,
+ ]}
initialView={calendarView.displaySettings.periodView}
initialDate={props.initialDate}
height="100%"
@@ -492,7 +501,7 @@ export function CalendarPage(props: { id: CalendarPageId; initialDate: Date }) {
calendarEvent.calendar.color
);
}
- if (isMirror) return;
+ if (isMirror || isMultiDaySelectionPreview(event)) return;
eventElements.set(eventId, el);
// A re-render (query settling, live refresh) replaces chip elements.
@@ -505,7 +514,7 @@ export function CalendarPage(props: { id: CalendarPageId; initialDate: Date }) {
notifyChipMount();
}}
eventWillUnmount={({ el, event, isMirror }) => {
- if (isMirror) return;
+ if (isMirror || isMultiDaySelectionPreview(event)) return;
const eventId = calendarEventRenderId(event);
if (eventElements.get(eventId) === el) {
@@ -571,9 +580,10 @@ export function CalendarPage(props: { id: CalendarPageId; initialDate: Date }) {
);
if (
!event &&
- renderProps.isMirror &&
- !renderProps.isDragging &&
- !renderProps.isResizing
+ (isMultiDaySelectionPreview(renderProps.event) ||
+ (renderProps.isMirror &&
+ !renderProps.isDragging &&
+ !renderProps.isResizing))
) {
return (
<div class="calendar-event-selection-preview flex h-full min-w-0 flex-col overflow-hidden px-1 py-0.5 text-xs leading-tight">
diff --git a/apps/web/src/features/calendar/calendar.css b/apps/web/src/features/calendar/calendar.css
index f142a549f8..5e4f8763fc 100644
--- a/apps/web/src/features/calendar/calendar.css
+++ b/apps/web/src/features/calendar/calendar.css
@@ -274,13 +274,19 @@
}
.calendar-view .fc .fc-event-mirror,
-.calendar-view .fc .fc-highlight {
+.calendar-view .fc .fc-highlight,
+.calendar-view .fc .calendar-multi-day-selection-preview-event {
border: 1px solid var(--calendar-selection-color, var(--color-accent));
border-radius: 0.375rem;
background: var(--calendar-selection-color, var(--color-accent));
box-shadow: none;
}
+.calendar-view .fc .calendar-multi-day-selection-preview-event {
+ color: var(--calendar-selection-color, var(--color-accent));
+ pointer-events: none;
+}
+
.calendar-view .fc .fc-highlight {
inset: 2px;
}
@@ -305,7 +311,8 @@
color: var(--calendar-selection-color, var(--color-accent));
}
-.calendar-view .fc .fc-event-mirror .fc-event-main {
+.calendar-view .fc .fc-event-mirror .fc-event-main,
+.calendar-view .fc .calendar-multi-day-selection-preview-event .fc-event-main {
color: inherit;
}
@@ -314,7 +321,11 @@
color: var(--color-surface);
}
-.calendar-view .fc .fc-event-mirror .calendar-event-selection-preview {
+.calendar-view .fc .fc-event-mirror .calendar-event-selection-preview,
+.calendar-view
+ .fc
+ .calendar-multi-day-selection-preview-event
+ .calendar-event-selection-preview {
filter: invert(1) grayscale(1) contrast(100);
}
diff --git a/apps/web/src/features/calendar/events/EventContent.test.tsx b/apps/web/src/features/calendar/events/EventContent.test.tsx
index a205ab5ef9..948951bb41 100644
--- a/apps/web/src/features/calendar/events/EventContent.test.tsx
+++ b/apps/web/src/features/calendar/events/EventContent.test.tsx
@@ -35,11 +35,14 @@ function calendarEvent(durationMinutes: number): CalendarEvent {
};
}
-function renderProps(timeText: string): EventContentArg {
+function renderProps(
+ timeText: string,
+ options: { allDay?: boolean; viewType?: string } = {}
+): EventContentArg {
return {
- event: { start },
+ event: { allDay: options.allDay ?? false, start },
timeText,
- view: { type: 'timeGridWeek' },
+ view: { type: options.viewType ?? 'timeGridWeek' },
} as EventContentArg;
}
@@ -80,4 +83,33 @@ describe('CalendarEventContent', () => {
)
).toBeTruthy();
});
+
+ it('uses compact content when a timed event is rendered in the all-day row', () => {
+ const event = {
+ ...calendarEvent(24 * 60),
+ location: 'Conference room',
+ };
+ const { container } = render(() => (
+ <CalendarEventContent
+ event={event}
+ renderProps={renderProps('', {
+ allDay: true,
+ viewType: 'timeGridDay',
+ })}
+ isSelected={false}
+ timeFormat="12-hour"
+ />
+ ));
+
+ expect(
+ container.querySelector('.calendar-event-content-compact')
+ ).toBeTruthy();
+ expect(
+ container.querySelector('.calendar-event-content-layout-single-line')
+ ).toBeTruthy();
+ expect(
+ screen.getByText(formatCompactCalendarTime(start, '12-hour'))
+ ).toBeTruthy();
+ expect(screen.queryByText('Conference room')).toBeNull();
+ });
});
diff --git a/apps/web/src/features/calendar/events/EventContent.tsx b/apps/web/src/features/calendar/events/EventContent.tsx
index d2d3675d08..7f4e7946ab 100644
--- a/apps/web/src/features/calendar/events/EventContent.tsx
+++ b/apps/web/src/features/calendar/events/EventContent.tsx
@@ -19,10 +19,11 @@ const SINGLE_LINE_EVENT_DURATION_MS = 15 * 60 * 1000;
/** Renders responsive event content for FullCalendar. */
export function CalendarEventContent(props: CalendarEventContentProps) {
+ const isRenderedAllDay = () => props.renderProps.event.allDay;
const isCompact = () =>
- props.event.allDay || props.renderProps.view.type === 'dayGridMonth';
+ isRenderedAllDay() || props.renderProps.view.type === 'dayGridMonth';
const showLocation = () =>
- !props.event.allDay && props.renderProps.view.type === 'timeGridDay';
+ !isRenderedAllDay() && props.renderProps.view.type === 'timeGridDay';
const selfResponseStatus = () =>
props.event.attendees.find((attendee) => attendee.isSelf)?.responseStatus;
const usesSingleLineLayout = () => {
diff --git a/apps/web/src/features/calendar/events/event-mapper.ts b/apps/web/src/features/calendar/events/event-mapper.ts
index fb1bcb1039..8fe0731a8b 100644
--- a/apps/web/src/features/calendar/events/event-mapper.ts
+++ b/apps/web/src/features/calendar/events/event-mapper.ts
@@ -1,5 +1,6 @@
import type { EventInput } from '@fullcalendar/core';
import { canEditCalendarEventTime } from './event-interaction';
+import { multiDayTimedDisplayRange } from './multi-day-rendering';
import type { CalendarEvent } from './types';
/** Maps calendar-owned event data into FullCalendar's rendering contract. */
@@ -7,16 +8,24 @@ export function mapCalendarEventToFullCalendar(
event: CalendarEvent
): EventInput {
const timeEditable = canEditCalendarEventTime(event);
+ const allDayRange = event.allDay
+ ? undefined
+ : multiDayTimedDisplayRange(new Date(event.start), new Date(event.end));
+ const isRenderedAllDay = event.allDay || allDayRange !== undefined;
+ // FullCalendar reports interactions from the all-day row as true all-day
+ // ranges. Keep projected timed events fixed so their timestamps are not
+ // accidentally replaced with date-only API values.
+ const interactionEditable = timeEditable && allDayRange === undefined;
return {
id: event.id,
title: event.title,
- start: event.start,
- end: event.end,
- allDay: event.allDay,
+ start: allDayRange?.start ?? event.start,
+ end: allDayRange?.end ?? event.end,
+ allDay: isRenderedAllDay,
display: 'block',
- startEditable: timeEditable,
- durationEditable: timeEditable,
+ startEditable: interactionEditable,
+ durationEditable: interactionEditable,
extendedProps: {
calendarEventId: event.id,
},
diff --git a/apps/web/src/features/calendar/events/multi-day-rendering.ts b/apps/web/src/features/calendar/events/multi-day-rendering.ts
new file mode 100644
index 0000000000..9d5f039850
--- /dev/null
+++ b/apps/web/src/features/calendar/events/multi-day-rendering.ts
@@ -0,0 +1,54 @@
+/** The exclusive local-date range used to render a multi-day timed span. */
+export interface MultiDayDisplayRange {
+ start: string;
+ end: string;
+}
+
+function formatLocalDate(date: Date) {
+ return [
+ date.getFullYear(),
+ String(date.getMonth() + 1).padStart(2, '0'),
+ String(date.getDate()).padStart(2, '0'),
+ ].join('-');
+}
+
+function isSameLocalDate(first: Date, second: Date) {
+ return (
+ first.getFullYear() === second.getFullYear() &&
+ first.getMonth() === second.getMonth() &&
+ first.getDate() === second.getDate()
+ );
+}
+
+/**
+ * Projects a timed span that occupies multiple local dates into date-only
+ * bounds suitable for FullCalendar's all-day row.
+ */
+export function multiDayTimedDisplayRange(
+ start: Date,
+ end: Date
+): MultiDayDisplayRange | undefined {
+ if (
+ Number.isNaN(start.getTime()) ||
+ Number.isNaN(end.getTime()) ||
+ end <= start
+ ) {
+ return undefined;
+ }
+
+ // Event ends are exclusive. Looking at the final occupied instant avoids
+ // adding an extra day when a span ends exactly at local midnight.
+ const finalOccupiedInstant = new Date(end.getTime() - 1);
+ if (isSameLocalDate(start, finalOccupiedInstant)) return undefined;
+
+ const exclusiveEnd = new Date(
+ finalOccupiedInstant.getFullYear(),
+ finalOccupiedInstant.getMonth(),
+ finalOccupiedInstant.getDate() + 1
+ );
+
+ return {
+ start: formatLocalDate(start),
+ end: formatLocalDate(exclusiveEnd),
+ };
+}
diff --git a/apps/web/src/features/calendar/events/multi-day-selection-rendering.ts b/apps/web/src/features/calendar/events/multi-day-selection-rendering.ts
new file mode 100644
index 0000000000..40ff17ad36
--- /dev/null
+++ b/apps/web/src/features/calendar/events/multi-day-selection-rendering.ts
@@ -0,0 +1,106 @@
+import { createPlugin, type EventApi } from '@fullcalendar/core';
+import type {
+ CalendarContentProps,
+ EventDef,
+ EventInstance,
+ EventStore,
+ EventUi,
+ ViewProps,
+ ViewPropsTransformer,
+} from '@fullcalendar/core/internal';
+import { multiDayTimedDisplayRange } from './multi-day-rendering';
+
+const PREVIEW_DEF_ID = '__calendar-multi-day-selection-preview-def__';
+const PREVIEW_INSTANCE_ID = '__calendar-multi-day-selection-preview-instance__';
+const PREVIEW_EXTENDED_PROP = 'calendarMultiDaySelectionPreview';
+
+const previewUi: EventUi = {
+ display: 'block',
+ startEditable: false,
+ durationEditable: false,
+ constraints: [],
+ overlap: null,
+ allows: [],
+ backgroundColor: '',
+ borderColor: '',
+ textColor: '',
+ classNames: ['calendar-multi-day-selection-preview-event'],
+};
+
+/** Whether a rendered FullCalendar event is the multi-day selection preview. */
+export function isMultiDaySelectionPreview(
+ event: Pick<EventApi, 'extendedProps'>
+) {
+ return event.extendedProps[PREVIEW_EXTENDED_PROP] === true;
+}
+
+function createPreviewStore(range: EventInstance['range']): EventStore {
+ const definition: EventDef = {
+ defId: PREVIEW_DEF_ID,
+ sourceId: '',
+ publicId: PREVIEW_INSTANCE_ID,
+ groupId: '',
+ allDay: true,
+ hasEnd: true,
+ recurringDef: null,
+ title: 'New event',
+ url: '',
+ ui: previewUi,
+ interactive: false,
+ extendedProps: {
+ [PREVIEW_EXTENDED_PROP]: true,
+ },
+ };
+ const instance: EventInstance = {
+ instanceId: PREVIEW_INSTANCE_ID,
+ defId: PREVIEW_DEF_ID,
+ range,
+ forcedStartTzo: null,
+ forcedEndTzo: null,
+ };
+
+ return {
+ defs: { [PREVIEW_DEF_ID]: definition },
+ instances: { [PREVIEW_INSTANCE_ID]: instance },
+ };
+}
+
+class MultiDaySelectionViewPropsTransformer implements ViewPropsTransformer {
+ transform(viewProps: ViewProps, calendarProps: CalendarContentProps) {
+ const selection = viewProps.dateSelection;
+ if (!selection || selection.allDay) return {};
+
+ const displayRange = multiDayTimedDisplayRange(
+ calendarProps.dateEnv.toDate(selection.range.start),
+ calendarProps.dateEnv.toDate(selection.range.end)
+ );
+ if (!displayRange) return {};
+
+ const previewStore = createPreviewStore({
+ start: calendarProps.dateEnv.createMarker(displayRange.start),
+ end: calendarProps.dateEnv.createMarker(displayRange.end),
+ });
+
+ // Replace only the view projection. FullCalendar's canonical selection and
+ // select callback retain the exact timed range used by the event composer.
+ return {
+ dateSelection: null,
+ eventStore: {
+ defs: {
+ ...viewProps.eventStore.defs,
+ ...previewStore.defs,
+ },
+ instances: {
+ ...viewProps.eventStore.instances,
+ ...previewStore.instances,
+ },
+ },
+ };
+ }
+}
+
+/** Renders multi-day timed selections as foreground all-day preview events. */
+export const multiDaySelectionRenderingPlugin = createPlugin({
+ name: 'calendar-multi-day-selection-rendering',
+ viewPropsTransformers: [MultiDaySelectionViewPropsTransformer],
+});
diff --git a/apps/web/src/features/calendar/events/types.ts b/apps/web/src/features/calendar/events/types.ts
index 94b1c845f9..e4e13357c0 100644
--- a/apps/web/src/features/calendar/events/types.ts
+++ b/apps/web/src/features/calendar/events/types.ts
@@ -68,7 +68,7 @@ export interface CalendarEvent {
start: string;
/** Exclusive ISO timestamp or local date string. */
end: string;
- /** Whether the event occupies the all-day area. */
+ /** Whether the canonical occurrence is all-day rather than timed. */
allDay: boolean;
/** Calendar source that owns the event. */
calendar: CalendarSource;