@agent-native/core 0.180.0-nightly-20260915184036 → 0.180.0

package/corpus/templates/calendar/app/hooks/use-view-preferences.ts

@@ -150,6 +150,28 @@ export function shouldApplyPreferencePoll(
   return requestedAtRevision === confirmedRevision;
 }
 
+export function mergePendingVisualPreferences(
+  remote: CalendarViewPreferences,
+  pending: Partial<CalendarViewPreferences>,
+): CalendarViewPreferences {
+  return normalizeCalendarViewPreferences({ ...remote, ...pending });
+}
+
+export function rollbackVisualPreferencePatch(
+  current: CalendarViewPreferences,
+  optimistic: Partial<CalendarViewPreferences>,
+  rollback: Partial<CalendarViewPreferences>,
+  activeKeys: readonly (keyof CalendarViewPreferences)[],
+): CalendarViewPreferences {
+  const rollbackEntries = activeKeys.flatMap((key) =>
+    Object.is(current[key], optimistic[key]) ? [[key, rollback[key]]] : [],
+  );
+  return normalizeCalendarViewPreferences({
+    ...current,
+    ...Object.fromEntries(rollbackEntries),
+  });
+}
+
 export function enqueueSourcePreferenceMutation<T>(
   chains: Record<string, Promise<unknown>>,
   preferenceKey: string,
@@ -160,6 +182,17 @@ export function enqueueSourcePreferenceMutation<T>(
   return request;
 }
 
+export function enqueueVisualPreferenceMutation<T>(
+  chains: Record<string, Promise<unknown>>,
+  run: () => Promise<T>,
+): Promise<T> {
+  return enqueueSourcePreferenceMutation(
+    chains,
+    CALENDAR_VIEW_PREFERENCES_KEY,
+    run,
+  );
+}
+
 async function readAppStatePreferences(): Promise<CalendarViewPreferences | null> {
   const controller = new AbortController();
   const abortTimer = setTimeout(() => controller.abort(), REFRESH_ABORT_MS);
@@ -192,6 +225,13 @@ function useViewPreferencesState(): ViewPreferencesContextValue {
   const visibilityMutationChains = useRef<Record<string, Promise<unknown>>>({});
   const colorMutationChains = useRef<Record<string, Promise<unknown>>>({});
   const accountMutationChains = useRef<Record<string, Promise<unknown>>>({});
+  const visualPreferenceRequestIds = useRef<
+    Partial<Record<keyof CalendarViewPreferences, number>>
+  >({});
+  const visualPreferenceMutationChains = useRef<
+    Record<string, Promise<unknown>>
+  >({});
+  const pendingVisualPreferences = useRef<Partial<CalendarViewPreferences>>({});
   const confirmedServerRevision = useRef(0);
 
   useEffect(() => {
@@ -237,14 +277,19 @@ function useViewPreferencesState(): ViewPreferencesContextValue {
               ...(pendingPreferences?.colors ?? {}),
               ...pendingAccountColors.current,
             };
+            const remoteWithPendingVisualPreferences =
+              mergePendingVisualPreferences(
+                remote,
+                pendingVisualPreferences.current,
+              );
             const next = normalizeCalendarViewPreferences({
-              ...remote,
+              ...remoteWithPendingVisualPreferences,
               googleCalendarVisibility: {
-                ...remote.googleCalendarVisibility,
+                ...remoteWithPendingVisualPreferences.googleCalendarVisibility,
                 ...pendingVisibility.current,
               },
               googleCalendarColors: {
-                ...remote.googleCalendarColors,
+                ...remoteWithPendingVisualPreferences.googleCalendarColors,
                 ...Object.fromEntries(
                   Object.entries(pendingGoogleColors.current).filter(
                     (entry): entry is [string, string] => entry[1] !== null,
@@ -254,7 +299,7 @@ function useViewPreferencesState(): ViewPreferencesContextValue {
               ...(Object.keys(pendingColors).length > 0
                 ? {
                     accountColorModes: {
-                      ...remote.accountColorModes,
+                      ...remoteWithPendingVisualPreferences.accountColorModes,
                       ...Object.fromEntries(
                         Object.keys(pendingColors).map((accountEmail) => [
                           accountEmail,
@@ -263,7 +308,7 @@ function useViewPreferencesState(): ViewPreferencesContextValue {
                       ),
                     },
                     accountColors: {
-                      ...remote.accountColors,
+                      ...remoteWithPendingVisualPreferences.accountColors,
                       ...pendingColors,
                     },
                   }
@@ -310,15 +355,82 @@ function useViewPreferencesState(): ViewPreferencesContextValue {
     };
   }, [demo]);
 
-  const update = useCallback((patch: Partial<ViewPreferences>) => {
-    setPrefs((prev) => {
-      const next = normalizeCalendarViewPreferences({ ...prev, ...patch });
-      save(next);
-      window.dispatchEvent(new Event(CALENDAR_VIEW_PREFERENCES_CHANGE_EVENT));
-      return next;
-    });
-    callAction("update-calendar-visual-preferences", patch).catch(() => {});
-  }, []);
+  const update = useCallback(
+    (patch: Partial<ViewPreferences>) => {
+      const preferenceKeys = Object.keys(
+        patch,
+      ) as (keyof CalendarViewPreferences)[];
+      if (preferenceKeys.length === 0) return;
+      const requestIds = new Map<keyof CalendarViewPreferences, number>();
+      for (const key of preferenceKeys) {
+        const requestId = (visualPreferenceRequestIds.current[key] ?? 0) + 1;
+        visualPreferenceRequestIds.current[key] = requestId;
+        requestIds.set(key, requestId);
+      }
+      let rollbackValues: Partial<CalendarViewPreferences> = {};
+      let optimisticValues: Partial<CalendarViewPreferences> = {};
+      setPrefs((prev) => {
+        const next = normalizeCalendarViewPreferences({ ...prev, ...patch });
+        rollbackValues = Object.fromEntries(
+          preferenceKeys.map((key) => [key, prev[key]]),
+        ) as Partial<CalendarViewPreferences>;
+        optimisticValues = Object.fromEntries(
+          preferenceKeys.map((key) => [key, next[key]]),
+        ) as Partial<CalendarViewPreferences>;
+        for (const key of preferenceKeys) {
+          pendingVisualPreferences.current[key] = next[key] as never;
+        }
+        save(next);
+        window.dispatchEvent(new Event(CALENDAR_VIEW_PREFERENCES_CHANGE_EVENT));
+        return next;
+      });
+
+      enqueueVisualPreferenceMutation(
+        visualPreferenceMutationChains.current,
+        () => callAction("update-calendar-visual-preferences", patch),
+      )
+        .then(() => {
+          let confirmed = false;
+          for (const key of preferenceKeys) {
+            if (
+              visualPreferenceRequestIds.current[key] === requestIds.get(key)
+            ) {
+              delete pendingVisualPreferences.current[key];
+              confirmed = true;
+            }
+          }
+          if (confirmed) confirmedServerRevision.current += 1;
+        })
+        .catch(() => {
+          const activeKeys = preferenceKeys.filter(
+            (key) =>
+              visualPreferenceRequestIds.current[key] === requestIds.get(key),
+          );
+          if (activeKeys.length === 0) return;
+          for (const key of activeKeys) {
+            delete pendingVisualPreferences.current[key];
+          }
+          setPrefs((current) => {
+            const next = rollbackVisualPreferencePatch(
+              current,
+              optimisticValues,
+              rollbackValues,
+              activeKeys,
+            );
+            if (calendarViewPreferencesEqual(current, next)) return current;
+            save(next);
+            window.dispatchEvent(
+              new Event(CALENDAR_VIEW_PREFERENCES_CHANGE_EVENT),
+            );
+            return next;
+          });
+          toast.error(
+            `${t("settings.saveFailed")}. ${t("common.tryAgain")}`, // i18n-key-ignore generated calendar catalog
+          );
+        });
+    },
+    [t],
+  );
 
   const updateAccountColor = useCallback(
     (accountEmail: string, accountColor: string) => {

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

@@ -665,6 +665,8 @@ const enUS = {
     calendarSettingsLoading:
       "Calendar settings are still loading. Try again in a moment.",
     day: "Day",
+    daysCount: "{{count}} days",
+    declinedEvents: "Declined events",
     display: "Display",
     endTimeAfterStart: "End time must be after start time",
     eventDeleted: "Event deleted",
@@ -675,6 +677,7 @@ const enUS = {
     failedRestoreAttendance: "Failed to restore attendance",
     failedMoveEvent: "Failed to move event",
     failedUpdateEvent: "Failed to update event",
+    generalSettings: "General settings",
     googleCalendarLinkUnavailable: "Google Calendar link unavailable",
     hideWeekends: "Hide weekends",
     loadingCalendars: "Loading calendars",
@@ -684,11 +687,17 @@ const enUS = {
     notificationEmptyDescription:
       "Calendar can pop browser alerts while this app is open. Clips desktop handles fuller meeting prompts with one-click notes.",
     openNavigation: "Open navigation",
+    numberOfDays: "Number of days",
+    other: "Other…",
     today: "Today",
     undo: "Undo",
     updatingEvent: "Updating event...",
     updatingRecurringEvent: "Updating recurring event...",
     week: "Week",
+    weekNumber: "Week {{number}}",
+    weekNumbers: "Week numbers",
+    weekends: "Weekends",
+    viewSettings: "View settings",
     timezoneSwitchTitle: "Use your browser timezone?",
     timezoneSwitchDescription:
       "Calendar is pinned to {{savedTimezone}}, but your browser is in {{browserTimezone}}. Switch the calendar timezone?",
@@ -7894,6 +7903,8 @@ const translatedCalendarRawBurnDown = {
       addTitleBeforeCreate: "创建事件前请添加标题",
       calendarSettingsLoading: "日历设置仍在加载。请稍后再试。",
       day: "日",
+      daysCount: "{{count}} 天",
+      declinedEvents: "已拒绝的事件",
       display: "显示",
       endTimeAfterStart: "结束时间必须晚于开始时间",
       eventDeleted: "事件已删除",
@@ -7904,6 +7915,7 @@ const translatedCalendarRawBurnDown = {
       failedRestoreAttendance: "恢复出席状态失败",
       failedMoveEvent: "移动事件失败",
       failedUpdateEvent: "更新事件失败",
+      generalSettings: "常规设置",
       googleCalendarLinkUnavailable: "Google Calendar 链接不可用",
       hideWeekends: "隐藏周末",
       loadingCalendars: "正在加载日历",
@@ -7913,11 +7925,17 @@ const translatedCalendarRawBurnDown = {
       notificationEmptyDescription:
         "此应用打开时，Calendar 可以显示浏览器提醒。Clips 桌面版会处理更完整的会议提示，并支持一键备注。",
       openNavigation: "打开导航",
+      numberOfDays: "天数",
+      other: "其他…",
       today: "今天",
       undo: "撤销",
       updatingEvent: "正在更新事件...",
       updatingRecurringEvent: "正在更新重复事件...",
       week: "周",
+      weekNumber: "第 {{number}} 周",
+      weekNumbers: "周数",
+      weekends: "周末",
+      viewSettings: "视图设置",
       timezoneSwitchTitle: "使用浏览器时区？",
       timezoneSwitchDescription:
         "日历固定为 {{savedTimezone}}，但浏览器使用 {{browserTimezone}}。要切换日历时区吗？",
@@ -8070,6 +8088,8 @@ const translatedCalendarRawBurnDown = {
       calendarSettingsLoading:
         "La configuración del calendario aún se está cargando. Inténtalo de nuevo en un momento.",
       day: "Día",
+      daysCount: "{{count}} días",
+      declinedEvents: "Eventos rechazados",
       display: "Mostrar",
       endTimeAfterStart:
         "La hora de finalización debe ser posterior a la de inicio",
@@ -8081,6 +8101,7 @@ const translatedCalendarRawBurnDown = {
       failedRestoreAttendance: "No se pudo restaurar la asistencia",
       failedMoveEvent: "No se pudo mover el evento",
       failedUpdateEvent: "No se pudo actualizar el evento",
+      generalSettings: "Configuración general",
       googleCalendarLinkUnavailable:
         "El enlace de Google Calendar no está disponible",
       hideWeekends: "Ocultar fines de semana",
@@ -8091,11 +8112,17 @@ const translatedCalendarRawBurnDown = {
       notificationEmptyDescription:
         "Calendar puede mostrar alertas del navegador mientras esta app está abierta. Clips de escritorio gestiona avisos de reunión más completos con notas en un clic.",
       openNavigation: "Abrir navegación",
+      numberOfDays: "Número de días",
+      other: "Otro…",
       today: "Hoy",
       undo: "Deshacer",
       updatingEvent: "Actualizando evento...",
       updatingRecurringEvent: "Actualizando evento recurrente...",
       week: "Semana",
+      weekNumber: "Semana {{number}}",
+      weekNumbers: "Números de semana",
+      weekends: "Fines de semana",
+      viewSettings: "Configuración de vista",
       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?",
@@ -8254,6 +8281,8 @@ const translatedCalendarRawBurnDown = {
       calendarSettingsLoading:
         "Les paramètres du calendrier sont encore en cours de chargement. Réessayez dans un instant.",
       day: "Jour",
+      daysCount: "{{count}} jours",
+      declinedEvents: "Événements refusés",
       display: "Affichage",
       endTimeAfterStart: "L'heure de fin doit être après l'heure de début",
       eventDeleted: "Événement supprimé",
@@ -8264,6 +8293,7 @@ const translatedCalendarRawBurnDown = {
       failedRestoreAttendance: "Échec de la restauration de la participation",
       failedMoveEvent: "Échec du déplacement de l'événement",
       failedUpdateEvent: "Échec de la mise à jour de l'événement",
+      generalSettings: "Paramètres généraux",
       googleCalendarLinkUnavailable: "Lien Google Calendar indisponible",
       hideWeekends: "Masquer les week-ends",
       loadingCalendars: "Chargement des calendriers",
@@ -8273,11 +8303,17 @@ const translatedCalendarRawBurnDown = {
       notificationEmptyDescription:
         "Calendar peut afficher des alertes du navigateur tant que cette app est ouverte. Clips desktop gère des rappels de réunion plus complets avec des notes en un clic.",
       openNavigation: "Ouvrir la navigation",
+      numberOfDays: "Nombre de jours",
+      other: "Autre…",
       today: "Aujourd'hui",
       undo: "Annuler",
       updatingEvent: "Mise à jour de l'événement...",
       updatingRecurringEvent: "Mise à jour de l'événement récurrent...",
       week: "Semaine",
+      weekNumber: "Semaine {{number}}",
+      weekNumbers: "Numéros de semaine",
+      weekends: "Week-ends",
+      viewSettings: "Paramètres d'affichage",
       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 ?",
@@ -8439,6 +8475,8 @@ const translatedCalendarRawBurnDown = {
       calendarSettingsLoading:
         "Die Kalendereinstellungen werden noch geladen. Versuchen Sie es gleich erneut.",
       day: "Tag",
+      daysCount: "{{count}} Tage",
+      declinedEvents: "Abgelehnte Ereignisse",
       display: "Anzeige",
       endTimeAfterStart: "Die Endzeit muss nach der Startzeit liegen",
       eventDeleted: "Ereignis gelöscht",
@@ -8450,6 +8488,7 @@ const translatedCalendarRawBurnDown = {
         "Teilnahme konnte nicht wiederhergestellt werden",
       failedMoveEvent: "Ereignis konnte nicht verschoben werden",
       failedUpdateEvent: "Ereignis konnte nicht aktualisiert werden",
+      generalSettings: "Allgemeine Einstellungen",
       googleCalendarLinkUnavailable: "Google Calendar-Link nicht verfügbar",
       hideWeekends: "Wochenenden ausblenden",
       loadingCalendars: "Kalender werden geladen",
@@ -8459,11 +8498,17 @@ const translatedCalendarRawBurnDown = {
       notificationEmptyDescription:
         "Calendar kann Browserbenachrichtigungen anzeigen, während diese App geöffnet ist. Clips Desktop übernimmt umfassendere Meeting-Hinweise mit Notizen per Klick.",
       openNavigation: "Navigation öffnen",
+      numberOfDays: "Anzahl der Tage",
+      other: "Andere…",
       today: "Heute",
       undo: "Rückgängig",
       updatingEvent: "Ereignis wird aktualisiert...",
       updatingRecurringEvent: "Wiederkehrendes Ereignis wird aktualisiert...",
       week: "Woche",
+      weekNumber: "Woche {{number}}",
+      weekNumbers: "Kalenderwochen",
+      weekends: "Wochenenden",
+      viewSettings: "Ansichtseinstellungen",
       timezoneSwitchTitle: "Browser-Zeitzone verwenden?",
       timezoneSwitchDescription:
         "Der Kalender ist auf {{savedTimezone}} festgelegt, aber Ihr Browser verwendet {{browserTimezone}}. Kalenderzeitzone wechseln?",
@@ -8623,6 +8668,8 @@ const translatedCalendarRawBurnDown = {
       calendarSettingsLoading:
         "カレンダー設定を読み込み中です。少し待ってからもう一度お試しください。",
       day: "日",
+      daysCount: "{{count}}日",
+      declinedEvents: "辞退した予定",
       display: "表示",
       endTimeAfterStart: "終了時刻は開始時刻より後にしてください",
       eventDeleted: "イベントを削除しました",
@@ -8633,6 +8680,7 @@ const translatedCalendarRawBurnDown = {
       failedRestoreAttendance: "出席の復元に失敗しました",
       failedMoveEvent: "イベントを移動できませんでした",
       failedUpdateEvent: "イベントを更新できませんでした",
+      generalSettings: "一般設定",
       googleCalendarLinkUnavailable: "Google Calendar リンクを利用できません",
       hideWeekends: "週末を非表示",
       loadingCalendars: "カレンダーを読み込み中",
@@ -8642,11 +8690,17 @@ const translatedCalendarRawBurnDown = {
       notificationEmptyDescription:
         "このアプリを開いている間、Calendar はブラウザー通知を表示できます。Clips デスクトップでは、ワンクリックのメモ付きでより詳しい会議通知を扱えます。",
       openNavigation: "ナビゲーションを開く",
+      numberOfDays: "表示日数",
+      other: "その他…",
       today: "今日",
       undo: "元に戻す",
       updatingEvent: "イベントを更新中...",
       updatingRecurringEvent: "繰り返しイベントを更新中...",
       week: "週",
+      weekNumber: "第{{number}}週",
+      weekNumbers: "週番号",
+      weekends: "週末",
+      viewSettings: "表示設定",
       timezoneSwitchTitle: "ブラウザのタイムゾーンを使用しますか？",
       timezoneSwitchDescription:
         "カレンダーは {{savedTimezone}} に固定されていますが、ブラウザは {{browserTimezone}} を使用しています。カレンダーのタイムゾーンを切り替えますか？",
@@ -8801,6 +8855,8 @@ const translatedCalendarRawBurnDown = {
       calendarSettingsLoading:
         "캘린더 설정을 아직 불러오는 중입니다. 잠시 후 다시 시도하세요.",
       day: "일",
+      daysCount: "{{count}}일",
+      declinedEvents: "거절된 일정",
       display: "표시",
       endTimeAfterStart: "종료 시간은 시작 시간보다 늦어야 합니다",
       eventDeleted: "이벤트가 삭제되었습니다",
@@ -8811,6 +8867,7 @@ const translatedCalendarRawBurnDown = {
       failedRestoreAttendance: "참석 상태를 복원하지 못했습니다",
       failedMoveEvent: "이벤트를 이동하지 못했습니다",
       failedUpdateEvent: "이벤트를 업데이트하지 못했습니다",
+      generalSettings: "일반 설정",
       googleCalendarLinkUnavailable:
         "Google Calendar 링크를 사용할 수 없습니다",
       hideWeekends: "주말 숨기기",
@@ -8821,11 +8878,17 @@ const translatedCalendarRawBurnDown = {
       notificationEmptyDescription:
         "이 앱이 열려 있는 동안 Calendar가 브라우저 알림을 표시할 수 있습니다. Clips 데스크톱은 원클릭 메모가 포함된 더 자세한 회의 알림을 처리합니다.",
       openNavigation: "탐색 열기",
+      numberOfDays: "표시할 일수",
+      other: "기타…",
       today: "오늘",
       undo: "실행 취소",
       updatingEvent: "이벤트 업데이트 중...",
       updatingRecurringEvent: "반복 이벤트 업데이트 중...",
       week: "주",
+      weekNumber: "{{number}}주",
+      weekNumbers: "주 번호",
+      weekends: "주말",
+      viewSettings: "보기 설정",
       timezoneSwitchTitle: "브라우저 시간대를 사용할까요?",
       timezoneSwitchDescription:
         "캘린더는 {{savedTimezone}}에 고정되어 있지만 브라우저는 {{browserTimezone}}을(를) 사용합니다. 캘린더 시간대를 전환할까요?",
@@ -8982,6 +9045,8 @@ const translatedCalendarRawBurnDown = {
       calendarSettingsLoading:
         "As configurações do calendário ainda estão carregando. Tente novamente em instantes.",
       day: "Dia",
+      daysCount: "{{count}} dias",
+      declinedEvents: "Eventos recusados",
       display: "Exibição",
       endTimeAfterStart:
         "O horário de término deve ser depois do horário de início",
@@ -8993,6 +9058,7 @@ const translatedCalendarRawBurnDown = {
       failedRestoreAttendance: "Falha ao restaurar a participação",
       failedMoveEvent: "Falha ao mover evento",
       failedUpdateEvent: "Falha ao atualizar evento",
+      generalSettings: "Configurações gerais",
       googleCalendarLinkUnavailable: "Link do Google Calendar indisponível",
       hideWeekends: "Ocultar fins de semana",
       loadingCalendars: "Carregando calendários",
@@ -9002,11 +9068,17 @@ const translatedCalendarRawBurnDown = {
       notificationEmptyDescription:
         "Calendar pode exibir alertas do navegador enquanto este app estiver aberto. O Clips desktop cuida de lembretes de reunião mais completos com notas em um clique.",
       openNavigation: "Abrir navegação",
+      numberOfDays: "Número de dias",
+      other: "Outro…",
       today: "Hoje",
       undo: "Desfazer",
       updatingEvent: "Atualizando evento...",
       updatingRecurringEvent: "Atualizando evento recorrente...",
       week: "Semana",
+      weekNumber: "Semana {{number}}",
+      weekNumbers: "Números da semana",
+      weekends: "Fins de semana",
+      viewSettings: "Configurações de visualização",
       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?",
@@ -9163,6 +9235,8 @@ const translatedCalendarRawBurnDown = {
       calendarSettingsLoading:
         "कैलेंडर सेटिंग अभी लोड हो रही हैं। कृपया थोड़ी देर में फिर कोशिश करें।",
       day: "दिन",
+      daysCount: "{{count}} दिन",
+      declinedEvents: "अस्वीकृत इवेंट",
       display: "डिस्प्ले",
       endTimeAfterStart: "समाप्ति समय प्रारंभ समय के बाद होना चाहिए",
       eventDeleted: "इवेंट मिटा दिया गया",
@@ -9173,6 +9247,7 @@ const translatedCalendarRawBurnDown = {
       failedRestoreAttendance: "उपस्थिति बहाल करने में विफल",
       failedMoveEvent: "इवेंट स्थानांतरित करने में विफल",
       failedUpdateEvent: "इवेंट अपडेट करने में विफल",
+      generalSettings: "सामान्य सेटिंग",
       googleCalendarLinkUnavailable: "Google Calendar लिंक उपलब्ध नहीं है",
       hideWeekends: "सप्ताहांत छिपाएं",
       loadingCalendars: "कैलेंडर लोड हो रहे हैं",
@@ -9182,11 +9257,17 @@ const translatedCalendarRawBurnDown = {
       notificationEmptyDescription:
         "यह ऐप खुला होने पर Calendar ब्राउज़र अलर्ट दिखा सकता है। Clips डेस्कटॉप एक-क्लिक नोट्स के साथ अधिक पूर्ण मीटिंग संकेत संभालता है।",
       openNavigation: "नेविगेशन खोलें",
+      numberOfDays: "दिनों की संख्या",
+      other: "अन्य…",
       today: "आज",
       undo: "पहले जैसा करें",
       updatingEvent: "इवेंट अपडेट हो रहा है...",
       updatingRecurringEvent: "दोहराया जाने वाला इवेंट अपडेट हो रहा है...",
       week: "सप्ताह",
+      weekNumber: "सप्ताह {{number}}",
+      weekNumbers: "सप्ताह संख्या",
+      weekends: "सप्ताहांत",
+      viewSettings: "दृश्य सेटिंग",
       timezoneSwitchTitle: "ब्राउज़र का टाइमज़ोन इस्तेमाल करें?",
       timezoneSwitchDescription:
         "कैलेंडर {{savedTimezone}} पर पिन है, लेकिन आपका ब्राउज़र {{browserTimezone}} पर है। कैलेंडर टाइमज़ोन बदलें?",
@@ -9342,6 +9423,8 @@ const translatedCalendarRawBurnDown = {
       calendarSettingsLoading:
         "لا تزال إعدادات التقويم قيد التحميل. حاول مرة أخرى بعد قليل.",
       day: "اليوم",
+      daysCount: "{{count}} يوم",
+      declinedEvents: "الأحداث المرفوضة",
       display: "العرض",
       endTimeAfterStart: "يجب أن يكون وقت الانتهاء بعد وقت البدء",
       eventDeleted: "تم حذف الحدث",
@@ -9352,6 +9435,7 @@ const translatedCalendarRawBurnDown = {
       failedRestoreAttendance: "فشل استعادة الحضور",
       failedMoveEvent: "فشل نقل الحدث",
       failedUpdateEvent: "فشل تحديث الحدث",
+      generalSettings: "الإعدادات العامة",
       googleCalendarLinkUnavailable: "رابط Google Calendar غير متاح",
       hideWeekends: "إخفاء عطلات نهاية الأسبوع",
       loadingCalendars: "جارٍ تحميل التقويمات",
@@ -9361,11 +9445,17 @@ const translatedCalendarRawBurnDown = {
       notificationEmptyDescription:
         "يمكن لـ Calendar عرض تنبيهات المتصفح أثناء فتح هذا التطبيق. يتولى Clips لسطح المكتب مطالبات اجتماع أكثر اكتمالًا مع ملاحظات بنقرة واحدة.",
       openNavigation: "فتح التنقل",
+      numberOfDays: "عدد الأيام",
+      other: "أخرى…",
       today: "اليوم",
       undo: "تراجع",
       updatingEvent: "جارٍ تحديث الحدث...",
       updatingRecurringEvent: "جارٍ تحديث الحدث المتكرر...",
       week: "الأسبوع",
+      weekNumber: "الأسبوع {{number}}",
+      weekNumbers: "أرقام الأسابيع",
+      weekends: "عطلات نهاية الأسبوع",
+      viewSettings: "إعدادات العرض",
       timezoneSwitchTitle: "استخدام المنطقة الزمنية للمتصفح؟",
       timezoneSwitchDescription:
         "التقويم مثبت على {{savedTimezone}}، لكن متصفحك يستخدم {{browserTimezone}}. هل تريد تبديل المنطقة الزمنية للتقويم؟",

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

@@ -1,11 +1,10 @@
 import {
   addDays,
   addMonths,
-  addWeeks,
+  eachDayOfInterval,
   startOfWeek,
   subDays,
   subMonths,
-  subWeeks,
 } from "date-fns";
 
 import { dateKeyToDate, dateToCalendarDateKey } from "./calendar-timezone";
@@ -18,6 +17,7 @@ export function navigateCalendarDate(
   selectedDate: Date,
   direction: CalendarNavigationDirection,
   weekStartsOn: 0 | 1,
+  numberOfDays = 7,
 ): Date {
   switch (viewMode) {
     case "month":
@@ -25,13 +25,20 @@ export function navigateCalendarDate(
         ? addMonths(selectedDate, 1)
         : subMonths(selectedDate, 1);
     case "week": {
-      const navigatedDate =
-        direction === "next"
-          ? addWeeks(selectedDate, 1)
-          : subWeeks(selectedDate, 1);
-      return dateKeyToDate(
-        dateToCalendarDateKey(startOfWeek(navigatedDate, { weekStartsOn })),
-      );
+      const displayedDays = Number.isInteger(numberOfDays)
+        ? Math.min(31, Math.max(1, numberOfDays))
+        : 7;
+      const periodStart =
+        displayedDays === 7
+          ? dateKeyToDate(
+              dateToCalendarDateKey(
+                startOfWeek(selectedDate, { weekStartsOn }),
+              ),
+            )
+          : selectedDate;
+      return direction === "next"
+        ? addDays(periodStart, displayedDays)
+        : subDays(periodStart, displayedDays);
     }
     case "day":
       return direction === "next"
@@ -39,3 +46,16 @@ export function navigateCalendarDate(
         : subDays(selectedDate, 1);
   }
 }
+
+export function getVisibleCalendarDays(
+  start: Date,
+  end: Date,
+  hideWeekends: boolean,
+): Date[] {
+  const fullRange = eachDayOfInterval({ start, end });
+  if (!hideWeekends) return fullRange;
+  const weekdays = fullRange.filter(
+    (day) => day.getDay() !== 0 && day.getDay() !== 6,
+  );
+  return weekdays.length > 0 ? weekdays : fullRange;
+}

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

@@ -167,12 +167,14 @@ export function getViewDateRange(
   selectedDate: Date,
   timezone: string,
   weekStartsOn: 0 | 1 = 0,
+  numberOfDays = 7,
 ): { from: string; to: string } {
   return getCalendarViewDateRange(
     viewMode,
     dateToCalendarDateKey(selectedDate),
     normalizeTimezone(timezone),
     weekStartsOn,
+    numberOfDays,
   );
 }
 

package/corpus/templates/calendar/app/lib/event-time-range.ts

@@ -165,6 +165,40 @@ export function shiftEndForStartChange(
   return { ...next, endDate: repaired.date, endTime: repaired.time };
 }
 
+/**
+ * Move a timed event's start date without changing its visible duration. The
+ * end date is shifted by the same number of calendar days; this keeps a
+ * multi-day event intact when its start date changes in the composer.
+ */
+export function shiftEndForDateChange(
+  range: EventTimeRange,
+  nextDate: string,
+): EventTimeRange {
+  const next = { ...range, date: nextDate };
+  const currentStart = rangeToAbsoluteMinutes(range.date, range.startTime);
+  const nextStart = rangeToAbsoluteMinutes(nextDate, range.startTime);
+  if (currentStart === null || nextStart === null) return next;
+
+  const shifted = addMinutesToTimeValue(
+    range.endDate,
+    range.endTime,
+    nextStart - currentStart,
+  );
+  if (!shifted) return next;
+  const shiftedEnd = rangeToAbsoluteMinutes(shifted.date, shifted.time);
+  if (shiftedEnd !== null && shiftedEnd > nextStart) {
+    return { ...next, endDate: shifted.date, endTime: shifted.time };
+  }
+
+  const repaired = addMinutesToTimeValue(
+    nextDate,
+    range.startTime,
+    TIME_SLOT_MINUTES,
+  );
+  if (!repaired) return next;
+  return { ...next, endDate: repaired.date, endTime: repaired.time };
+}
+
 /**
  * Resolves an end-time pick against the start. A pick that reads as earlier in
  * the day is the wrapped option from `buildTimeOptions`, so it belongs to the