@agent-native/core 0.159.5 → 0.160.1

package/corpus/templates/calendar/app/hooks/use-event-drag.ts

@@ -1,7 +1,17 @@
 import type { CalendarEvent } from "@shared/api";
-import { parseISO, startOfDay, set, addMinutes } from "date-fns";
+import { parseISO, startOfDay } from "date-fns";
 import { useState, useRef, useCallback, useEffect } from "react";
 
+import {
+  addCalendarDays,
+  dateKeyToDate,
+  dateKeyToTimezoneIso,
+  dateToCalendarDateKey,
+  getBrowserTimezone,
+  getEventDateKey,
+  getEventSegmentForCalendarDay,
+} from "@/lib/calendar-timezone";
+
 const SNAP_MINUTES = 15;
 
 interface DragState {
@@ -48,6 +58,8 @@ export interface UseEventDragOptions {
   onEventTimeChange: (eventId: string, newStart: Date, newEnd: Date) => void;
   /** All events (to find the event being dragged) */
   events: CalendarEvent[];
+  /** IANA timezone used by the visible calendar grid */
+  timezone?: string;
 }
 
 export function useEventDrag({
@@ -57,6 +69,7 @@ export function useEventDrag({
   days,
   onEventTimeChange,
   events,
+  timezone = getBrowserTimezone(),
 }: UseEventDragOptions) {
   const [dragState, setDragState] = useState<DragState | null>(null);
   const dragStateRef = useRef<DragState | null>(null);
@@ -127,10 +140,13 @@ export function useEventDrag({
       // Compute current event position
       const evStart = parseISO(event.start);
       const evEnd = parseISO(event.end);
-      const dayStart = set(startOfDay(evStart), {
-        hours: startHour,
-      });
-      const startMinutes = (evStart.getTime() - dayStart.getTime()) / 60000;
+      const eventDateKey =
+        getEventDateKey(event, timezone) ?? dateToCalendarDateKey(evStart);
+      const eventDay = days?.[dayIndex] ?? dateKeyToDate(eventDateKey);
+      const segment = getEventSegmentForCalendarDay(event, eventDay, timezone);
+      const startMinutes =
+        segment?.startMinutes ??
+        (evStart.getTime() - startOfDay(evStart).getTime()) / 60000;
       const durationMinutes = (evEnd.getTime() - evStart.getTime()) / 60000;
 
       const originalTop = Math.max(0, (startMinutes / 60) * hourHeight);
@@ -172,6 +188,7 @@ export function useEventDrag({
       getScrollTop,
       startHour,
       hourHeight,
+      timezone,
     ],
   );
 
@@ -288,20 +305,39 @@ export function useEventDrag({
         pxToMinutes(state.currentHeight),
       );
 
-      // Determine the base day
+      // Determine the base day in the visible calendar timezone.
       const originalStart = parseISO(state.event.start);
-      let baseDay: Date;
-      if (days && state.currentDayIndex !== state.startDayIndex) {
-        baseDay = days[state.currentDayIndex];
-      } else {
-        baseDay = startOfDay(originalStart);
-      }
-
-      const newStart = addMinutes(
-        set(baseDay, { hours: startHour, minutes: 0, seconds: 0 }),
-        topMinutes,
-      );
-      const newEnd = addMinutes(newStart, heightMinutes);
+      const baseDay =
+        days && state.currentDayIndex !== state.startDayIndex
+          ? days[state.currentDayIndex]
+          : dateKeyToDate(
+              getEventDateKey(state.event, timezone) ??
+                dateToCalendarDateKey(originalStart),
+            );
+      const baseDate = dateToCalendarDateKey(baseDay);
+      const startTotalMinutes = startHour * 60 + topMinutes;
+      const endTotalMinutes = startTotalMinutes + heightMinutes;
+      const toZonedIso = (totalMinutes: number) => {
+        const dayOffset = Math.floor(totalMinutes / (24 * 60));
+        const minuteOfDay = totalMinutes - dayOffset * 24 * 60;
+        const hour = Math.floor(minuteOfDay / 60);
+        const minute = Math.round(minuteOfDay % 60);
+        const normalizedMinute = minute === 60 ? 0 : minute;
+        const normalizedHour = minute === 60 ? hour + 1 : hour;
+        const time =
+          normalizedHour >= 24
+            ? "00:00"
+            : `${String(normalizedHour).padStart(2, "0")}:${String(
+                normalizedMinute,
+              ).padStart(2, "0")}`;
+        return dateKeyToTimezoneIso(
+          addCalendarDays(baseDate, dayOffset),
+          time,
+          timezone,
+        );
+      };
+      const newStart = new Date(toZonedIso(startTotalMinutes));
+      const newEnd = new Date(toZonedIso(endTotalMinutes));
 
       onEventTimeChange(state.eventId, newStart, newEnd);
     }
@@ -314,6 +350,7 @@ export function useEventDrag({
     days,
     startHour,
     onEventTimeChange,
+    timezone,
   ]);
 
   const cancelDrag = useCallback(() => {

package/corpus/templates/calendar/app/i18n-data.ts

@@ -664,6 +664,7 @@ const enUS = {
     },
   },
   calendarView: {
+    addWorkingLocation: "Add working location",
     addTitleBeforeCreate: "Add a title before creating the event",
     calendarSettingsLoading:
       "Calendar settings are still loading. Try again in a moment.",
@@ -692,6 +693,11 @@ const enUS = {
     updatingEvent: "Updating event...",
     updatingRecurringEvent: "Updating recurring event...",
     week: "Week",
+    timezoneSwitchTitle: "Use your browser timezone?",
+    timezoneSwitchDescription:
+      "Calendar is pinned to {{savedTimezone}}, but your browser is in {{browserTimezone}}. Switch the calendar timezone?",
+    timezoneSwitchKeep: "Keep {{timezone}}",
+    timezoneSwitchSwitch: "Switch to {{timezone}}",
   },
   eventForm: {
     addAttachment: "Add attachment",
@@ -8014,6 +8020,7 @@ const translatedCalendarRawBurnDown = {
       yourInformation: "你的信息",
     },
     calendarView: {
+      addWorkingLocation: "添加工作地点",
       addTitleBeforeCreate: "创建事件前请添加标题",
       calendarSettingsLoading: "日历设置仍在加载。请稍后再试。",
       day: "日",
@@ -8041,6 +8048,11 @@ const translatedCalendarRawBurnDown = {
       updatingEvent: "正在更新事件...",
       updatingRecurringEvent: "正在更新重复事件...",
       week: "周",
+      timezoneSwitchTitle: "使用浏览器时区？",
+      timezoneSwitchDescription:
+        "日历固定为 {{savedTimezone}}，但浏览器使用 {{browserTimezone}}。要切换日历时区吗？",
+      timezoneSwitchKeep: "保留 {{timezone}}",
+      timezoneSwitchSwitch: "切换到 {{timezone}}",
     },
     routeTitles: {
       bookingLinks: "预约链接 — Calendar",
@@ -8183,6 +8195,7 @@ const translatedCalendarRawBurnDown = {
       yourInformation: "Tu información",
     },
     calendarView: {
+      addWorkingLocation: "Añadir ubicación de trabajo",
       addTitleBeforeCreate: "Añade un título antes de crear el evento",
       calendarSettingsLoading:
         "La configuración del calendario aún se está cargando. Inténtalo de nuevo en un momento.",
@@ -8213,6 +8226,11 @@ const translatedCalendarRawBurnDown = {
       updatingEvent: "Actualizando evento...",
       updatingRecurringEvent: "Actualizando evento recurrente...",
       week: "Semana",
+      timezoneSwitchTitle: "¿Usar la zona horaria del navegador?",
+      timezoneSwitchDescription:
+        "El calendario está fijado en {{savedTimezone}}, pero tu navegador usa {{browserTimezone}}. ¿Cambiar la zona horaria del calendario?",
+      timezoneSwitchKeep: "Mantener {{timezone}}",
+      timezoneSwitchSwitch: "Cambiar a {{timezone}}",
     },
     routeTitles: {
       bookingLinks: "Enlaces de reserva — Calendar",
@@ -8361,6 +8379,7 @@ const translatedCalendarRawBurnDown = {
       yourInformation: "Vos informations",
     },
     calendarView: {
+      addWorkingLocation: "Ajouter un lieu de travail",
       addTitleBeforeCreate: "Ajoutez un titre avant de créer l'événement",
       calendarSettingsLoading:
         "Les paramètres du calendrier sont encore en cours de chargement. Réessayez dans un instant.",
@@ -8389,6 +8408,11 @@ const translatedCalendarRawBurnDown = {
       updatingEvent: "Mise à jour de l'événement...",
       updatingRecurringEvent: "Mise à jour de l'événement récurrent...",
       week: "Semaine",
+      timezoneSwitchTitle: "Utiliser le fuseau horaire du navigateur ?",
+      timezoneSwitchDescription:
+        "Le calendrier est fixé sur {{savedTimezone}}, mais votre navigateur utilise {{browserTimezone}}. Changer le fuseau horaire du calendrier ?",
+      timezoneSwitchKeep: "Conserver {{timezone}}",
+      timezoneSwitchSwitch: "Passer à {{timezone}}",
     },
     routeTitles: {
       bookingLinks: "Liens de réservation — Calendar",
@@ -8539,6 +8563,7 @@ const translatedCalendarRawBurnDown = {
       yourInformation: "Deine Informationen",
     },
     calendarView: {
+      addWorkingLocation: "Arbeitsort hinzufügen",
       addTitleBeforeCreate:
         "Fügen Sie einen Titel hinzu, bevor Sie das Ereignis erstellen",
       calendarSettingsLoading:
@@ -8569,6 +8594,11 @@ const translatedCalendarRawBurnDown = {
       updatingEvent: "Ereignis wird aktualisiert...",
       updatingRecurringEvent: "Wiederkehrendes Ereignis wird aktualisiert...",
       week: "Woche",
+      timezoneSwitchTitle: "Browser-Zeitzone verwenden?",
+      timezoneSwitchDescription:
+        "Der Kalender ist auf {{savedTimezone}} festgelegt, aber Ihr Browser verwendet {{browserTimezone}}. Kalenderzeitzone wechseln?",
+      timezoneSwitchKeep: "{{timezone}} beibehalten",
+      timezoneSwitchSwitch: "Zu {{timezone}} wechseln",
     },
     routeTitles: {
       bookingLinks: "Buchungslinks — Calendar",
@@ -8718,6 +8748,7 @@ const translatedCalendarRawBurnDown = {
       yourInformation: "あなたの情報",
     },
     calendarView: {
+      addWorkingLocation: "勤務場所を追加",
       addTitleBeforeCreate: "イベントを作成する前にタイトルを追加してください",
       calendarSettingsLoading:
         "カレンダー設定を読み込み中です。少し待ってからもう一度お試しください。",
@@ -8746,6 +8777,11 @@ const translatedCalendarRawBurnDown = {
       updatingEvent: "イベントを更新中...",
       updatingRecurringEvent: "繰り返しイベントを更新中...",
       week: "週",
+      timezoneSwitchTitle: "ブラウザのタイムゾーンを使用しますか？",
+      timezoneSwitchDescription:
+        "カレンダーは {{savedTimezone}} に固定されていますが、ブラウザは {{browserTimezone}} を使用しています。カレンダーのタイムゾーンを切り替えますか？",
+      timezoneSwitchKeep: "{{timezone}} を維持",
+      timezoneSwitchSwitch: "{{timezone}} に切り替え",
     },
     routeTitles: {
       bookingLinks: "予約リンク — Calendar",
@@ -8890,6 +8926,7 @@ const translatedCalendarRawBurnDown = {
       yourInformation: "내 정보",
     },
     calendarView: {
+      addWorkingLocation: "근무 위치 추가",
       addTitleBeforeCreate: "이벤트를 만들기 전에 제목을 추가하세요",
       calendarSettingsLoading:
         "캘린더 설정을 아직 불러오는 중입니다. 잠시 후 다시 시도하세요.",
@@ -8919,6 +8956,11 @@ const translatedCalendarRawBurnDown = {
       updatingEvent: "이벤트 업데이트 중...",
       updatingRecurringEvent: "반복 이벤트 업데이트 중...",
       week: "주",
+      timezoneSwitchTitle: "브라우저 시간대를 사용할까요?",
+      timezoneSwitchDescription:
+        "캘린더는 {{savedTimezone}}에 고정되어 있지만 브라우저는 {{browserTimezone}}을(를) 사용합니다. 캘린더 시간대를 전환할까요?",
+      timezoneSwitchKeep: "{{timezone}} 유지",
+      timezoneSwitchSwitch: "{{timezone}}(으)로 전환",
     },
     routeTitles: {
       bookingLinks: "예약 링크 — Calendar",
@@ -9065,6 +9107,7 @@ const translatedCalendarRawBurnDown = {
       yourInformation: "Suas informações",
     },
     calendarView: {
+      addWorkingLocation: "Adicionar local de trabalho",
       addTitleBeforeCreate: "Adicione um título antes de criar o evento",
       calendarSettingsLoading:
         "As configurações do calendário ainda estão carregando. Tente novamente em instantes.",
@@ -9094,6 +9137,11 @@ const translatedCalendarRawBurnDown = {
       updatingEvent: "Atualizando evento...",
       updatingRecurringEvent: "Atualizando evento recorrente...",
       week: "Semana",
+      timezoneSwitchTitle: "Usar o fuso horário do navegador?",
+      timezoneSwitchDescription:
+        "O calendário está fixado em {{savedTimezone}}, mas o navegador usa {{browserTimezone}}. Mudar o fuso horário do calendário?",
+      timezoneSwitchKeep: "Manter {{timezone}}",
+      timezoneSwitchSwitch: "Mudar para {{timezone}}",
     },
     routeTitles: {
       bookingLinks: "Links de reserva — Calendar",
@@ -9240,6 +9288,7 @@ const translatedCalendarRawBurnDown = {
       yourInformation: "आपकी जानकारी",
     },
     calendarView: {
+      addWorkingLocation: "कार्य स्थान जोड़ें",
       addTitleBeforeCreate: "इवेंट बनाने से पहले शीर्षक जोड़ें",
       calendarSettingsLoading:
         "कैलेंडर सेटिंग अभी लोड हो रही हैं। कृपया थोड़ी देर में फिर कोशिश करें।",
@@ -9268,6 +9317,11 @@ const translatedCalendarRawBurnDown = {
       updatingEvent: "इवेंट अपडेट हो रहा है...",
       updatingRecurringEvent: "दोहराया जाने वाला इवेंट अपडेट हो रहा है...",
       week: "सप्ताह",
+      timezoneSwitchTitle: "ब्राउज़र का टाइमज़ोन इस्तेमाल करें?",
+      timezoneSwitchDescription:
+        "कैलेंडर {{savedTimezone}} पर पिन है, लेकिन आपका ब्राउज़र {{browserTimezone}} पर है। कैलेंडर टाइमज़ोन बदलें?",
+      timezoneSwitchKeep: "{{timezone}} रखें",
+      timezoneSwitchSwitch: "{{timezone}} पर बदलें",
     },
     routeTitles: {
       bookingLinks: "बुकिंग लिंक — Calendar",
@@ -9413,6 +9467,7 @@ const translatedCalendarRawBurnDown = {
       yourInformation: "معلوماتك",
     },
     calendarView: {
+      addWorkingLocation: "إضافة موقع العمل",
       addTitleBeforeCreate: "أضف عنوانًا قبل إنشاء الحدث",
       calendarSettingsLoading:
         "لا تزال إعدادات التقويم قيد التحميل. حاول مرة أخرى بعد قليل.",
@@ -9441,6 +9496,11 @@ const translatedCalendarRawBurnDown = {
       updatingEvent: "جارٍ تحديث الحدث...",
       updatingRecurringEvent: "جارٍ تحديث الحدث المتكرر...",
       week: "الأسبوع",
+      timezoneSwitchTitle: "استخدام المنطقة الزمنية للمتصفح؟",
+      timezoneSwitchDescription:
+        "التقويم مثبت على {{savedTimezone}}، لكن متصفحك يستخدم {{browserTimezone}}. هل تريد تبديل المنطقة الزمنية للتقويم؟",
+      timezoneSwitchKeep: "الاحتفاظ بـ {{timezone}}",
+      timezoneSwitchSwitch: "التبديل إلى {{timezone}}",
     },
     routeTitles: {
       bookingLinks: "روابط الحجز — Calendar",

package/corpus/templates/calendar/app/lib/all-day-layout.ts

@@ -1,6 +1,11 @@
 import type { CalendarEvent } from "@shared/api";
-import { addDays, format, parseISO, startOfDay } from "date-fns";
 
+import {
+  addCalendarDays,
+  dateToCalendarDateKey,
+  eventOverlapsCalendarDay,
+  getBrowserTimezone,
+} from "@/lib/calendar-timezone";
 import { getFullDayOutOfOfficeDateRange } from "@/lib/out-of-office";
 import { isWorkingLocationEvent } from "@/lib/working-location";
 
@@ -37,22 +42,24 @@ export function partitionAllDayEvents(events: CalendarEvent[]) {
 export function getAllDaySpan(
   event: CalendarEvent,
   days: Date[],
+  timezone: string = getBrowserTimezone(),
 ): Omit<AllDaySpan, "event"> | null {
-  const eventStart = parseISO(event.start);
-  const eventEnd = event.end ? parseISO(event.end) : addDays(eventStart, 1);
   const outOfOfficeRange = getFullDayOutOfOfficeDateRange(event);
+  const eventStartDate = event.start.slice(0, 10);
+  const eventEndDate =
+    event.end?.slice(0, 10) ?? addCalendarDays(eventStartDate, 1);
 
   let startCol = -1;
   let endCol = -1;
 
   for (let index = 0; index < days.length; index++) {
-    const dayStart = startOfDay(days[index]);
-    const dayEnd = addDays(dayStart, 1);
-    const dayDate = format(days[index], "yyyy-MM-dd");
+    const dayDate = dateToCalendarDateKey(days[index]);
     const overlaps = outOfOfficeRange
       ? dayDate >= outOfOfficeRange.startDate &&
         dayDate < outOfOfficeRange.endDateExclusive
-      : eventStart < dayEnd && eventEnd > dayStart;
+      : event.allDay
+        ? eventStartDate <= dayDate && eventEndDate > dayDate
+        : eventOverlapsCalendarDay(event, days[index], timezone);
     if (overlaps) {
       if (startCol === -1) startCol = index;
       endCol = index;
@@ -71,10 +78,11 @@ function compareSpans(a: AllDaySpan, b: AllDaySpan): number {
 export function layoutAllDayEvents(
   events: CalendarEvent[],
   days: Date[],
+  timezone: string = getBrowserTimezone(),
 ): AllDayLayout {
   const spans = events
     .map((event) => {
-      const span = getAllDaySpan(event, days);
+      const span = getAllDaySpan(event, days, timezone);
       return span ? { event, ...span } : null;
     })
     .filter((span): span is AllDaySpan => span !== null)

package/corpus/templates/calendar/app/lib/calendar-drafts.ts

@@ -0,0 +1,56 @@
+import type { CalendarEventDraft } from "@shared/api";
+
+import { addCalendarDays, dateToCalendarDateKey } from "./calendar-timezone";
+
+export function resolveDraftWorkingLocation(
+  draft: Pick<
+    CalendarEventDraft,
+    "workingLocationType" | "workingLocationLabel" | "location"
+  >,
+): {
+  workingLocationType: "homeOffice" | "officeLocation" | "customLocation";
+  workingLocationLabel: string;
+} {
+  return {
+    workingLocationType: draft.workingLocationType ?? "homeOffice",
+    // Drafts initialize `location` to "", so `??` would drop the Other name.
+    workingLocationLabel: (
+      draft.workingLocationLabel ||
+      draft.location ||
+      ""
+    ).trim(),
+  };
+}
+
+export function buildWorkingLocationDraft({
+  id,
+  date,
+  accountEmail,
+  now = new Date().toISOString(),
+}: {
+  id: string;
+  date: Date;
+  accountEmail?: string;
+  now?: string;
+}): CalendarEventDraft {
+  const dateKey = dateToCalendarDateKey(date);
+  return {
+    id,
+    title: "",
+    description: "",
+    location: "",
+    start: dateKey,
+    end: addCalendarDays(dateKey, 1),
+    startTimeZone: undefined,
+    endTimeZone: undefined,
+    allDay: true,
+    eventType: "workingLocation",
+    workingLocationType: "homeOffice",
+    workingLocationLabel: "",
+    transparency: "transparent",
+    visibility: "public",
+    accountEmail,
+    createdAt: now,
+    updatedAt: now,
+  };
+}