Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
feat(calendar): drag to move event and drag to change event timings (#5636)
dev-rb23d9cdae8074
diff --git a/apps/web/src/features/calendar/CalendarPage.tsx b/apps/web/src/features/calendar/CalendarPage.tsxindex 397321d22f..d788a7d8fa 100644--- a/apps/web/src/features/calendar/CalendarPage.tsx+++ b/apps/web/src/features/calendar/CalendarPage.tsx@@ -1,13 +1,19 @@import { useSplitLayout } from '@components/app/split-layout/layout';+import { toast } from '@core/component/Toast/Toast';import { ScrollIndicators } from '@core/component/VerticalScrollIndicators';import { useUserId } from '@core/context/user';import { isMobile } from '@core/mobile/isMobile';-import type { DateSelectArg, DatesSetArg } from '@fullcalendar/core';+import type {+ DateSelectArg,+ DatesSetArg,+ EventInput,+} from '@fullcalendar/core';import dayGridPlugin from '@fullcalendar/daygrid';import interactionPlugin from '@fullcalendar/interaction';import timeGridPlugin from '@fullcalendar/timegrid';import SpinnerIcon from '@phosphor/spinner-gap.svg';import { useVisibleCalendarsQuery } from '@queries/calendar/calendars';+import { useUpdateCalendarEventMutation } from '@queries/calendar/mutations';import {type CalendarOccurrenceQueryRange,createCalendarOccurrenceQueryRange,@@ -44,6 +50,12 @@ import {} from './events/calendar-occurrence-mapper';import { CalendarEventContent } from './events/EventContent';import { calendarSelectionToEditorInitialValues } from './events/EventEditorForm';+import {+ type CalendarEventTimeChange,+ calendarEventRenderId,+ calendarEventTimeFromFullCalendar,+ canEditCalendarEventTime,+} from './events/event-interaction';import { mapCalendarEventToFullCalendar } from './events/event-mapper';import type { CalendarTimeFormat } from './events/types';import { FullCalendar, useFullCalendar } from './fullcalendar-solid';@@ -326,6 +338,33 @@ export function CalendarPage(props: { id: CalendarPageId; initialDate: Date }) {const useNarrowWeekdayHeaders = () =>calendarView.useNarrowDayHeaders() && !isMobile();const data = createCalendarPageData(range, isActive);+ const updateEventTime = useUpdateCalendarEventMutation();+ // FullCalendar owns temporary drag/resize state imperatively. Replacing its+ // event inputs mid-interaction clears that state and turns the pointer drag+ // into a date-selection mirror, so hold a stable query snapshot until stop.+ const [eventInteractionActive, setEventInteractionActive] =+ createSignal(false);+ const renderedFullCalendarEvents = createMemo<EventInput[]>(+ (current) =>+ eventInteractionActive() ? current : data.fullCalendarEvents(),+ data.fullCalendarEvents()+ );+ let interactionEventsById: ReturnType<typeof data.eventsById> | undefined;++ const eventByRenderId = (id: string) =>+ interactionEventsById?.get(id) ?? data.eventsById().get(id);+ const handleEventInteractionStart = () => {+ interactionEventsById = data.eventsById();+ setEventInteractionActive(true);+ };+ const handleEventInteractionStop = () => {+ // FullCalendar emits drop/resize immediately after stop, so defer clearing+ // the snapshot until those callbacks have consumed it.+ queueMicrotask(() => {+ interactionEventsById = undefined;+ setEventInteractionActive(false);+ });+ };// Rendered chip elements by view-model id, so a deep link can anchor the// details popover to the real chip. The signal bumps on every mount@@ -371,6 +410,37 @@ export function CalendarPage(props: { id: CalendarPageId; initialDate: Date }) {setRange(nextRange);};+ const handleEventTimeChange = (change: CalendarEventTimeChange) => {+ const event = eventByRenderId(calendarEventRenderId(change.event));+ if (+ !isActive() ||+ updateEventTime.isPending ||+ !event ||+ !canEditCalendarEventTime(event)+ ) {+ change.revert();+ return;+ }++ const time = calendarEventTimeFromFullCalendar(change.event, event);+ if (!time) {+ change.revert();+ return;+ }++ updateEventTime.mutate(+ { eventId: event.eventId, patch: { time } },+ {+ onError: (error) => {+ change.revert();+ toast.failure('Failed to update event', {+ subtext: error.message,+ });+ },+ }+ );+ };+return (<FullCalendar.Rootplugins={[dayGridPlugin, interactionPlugin, timeGridPlugin]}@@ -393,7 +463,15 @@ export function CalendarPage(props: { id: CalendarPageId; initialDate: Date }) {eventTimeFormat={CALENDAR_TIME_FORMAT_OPTIONS[calendarView.displaySettings.timeFormat]}- events={data.fullCalendarEvents()}+ events={renderedFullCalendarEvents()}+ eventAllow={() => !updateEventTime.isPending}+ eventResizableFromStart+ eventDragStart={handleEventInteractionStart}+ eventDragStop={handleEventInteractionStop}+ eventDrop={handleEventTimeChange}+ eventResizeStart={handleEventInteractionStart}+ eventResizeStop={handleEventInteractionStop}+ eventResize={handleEventTimeChange}selectable={!isMobile()}unselectAuto={false}selectMirror@@ -402,33 +480,36 @@ export function CalendarPage(props: { id: CalendarPageId; initialDate: Date }) {eventClick={({ el, event, jsEvent }) => {jsEvent.preventDefault();if (!isActive()) return;- const selectedEvent = data.eventsById().get(event.id);+ const selectedEvent = eventByRenderId(calendarEventRenderId(event));if (selectedEvent) calendarView.selectEvent(selectedEvent, el);}}- eventDidMount={({ el, event }) => {- const calendarEvent = data.eventsById().get(event.id);+ eventDidMount={({ el, event, isMirror }) => {+ const eventId = calendarEventRenderId(event);+ const calendarEvent = eventByRenderId(eventId);if (calendarEvent) {el.style.setProperty('--event-calendar-color',calendarEvent.calendar.color);}- eventElements.set(event.id, el);+ if (isMirror) return;++ eventElements.set(eventId, el);// A re-render (query settling, live refresh) replaces chip elements.// Re-anchor an open details popover to the remounted chip — its old// anchor is a disconnected node the popover can't position against.- if (- isActive() &&- calendarView.eventState.selectedEventId === event.id- ) {- const selected = data.eventsById().get(event.id);+ if (isActive() && calendarView.eventState.selectedEventId === eventId) {+ const selected = eventByRenderId(eventId);if (selected) calendarView.selectEvent(selected, el);}notifyChipMount();}}- eventWillUnmount={({ el, event }) => {- if (eventElements.get(event.id) === el) {- eventElements.delete(event.id);+ eventWillUnmount={({ el, event, isMirror }) => {+ if (isMirror) return;++ const eventId = calendarEventRenderId(event);+ if (eventElements.get(eventId) === el) {+ eventElements.delete(eventId);}}}datesSet={handleDatesSet}@@ -485,8 +566,15 @@ export function CalendarPage(props: { id: CalendarPageId; initialDate: Date }) {<FullCalendar.EventContent>{(renderProps) => {- const event = data.eventsById().get(renderProps.event.id);- if (!event && renderProps.isMirror) {+ const event = eventByRenderId(+ calendarEventRenderId(renderProps.event)+ );+ if (+ !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"><span class="truncate font-semibold">New event</span>diff --git a/apps/web/src/features/calendar/calendar-view.tsx b/apps/web/src/features/calendar/calendar-view.tsxindex 28087f9bd3..b052d23c3f 100644--- a/apps/web/src/features/calendar/calendar-view.tsx+++ b/apps/web/src/features/calendar/calendar-view.tsx@@ -129,7 +129,7 @@ function CalendarPages() {!(event.target instanceof Element &&event.target.closest(- 'button, input, select, textarea, [role="button"]'+ 'button, input, select, textarea, [role="button"], .fc-event'))}diff --git a/apps/web/src/features/calendar/calendar.css b/apps/web/src/features/calendar/calendar.cssindex 7a0dda720c..f142a549f8 100644--- a/apps/web/src/features/calendar/calendar.css+++ b/apps/web/src/features/calendar/calendar.css@@ -237,6 +237,42 @@opacity 120ms ease-out;}+.calendar-view .fc .fc-event.fc-event-draggable {+ cursor: grab;+}++.calendar-view .fc .fc-event.fc-event-dragging {+ cursor: grabbing;+}++.calendar-view+ .fc+ .fc-event:has(.calendar-event-content-selected)+ .fc-event-resizer {+ display: block;+}++.calendar-view .fc .fc-event-resizer::after {+ position: absolute;+ top: 50%;+ left: 50%;+ border-radius: 9999px;+ background: var(--fc-event-border-color);+ box-shadow: 0 0 0 1px var(--color-surface);+ content: "";+ transform: translate(-50%, -50%);+}++.calendar-view .fc .fc-h-event .fc-event-resizer::after {+ width: 2px;+ height: 0.625rem;+}++.calendar-view .fc .fc-v-event .fc-event-resizer::after {+ width: 1rem;+ height: 2px;+}+.calendar-view .fc .fc-event-mirror,.calendar-view .fc .fc-highlight {border: 1px solid var(--calendar-selection-color, var(--color-accent));@@ -273,6 +309,11 @@color: inherit;}+/* Drag and resize mirrors use a filled accent background. */+.calendar-view .fc .fc-event-mirror .calendar-event-content {+ color: var(--color-surface);+}+.calendar-view .fc .fc-event-mirror .calendar-event-selection-preview {filter: invert(1) grayscale(1) contrast(100);}diff --git a/apps/web/src/features/calendar/events/event-interaction.ts b/apps/web/src/features/calendar/events/event-interaction.tsnew file mode 100644index 0000000000..1e88b3e5c1--- /dev/null+++ b/apps/web/src/features/calendar/events/event-interaction.ts@@ -0,0 +1,66 @@+import type { EventApi } from '@fullcalendar/core';+import type { EventTime } from '@service-email/generated/schemas/eventTime';+import type { CalendarEvent } from './types';++interface FullCalendarEventRange {+ allDay: boolean;+ end: Date | null;+ start: Date | null;+}++function formatLocalDate(date: Date) {+ return [+ date.getFullYear(),+ String(date.getMonth() + 1).padStart(2, '0'),+ String(date.getDate()).padStart(2, '0'),+ ].join('-');+}++/** Resolves the occurrence id retained in FullCalendar's interaction copies. */+export function calendarEventRenderId(+ event: Pick<EventApi, 'extendedProps' | 'id'>+) {+ const calendarEventId = event.extendedProps.calendarEventId;+ return typeof calendarEventId === 'string' ? calendarEventId : event.id;+}++/** Whether an occurrence can safely be moved or resized from the calendar. */+export function canEditCalendarEventTime(event: CalendarEvent) {+ return (+ !event.isReadOnly &&+ !event.isCancelled &&+ event.recurrenceLines.length === 0 &&+ event.recurrenceId === undefined+ );+}++/** Converts FullCalendar's post-interaction range into the update API shape. */+export function calendarEventTimeFromFullCalendar(+ event: FullCalendarEventRange,+ original: Pick<CalendarEvent, 'timeZone'>+): EventTime | undefined {+ const { start, end } = event;+ if (!start || !end || end <= start) return undefined;++ if (event.allDay) {+ const startDate = formatLocalDate(start);+ const endDate = formatLocalDate(end);+ if (endDate <= startDate) return undefined;++ return { kind: 'allDay', startDate, endDate };+ }++ return {+ kind: 'timed',+ startsAt: start.toISOString(),+ endsAt: end.toISOString(),+ timeZone:+ original.timeZone ?? Intl.DateTimeFormat().resolvedOptions().timeZone,+ };+}++/** Minimal FullCalendar change payload shared by drop and resize callbacks. */+export interface CalendarEventTimeChange {+ event: EventApi;+ revert: () => void;+}diff --git a/apps/web/src/features/calendar/events/event-mapper.ts b/apps/web/src/features/calendar/events/event-mapper.tsindex 5e2b029eca..fb1bcb1039 100644--- a/apps/web/src/features/calendar/events/event-mapper.ts+++ b/apps/web/src/features/calendar/events/event-mapper.ts@@ -1,10 +1,13 @@import type { EventInput } from '@fullcalendar/core';+import { canEditCalendarEventTime } from './event-interaction';import type { CalendarEvent } from './types';/** Maps calendar-owned event data into FullCalendar's rendering contract. */export function mapCalendarEventToFullCalendar(event: CalendarEvent): EventInput {+ const timeEditable = canEditCalendarEventTime(event);+return {id: event.id,title: event.title,@@ -12,6 +15,8 @@ export function mapCalendarEventToFullCalendar(end: event.end,allDay: event.allDay,display: 'block',+ startEditable: timeEditable,+ durationEditable: timeEditable,extendedProps: {calendarEventId: event.id,},