Autoformatter broke formatting, needs , between statements.

src/components/CalendarView.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount, computed, watch } from 'vue'
+import { ref, onMounted, onBeforeUnmount, computed, watch, nextTick } from 'vue'
 import { useCalendarStore } from '@/stores/CalendarStore'
 import CalendarHeader from '@/components/CalendarHeader.vue'
 import CalendarWeek from '@/components/CalendarWeek.vue'
@@ -397,6 +397,154 @@ const handleEventClick = (payload) => {
   openEditEventDialog(payload)
 }
 
+// ------------------------------
+// Event Search (Ctrl/Cmd+F)
+// ------------------------------
+const searchOpen = ref(false)
+const searchQuery = ref('')
+const searchResults = ref([]) // [{ id, title, startDate }]
+const searchIndex = ref(0)
+const searchInputRef = ref(null)
+
+function isEditableElement(el) {
+  if (!el) return false
+  const tag = el.tagName
+  if (tag === 'INPUT' || tag === 'TEXTAREA' || el.isContentEditable) return true
+  return false
+}
+
+function buildSearchResults() {
+  const q = searchQuery.value.trim().toLowerCase()
+  if (!q) {
+    searchResults.value = []
+    searchIndex.value = 0
+    return
+  }
+  const out = []
+  for (const ev of calendarStore.events.values()) {
+    const title = (ev.title || '').trim()
+    if (!title) continue
+    if (title.toLowerCase().includes(q)) {
+      out.push({ id: ev.id, title: title, startDate: ev.startDate })
+    }
+  }
+  out.sort((a, b) => (a.startDate < b.startDate ? -1 : a.startDate > b.startDate ? 1 : 0))
+  searchResults.value = out
+  if (searchIndex.value >= out.length) searchIndex.value = 0
+}
+
+watch(searchQuery, buildSearchResults)
+watch(
+  () => calendarStore.eventsMutation,
+  () => {
+    if (searchOpen.value && searchQuery.value.trim()) buildSearchResults()
+  },
+)
+
+function openSearch(prefill = '') {
+  searchOpen.value = true
+  if (prefill) searchQuery.value = prefill
+  nextTick(() => {
+    if (searchInputRef.value) {
+      searchInputRef.value.focus()
+      searchInputRef.value.select()
+    }
+  })
+  buildSearchResults()
+}
+function closeSearch() {
+  searchOpen.value = false
+}
+function navigateSearch(delta) {
+  const n = searchResults.value.length
+  if (!n) return
+  searchIndex.value = (searchIndex.value + delta + n) % n
+  scrollToCurrentResult()
+}
+function scrollToCurrentResult() {
+  const cur = searchResults.value[searchIndex.value]
+  if (!cur) return
+  // Scroll so week containing event is near top (offset 2 weeks for context)
+  try {
+    const dateObj = fromLocalString(cur.startDate, DEFAULT_TZ)
+    const weekIndex = getWeekIndex(dateObj)
+    const offsetWeeks = 2
+    const targetScrollWeek = Math.max(minVirtualWeek.value, weekIndex - offsetWeeks)
+    const newScrollTop = (targetScrollWeek - minVirtualWeek.value) * rowHeight.value
+    setScrollTop(newScrollTop, 'search-jump')
+    scheduleWindowUpdate('search-jump')
+  } catch {}
+}
+function activateCurrentResult() {
+  scrollToCurrentResult()
+}
+
+function handleGlobalFind(e) {
+  if (!(e.ctrlKey || e.metaKey)) return
+  const k = e.key
+  if (k === 'f' || k === 'F') {
+    if (isEditableElement(e.target)) return
+    e.preventDefault()
+    if (!searchOpen.value) openSearch('')
+    else {
+      // If already open, select input text for quick overwrite
+      nextTick(() => {
+        if (searchInputRef.value) {
+          searchInputRef.value.focus()
+          searchInputRef.value.select()
+        }
+      })
+    }
+  }
+  // While open: Enter confirms current selection & closes dialog
+  if (searchOpen.value && (k === 'Enter' || k === 'Return')) {
+    e.preventDefault()
+    activateCurrentResult()
+    closeSearch()
+  }
+}
+
+function handleSearchKeydown(e) {
+  if (!searchOpen.value) return
+  if (e.key === 'Escape') {
+    e.preventDefault()
+    closeSearch()
+  } else if (e.key === 'ArrowDown') {
+    e.preventDefault()
+    navigateSearch(1)
+  } else if (e.key === 'ArrowUp') {
+    e.preventDefault()
+    navigateSearch(-1)
+  } else if (e.key === 'Enter') {
+    // Enter inside input: activate current and close
+    e.preventDefault()
+    activateCurrentResult()
+    closeSearch()
+  }
+}
+
+onMounted(() => {
+  document.addEventListener('keydown', handleGlobalFind, { passive: false })
+})
+onBeforeUnmount(() => {
+  document.removeEventListener('keydown', handleGlobalFind)
+})
+
+// Ensure focus when (re)opening via reactive watch (catches programmatic toggles too)
+watch(
+  () => searchOpen.value,
+  (v) => {
+    if (v) {
+      nextTick(() => {
+        if (searchInputRef.value) {
+          searchInputRef.value.focus()
+          searchInputRef.value.select()
+        }
+      })
+    }
+  },
+)
+
 // Heuristic: rotate month label (180deg) only for predominantly Latin text.
 // We explicitly avoid locale detection; rely solely on characters present.
 // Disable rotation if any CJK Unified Ideograph or Compatibility Ideograph appears.
@@ -457,8 +605,6 @@ window.addEventListener('resize', () => {
       />
       <div class="calendar-container">
         <div class="calendar-viewport" ref="viewport">
-          <!-- Main calendar content (weeks and days) -->
-          <div class="main-calendar-area">
           <div class="calendar-content" :style="{ height: contentHeight + 'px' }">
             <CalendarWeek
               v-for="week in visibleWeeks"
@@ -473,11 +619,8 @@ window.addEventListener('resize', () => {
               @event-click="handleEventClick"
             />
           </div>
-          </div>
-          <!-- Month column area -->
-          <div class="month-column-area">
-            <!-- Month labels -->
-            <div class="month-labels-container" :style="{ height: contentHeight + 'px' }">
+          <div class="month-column-area" :style="{ height: contentHeight + 'px' }">
+            <div class="month-labels-container" :style="{ height: '100%' }">
               <template v-for="monthWeek in visibleWeeks" :key="monthWeek.virtualWeek + '-month'">
                 <div
                   v-if="monthWeek && monthWeek.monthLabel"
@@ -501,6 +644,33 @@ window.addEventListener('resize', () => {
         </div>
       </div>
       <EventDialog ref="eventDialogRef" :selection="{ startDate: null, dayCount: 0 }" />
+      <!-- Event Search Overlay -->
+      <div v-if="searchOpen" class="event-search" @keydown.capture="handleSearchKeydown">
+        <div class="search-row">
+          <input
+            ref="searchInputRef"
+            v-model="searchQuery"
+            type="text"
+            placeholder="Search events..."
+            aria-label="Search events"
+            autofocus
+          />
+          <button type="button" @click="closeSearch" title="Close (Esc)">✕</button>
+        </div>
+        <ul class="results" v-if="searchResults.length">
+          <li
+            v-for="(r, i) in searchResults"
+            :key="r.id"
+            :class="{ active: i === searchIndex }"
+            @click="((searchIndex = i), activateCurrentResult(), closeSearch())"
+          >
+            <span class="title">{{ r.title }}</span>
+            <span class="date">{{ r.startDate }}</span>
+          </li>
+        </ul>
+        <div v-else class="no-results">{{ searchQuery ? 'No matches' : 'Type to search' }}</div>
+        <div class="hint">Enter to go, Esc to close, ↑/↓ to browse</div>
+      </div>
     </div>
   </div>
 </template>
@@ -549,11 +719,6 @@ header h1 {
   grid-template-columns: 1fr var(--month-w);
 }
 
-.main-calendar-area {
-  position: relative;
-  overflow: hidden;
-}
-
 .calendar-content {
   position: relative;
   width: 100%;
@@ -607,4 +772,93 @@ header h1 {
   height: var(--row-h);
   pointer-events: none;
 }
+
+/* Search overlay */
+.event-search {
+  position: fixed;
+  top: 0.75rem;
+  inset-inline-end: 0.75rem;
+  z-index: 1200;
+  background: color-mix(in srgb, var(--panel) 90%, transparent);
+  backdrop-filter: blur(0.75em);
+  -webkit-backdrop-filter: blur(0.75em);
+  color: var(--ink);
+  padding: 0.75rem 0.75rem 0.6rem 0.75rem;
+  border-radius: 0.6rem;
+  width: min(28rem, 80vw);
+  box-shadow: 0 0.5em 1.25em rgba(0, 0, 0, 0.35);
+  border: 1px solid color-mix(in srgb, var(--muted) 40%, transparent);
+  font-size: 0.9rem;
+  display: flex;
+  flex-direction: column;
+  gap: 0.4rem;
+}
+.event-search .search-row {
+  display: flex;
+  gap: 0.4rem;
+}
+.event-search input[type='text'] {
+  flex: 1;
+  padding: 0.45rem 0.6rem;
+  border-radius: 0.4rem;
+  border: 1px solid color-mix(in srgb, var(--muted) 40%, transparent);
+  background: color-mix(in srgb, var(--panel) 85%, transparent);
+  color: inherit;
+}
+.event-search button {
+  background: color-mix(in srgb, var(--accent, #4b7) 70%, transparent);
+  color: var(--ink, #111);
+  border: 0;
+  border-radius: 0.4rem;
+  padding: 0.45rem 0.6rem;
+  cursor: pointer;
+}
+.event-search button:disabled {
+  opacity: 0.4;
+  cursor: default;
+}
+.event-search .results {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  max-height: 14rem;
+  overflow: auto;
+  border: 1px solid color-mix(in srgb, var(--muted) 30%, transparent);
+  border-radius: 0.4rem;
+}
+.event-search .results li {
+  display: flex;
+  justify-content: space-between;
+  gap: 0.75rem;
+  padding: 0.4rem 0.55rem;
+  cursor: pointer;
+  font-size: 0.85rem;
+  line-height: 1.2;
+}
+.event-search .results li.active {
+  background: color-mix(in srgb, var(--accent, #4b7) 45%, transparent);
+  color: var(--ink, #111);
+  font-weight: 600;
+}
+.event-search .results li:hover:not(.active) {
+  background: color-mix(in srgb, var(--panel) 70%, transparent);
+}
+.event-search .results .title {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.event-search .results .date {
+  opacity: 0.6;
+  font-family: monospace;
+}
+.event-search .no-results {
+  padding: 0.25rem 0.1rem;
+  opacity: 0.7;
+}
+.event-search .hint {
+  opacity: 0.55;
+  font-size: 0.7rem;
+}
 </style>

src/components/EventDialog.vue

@@ -12,6 +12,7 @@ import {
   formatDateLong,
   DEFAULT_TZ,
 } from '@/utils/date'
+import { getDate as getOccurrenceDate } from '@/utils/events'
 import { addDays, addMonths } from 'date-fns'
 
 const props = defineProps({
@@ -301,48 +302,18 @@ function openEditDialog(payload) {
   if (!payload) return
 
   const baseId = payload.id
-  let occurrenceIndex = payload.occurrenceIndex || 0
+  let n = payload.n || 0
   let weekday = null
   let occurrenceDate = null
 
   const event = calendarStore.getEventById(baseId)
   if (!event) return
 
-  if (event.recur) {
-    if (event.recur.freq === 'weeks' && occurrenceIndex >= 0) {
-      const pattern = event.recur.weekdays || []
-      const baseStart = fromLocalString(event.startDate, DEFAULT_TZ)
-      const baseEnd = new Date(fromLocalString(event.startDate, DEFAULT_TZ))
-      baseEnd.setDate(baseEnd.getDate() + (event.days || 1) - 1)
-      if (occurrenceIndex === 0) {
-        occurrenceDate = baseStart
-        weekday = baseStart.getDay()
-      } else {
-        const interval = event.recur.interval || 1
-        const WEEK_MS = 7 * 86400000
-        const baseBlockStart = getMondayOfISOWeek(baseStart)
-        function isAligned(d) {
-          const blk = getMondayOfISOWeek(d)
-          const diff = Math.floor((blk - baseBlockStart) / WEEK_MS)
-          return diff % interval === 0
-        }
-        let cur = addDays(baseEnd, 1)
-        let found = 0
-        let safety = 0
-        while (found < occurrenceIndex && safety < 20000) {
-          if (pattern[cur.getDay()] && isAligned(cur)) {
-            found++
-            if (found === occurrenceIndex) break
-          }
-          cur = addDays(cur, 1)
-          safety++
-        }
-        occurrenceDate = cur
-        weekday = cur.getDay()
-      }
-    } else if (event.recur.freq === 'months' && occurrenceIndex >= 0) {
-      const baseDate = fromLocalString(event.startDate, DEFAULT_TZ)
-      occurrenceDate = addMonths(baseDate, occurrenceIndex)
+  if (event.recur && n >= 0) {
+    const occStr = getOccurrenceDate(event, n, DEFAULT_TZ)
+    if (occStr) {
+      occurrenceDate = fromLocalString(occStr, DEFAULT_TZ)
+      weekday = occurrenceDate.getDay()
     }
   }
   dialogMode.value = 'edit'
@@ -372,10 +343,10 @@ function openEditDialog(payload) {
   eventSaved.value = false
 
   if (event.recur) {
-    if (event.recur.freq === 'weeks' && occurrenceIndex >= 0) {
-      occurrenceContext.value = { baseId, occurrenceIndex, weekday, occurrenceDate }
-    } else if (event.recur.freq === 'months' && occurrenceIndex > 0) {
-      occurrenceContext.value = { baseId, occurrenceIndex, weekday: null, occurrenceDate }
+    if (event.recur.freq === 'weeks' && n >= 0) {
+      occurrenceContext.value = { baseId, occurrenceIndex: n, weekday, occurrenceDate }
+    } else if (event.recur.freq === 'months' && n > 0) {
+      occurrenceContext.value = { baseId, occurrenceIndex: n, weekday: null, occurrenceDate }
     }
   }
   // anchor to base event start date
@@ -655,6 +626,7 @@ const recurrenceSummary = computed(() => {
             v-model="recurrenceWeekdays"
             :fallback="fallbackWeekdays"
             :first-day="calendarStore.config.first_day"
+            :weekend="calendarStore.weekend"
           />
         </div>
       </div>

src/components/EventOverlay.vue

@@ -1,15 +1,21 @@
 <template>
-  <div class="week-overlay">
+  <div class="week-overlay" :style="{ gridColumn: '1 / -1' }" ref="weekOverlayRef">
     <div
-      v-for="span in eventSpans"
-      :key="span.id"
+      v-for="seg in eventSegments"
+      :key="'seg-' + seg.startIdx + '-' + seg.endIdx"
+      :class="['segment-grid', { compress: isSegmentCompressed(seg) }]"
+      :style="segmentStyle(seg)"
+    >
+      <div
+        v-for="span in seg.events"
+        :key="span.id + '-' + (span.n != null ? span.n : 0)"
         class="event-span"
         dir="auto"
         :class="[`event-color-${span.colorId}`]"
         :data-id="span.id"
-      :data-n="span._recurrenceIndex != null ? span._recurrenceIndex : 0"
+        :data-n="span.n != null ? span.n : 0"
         :style="{
-        gridColumn: `${span.startIdx + 1} / ${span.endIdx + 2}`,
+          gridColumn: `${span.startIdxRel + 1} / ${span.endIdxRel + 2}`,
           gridRow: `${span.row}`,
         }"
         @click="handleEventClick(span)"
@@ -26,9 +32,10 @@
         ></div>
       </div>
     </div>
+  </div>
 </template>
 <script setup>
-import { computed, ref } from 'vue'
+import { computed, ref, watch, onMounted, onBeforeUnmount, nextTick } from 'vue'
 import { useCalendarStore } from '@/stores/CalendarStore'
 import { daysInclusive, addDaysStr } from '@/utils/date'
 
@@ -41,68 +48,139 @@ const store = useCalendarStore()
 // Drag state
 const dragState = ref(null)
 const justDragged = ref(false)
+const weekOverlayRef = ref(null)
+const segmentCompression = ref({}) // key -> boolean
 
-// Consolidate already-provided day.events into contiguous spans (no recurrence generation)
-const eventSpans = computed(() => {
-  const weekEvents = new Map()
-  props.week.days.forEach((day, dayIndex) => {
+// Build event segments: each segment is a contiguous day range with at least one bridging event between any adjacent days within it.
+const eventSegments = computed(() => {
+  // Construct spans across the week
+  const spanMap = new Map()
+  props.week.days.forEach((day, di) => {
     day.events.forEach((ev) => {
-      const key = ev.id
-      if (!weekEvents.has(key)) {
-        weekEvents.set(key, { ...ev, startIdx: dayIndex, endIdx: dayIndex })
-      } else {
-        const ref = weekEvents.get(key)
-        ref.endIdx = Math.max(ref.endIdx, dayIndex)
-      }
+      const key = ev.id + '|' + (ev.n ?? 0)
+      if (!spanMap.has(key)) spanMap.set(key, { ...ev, startIdx: di, endIdx: di })
+      else spanMap.get(key).endIdx = Math.max(spanMap.get(key).endIdx, di)
     })
   })
-  const arr = Array.from(weekEvents.values())
-  arr.sort((a, b) => {
-    const spanA = a.endIdx - a.startIdx
-    const spanB = b.endIdx - b.startIdx
-    if (spanA !== spanB) return spanB - spanA
+  const spans = Array.from(spanMap.values())
+  // Derive span start/end date strings from week day indices (removes need for per-day stored endDate)
+  spans.forEach((sp) => {
+    sp.startDate = props.week.days[sp.startIdx].date
+    sp.endDate = props.week.days[sp.endIdx].date
+  })
+  // Sort so longer multi-day first, then earlier, then id for stability
+  spans.sort((a, b) => {
+    const la = a.endIdx - a.startIdx
+    const lb = b.endIdx - b.startIdx
+    if (la !== lb) return lb - la
     if (a.startIdx !== b.startIdx) return a.startIdx - b.startIdx
-    // For one-day events that are otherwise equal, sort by color (0 first)
-    if (spanA === 0 && spanB === 0 && a.startIdx === b.startIdx) {
-      const colorA = a.colorId || 0
-      const colorB = b.colorId || 0
-      if (colorA !== colorB) return colorA - colorB
-    }
+    const ca = a.colorId != null ? a.colorId : 0
+    const cb = b.colorId != null ? b.colorId : 0
+    if (ca !== cb) return ca - cb
     return String(a.id).localeCompare(String(b.id))
   })
-  // Assign non-overlapping rows
-  const rowsLastEnd = []
-  arr.forEach((ev) => {
-    let row = 0
-    while (row < rowsLastEnd.length && !(ev.startIdx > rowsLastEnd[row])) row++
-    if (row === rowsLastEnd.length) rowsLastEnd.push(-1)
-    rowsLastEnd[row] = ev.endIdx
-    ev.row = row + 1
+  // Identify breaks
+  const breaks = []
+  for (let d = 0; d < 6; d++) {
+    const bridged = spans.some((sp) => sp.startIdx <= d && sp.endIdx >= d + 1)
+    if (!bridged) breaks.push(d)
+  }
+  const rawSegments = []
+  let segStart = 0
+  for (const b of breaks) {
+    rawSegments.push([segStart, b])
+    segStart = b + 1
+  }
+  rawSegments.push([segStart, 6])
+
+  const segments = rawSegments.map(([s, e]) => {
+    const evs = spans.filter((sp) => sp.startIdx >= s && sp.endIdx <= e)
+    // Row packing in this segment (gap fill)
+    const rows = [] // each row: intervals
+    function fits(row, a, b) {
+      return row.every((iv) => b < iv.start || a > iv.end)
+    }
+    function addInterval(row, a, b) {
+      let inserted = false
+      for (let i = 0; i < row.length; i++) {
+        if (b < row[i].start) {
+          row.splice(i, 0, { start: a, end: b })
+          inserted = true
+          break
+        }
+      }
+      if (!inserted) row.push({ start: a, end: b })
+    }
+    evs.forEach((ev) => {
+      let placed = false
+      for (let r = 0; r < rows.length; r++) {
+        if (fits(rows[r], ev.startIdx, ev.endIdx)) {
+          addInterval(rows[r], ev.startIdx, ev.endIdx)
+          ev.row = r + 1
+          placed = true
+          break
+        }
+      }
+      if (!placed) {
+        rows.push([{ start: ev.startIdx, end: ev.endIdx }])
+        ev.row = rows.length
+      }
+      ev.startIdxRel = ev.startIdx - s
+      ev.endIdxRel = ev.endIdx - s
     })
-  return arr
+    return { startIdx: s, endIdx: e, events: evs, rowsCount: rows.length }
+  })
+  return segments
+})
+
+function segmentStyle(seg) {
+  return { gridColumn: `${seg.startIdx + 1} / ${seg.endIdx + 2}` }
+}
+
+function segmentKey(seg) {
+  return seg.startIdx + '-' + seg.endIdx
+}
+
+function isSegmentCompressed(seg) {
+  return !!segmentCompression.value[segmentKey(seg)]
+}
+
+function recomputeCompression() {
+  const el = weekOverlayRef.value
+  if (!el) return
+  const available = el.clientHeight || 0
+  if (!available) return
+  const cs = getComputedStyle(el)
+  const fontSize = parseFloat(cs.fontSize) || 16
+  const baseRowPx = fontSize * 1.5 // desired row height (matches CSS 1.5em)
+  const marginTop = 0 // already applied outside height
+  const usable = Math.max(0, available - marginTop)
+  const nextMap = {}
+  for (const seg of eventSegments.value) {
+    const desired = (seg.rowsCount || 1) * baseRowPx
+    nextMap[segmentKey(seg)] = desired > usable
+  }
+  segmentCompression.value = nextMap
+}
+
+watch(eventSegments, () => nextTick(() => recomputeCompression()))
+onMounted(() => {
+  nextTick(() => recomputeCompression())
+  window.addEventListener('resize', recomputeCompression)
+})
+onBeforeUnmount(() => {
+  window.removeEventListener('resize', recomputeCompression)
 })
 
 function handleEventClick(span) {
   if (justDragged.value) return
-  // Emit composite payload: base id (without virtual marker), instance id, occurrence index (data-n)
-  const idStr = span.id
-  const hasVirtualMarker = typeof idStr === 'string' && idStr.includes('_v_')
-  const baseId = hasVirtualMarker ? idStr.slice(0, idStr.lastIndexOf('_v_')) : idStr
-  emit('event-click', {
-    id: baseId,
-    instanceId: span.id,
-    occurrenceIndex: span._recurrenceIndex != null ? span._recurrenceIndex : 0,
-  })
+  emit('event-click', { id: span.id, n: span.n != null ? span.n : 0 })
 }
 
 function handleEventPointerDown(span, event) {
   if (event.target.classList.contains('resize-handle')) return
   event.stopPropagation()
-  const idStr = span.id
-  const hasVirtualMarker = typeof idStr === 'string' && idStr.includes('_v_')
-  const baseId = hasVirtualMarker ? idStr.slice(0, idStr.lastIndexOf('_v_')) : idStr
-  const isVirtual = hasVirtualMarker
-  // Determine which day within the span was grabbed so we maintain relative position
+  const baseId = span.id
   let anchorDate = span.startDate
   try {
     const spanDays = daysInclusive(span.startDate, span.endDate)
@@ -117,14 +195,11 @@ function handleEventPointerDown(span, event) {
       if (dayIndex >= spanDays) dayIndex = spanDays - 1
       anchorDate = addDaysStr(span.startDate, dayIndex)
     }
-  } catch (e) {
-    // Fallback to startDate if any calculation fails
-  }
+  } catch (e) {}
   startLocalDrag(
     {
       id: baseId,
       originalId: span.id,
-      isVirtual,
       mode: 'move',
       pointerStartX: event.clientX,
       pointerStartY: event.clientY,
@@ -138,15 +213,11 @@ function handleEventPointerDown(span, event) {
 
 function handleResizePointerDown(span, mode, event) {
   event.stopPropagation()
-  const idStr = span.id
-  const hasVirtualMarker = typeof idStr === 'string' && idStr.includes('_v_')
-  const baseId = hasVirtualMarker ? idStr.slice(0, idStr.lastIndexOf('_v_')) : idStr
-  const isVirtual = hasVirtualMarker
+  const baseId = span.id
   startLocalDrag(
     {
       id: baseId,
       originalId: span.id,
-      isVirtual,
       mode,
       pointerStartX: event.clientX,
       pointerStartY: event.clientY,
@@ -168,7 +239,6 @@ function startLocalDrag(init, evt) {
     else anchorOffset = daysInclusive(init.startDate, init.anchorDate) - 1
   }
 
-  // Capture original repeating pattern & weekday (for weekly repeats) so we can rotate relative to original
   let originalWeekday = null
   let originalPattern = null
   if (init.mode === 'move') {
@@ -195,13 +265,11 @@ function startLocalDrag(init, evt) {
     tentativeEnd: init.endDate,
     originalWeekday,
     originalPattern,
-    realizedId: null, // for virtual occurrence converted to real during drag
+    realizedId: null,
   }
 
-  // Begin compound history session (single snapshot after drag completes)
   store.$history?.beginCompound()
 
-  // Capture pointer events globally
   if (evt.currentTarget && evt.pointerId !== undefined) {
     try {
       evt.currentTarget.setPointerCapture(evt.pointerId)
@@ -210,7 +278,6 @@ function startLocalDrag(init, evt) {
     }
   }
 
-  // Prevent default for mouse/pen to avoid text selection. For touch we skip so the user can still scroll.
   if (!(evt.pointerType === 'touch')) {
     evt.preventDefault()
   }
@@ -222,19 +289,15 @@ function startLocalDrag(init, evt) {
 
 // Determine date under pointer: traverse DOM to find day cell carrying data-date attribute
 function getDateUnderPointer(x, y, el) {
-  let cur = el
-  while (cur) {
-    if (cur.dataset && cur.dataset.date) {
-      return { date: cur.dataset.date }
+  for (let cur = el; cur; cur = cur.parentElement)
+    if (cur.dataset?.date) return { date: cur.dataset.date }
+  const overlayEl = weekOverlayRef.value
+  const container = overlayEl?.parentElement // .days-grid
+  if (container) {
+    for (const d of container.querySelectorAll('[data-date]')) {
+      const { left, right, top, bottom } = d.getBoundingClientRect()
+      if (y >= top && y <= bottom && x >= left && x <= right) return { date: d.dataset.date }
     }
-    cur = cur.parentElement
-  }
-  // Fallback: elementFromPoint scan
-  const probe = document.elementFromPoint(x, y)
-  let p = probe
-  while (p) {
-    if (p.dataset && p.dataset.date) return { date: p.dataset.date }
-    p = p.parentElement
   }
   return null
 }
@@ -251,7 +314,6 @@ function onDragPointerMove(e) {
   const hitEl = document.elementFromPoint(e.clientX, e.clientY)
   const hit = getDateUnderPointer(e.clientX, e.clientY, hitEl)
 
-  // If we can't find a date, don't update the range but keep the drag active
   if (!hit || !hit.date) return
 
   const [ns, ne] = computeTentativeRangeFromPointer(st, hit.date)
@@ -261,26 +323,22 @@ function onDragPointerMove(e) {
   st.tentativeStart = ns
   st.tentativeEnd = ne
   if (st.mode === 'move') {
-    if (st.isVirtual) {
-      // On first movement convert virtual occurrence into a real new event (split series)
+    if (st.n && st.n > 0) {
       if (!st.realizedId) {
         const newId = store.splitMoveVirtualOccurrence(st.id, st.startDate, ns, ne)
         if (newId) {
           st.realizedId = newId
           st.id = newId
-          st.isVirtual = false
+          // converted to standalone event
         } else {
           return
         }
       } else {
-        // Subsequent moves: update range without rotating pattern automatically
         store.setEventRange(st.id, ns, ne, { mode: 'move', rotatePattern: false })
       }
     } else {
-      // Normal non-virtual move; rotate handled in setEventRange
       store.setEventRange(st.id, ns, ne, { mode: 'move', rotatePattern: false })
     }
-    // Manual rotation relative to original pattern (keeps pattern anchored to initially grabbed weekday)
     if (st.originalPattern && st.originalWeekday != null) {
       try {
         const currentWeekday = new Date(ns + 'T00:00:00').getDay()
@@ -293,15 +351,9 @@ function onDragPointerMove(e) {
         }
       } catch {}
     }
-  } else if (!st.isVirtual) {
-    // Resizes on real events update immediately
-    applyRangeDuringDrag(
-      { id: st.id, isVirtual: st.isVirtual, mode: st.mode, startDate: ns, endDate: ne },
-      ns,
-      ne,
-    )
-  } else if (st.isVirtual && (st.mode === 'resize-left' || st.mode === 'resize-right')) {
-    // For virtual occurrence resize: convert to real once, then adjust range
+  } else if (!(st.n && st.n > 0)) {
+    applyRangeDuringDrag({ id: st.id, mode: st.mode, startDate: ns, endDate: ne }, ns, ne)
+  } else if (st.n && st.n > 0 && (st.mode === 'resize-left' || st.mode === 'resize-right')) {
     if (!st.realizedId) {
       const initialStart = ns
       const initialEnd = ne
@@ -309,10 +361,9 @@ function onDragPointerMove(e) {
       if (newId) {
         st.realizedId = newId
         st.id = newId
-        st.isVirtual = false
+        // converted
       } else return
     }
-    // Apply range change; rotate if left edge moved and weekday changed
     const rotate = st.mode === 'resize-left'
     store.setEventRange(st.id, ns, ne, { mode: st.mode, rotatePattern: rotate })
   }
@@ -322,7 +373,6 @@ function onDragPointerUp(e) {
   const st = dragState.value
   if (!st) return
 
-  // Release pointer capture if it was set
   if (e.target && e.pointerId !== undefined) {
     try {
       e.target.releasePointerCapture(e.pointerId)
@@ -342,11 +392,10 @@ function onDragPointerUp(e) {
 
   if (moved) {
     // Apply final mutation if virtual (we deferred) or if non-virtual no further change (rare)
-    if (st.isVirtual) {
+    if (st.n && st.n > 0) {
       applyRangeDuringDrag(
         {
           id: st.id,
-          isVirtual: st.isVirtual,
           mode: st.mode,
           startDate: finalStart,
           endDate: finalEnd,
@@ -360,7 +409,6 @@ function onDragPointerUp(e) {
       justDragged.value = false
     }, 120)
   }
-  // End compound session (snapshot if changed)
   store.$history?.endCompound()
 }
 
@@ -389,7 +437,7 @@ function normalizeDateOrder(aStr, bStr) {
 }
 
 function applyRangeDuringDrag(st, startDate, endDate) {
-  if (st.isVirtual) {
+  if (st.n && st.n > 0) {
     if (st.mode !== 'move') return // no resize for virtual occurrence
     // Split-move: occurrence being dragged treated as first of new series
     store.splitMoveVirtualOccurrence(st.id, st.startDate, startDate, endDate)
@@ -403,16 +451,22 @@ function applyRangeDuringDrag(st, startDate, endDate) {
 .week-overlay {
   position: absolute;
   inset: 0;
-  pointer-events: none;
-  z-index: 15;
   display: grid;
-  /* Prevent content from expanding tracks beyond container width */
-  grid-template-columns: repeat(7, minmax(0, 1fr));
-  grid-auto-rows: minmax(0, 1.5em);
-
-  row-gap: 0.05em;
+  grid-template-columns: repeat(7, 1fr);
   margin-top: 1.8em;
+  pointer-events: none;
+}
+.segment-grid {
+  display: grid;
+  gap: 2px;
   align-content: start;
+  pointer-events: none;
+  overflow: hidden;
+  grid-auto-columns: 1fr;
+  grid-auto-rows: 1.5em;
+}
+.segment-grid.compress {
+  grid-auto-rows: 1fr;
 }
 
 .event-span {
@@ -430,13 +484,8 @@ function applyRangeDuringDrag(st, startDate, endDate) {
   align-items: center;
   position: relative;
   user-select: none;
-  height: 100%;
-  width: 100%;
-  max-width: 100%;
-  box-sizing: border-box;
   z-index: 1;
   text-align: center;
-  min-width: 0;
 }
 
 /* Inner title wrapper ensures proper ellipsis within flex/grid constraints */

src/components/HeaderControls.vue

@@ -31,7 +31,6 @@
       >
         ⚙
       </button>
-      <!-- Settings dialog now lives here -->
       <SettingsDialog ref="settingsDialog" />
     </div>
   </Transition>

src/components/SettingsDialog.vue

@@ -275,7 +275,7 @@ select {
   flex: 0 0 auto;
   min-width: 120px;
 }
-/* WeekdaySelector display tweaks */
+
 .footer-row {
   display: flex;
   justify-content: flex-end;

src/components/WeekdaySelector.vue

@@ -16,7 +16,7 @@
       @pointerenter="onDragOver(di)"
       @pointerup="onPointerUp"
     >
-      {{ d.slice(0, 3) }}
+      {{ d }}
     </button>
     <button
       v-for="g in barGroups"

src/plugins/virtualWeeks.js

@@ -1,5 +1,5 @@
 import { ref } from 'vue'
-import { addDays, differenceInWeeks } from 'date-fns'
+import { addDays, differenceInWeeks, isBefore, isAfter } from 'date-fns'
 import {
   toLocalString,
   fromLocalString,
@@ -11,9 +11,8 @@ import {
   monthAbbr,
   lunarPhaseSymbol,
   MAX_YEAR,
-  getOccurrenceIndex,
-  getVirtualOccurrenceEndDate,
 } from '@/utils/date'
+import { buildDayEvents } from '@/utils/events'
 import { getHolidayForDate } from '@/utils/holidays'
 
 /**
@@ -54,77 +53,16 @@ export function createVirtualWeekManager({
 
   function createWeek(virtualWeek) {
     const firstDay = getFirstDayForVirtualWeek(virtualWeek)
-    const isoAnchor = addDays(firstDay, (4 - firstDay.getDay() + 7) % 7)
-    const weekNumber = getISOWeek(isoAnchor)
+    const thu = addDays(firstDay, (4 - firstDay.getDay() + 7) % 7)
+    const weekNumber = getISOWeek(thu)
     const days = []
     let cur = new Date(firstDay)
     let hasFirst = false
     let monthToLabel = null
     let labelYear = null
-
-    const repeatingBases = []
-    if (calendarStore.events) {
-      for (const ev of calendarStore.events.values()) {
-        if (ev.recur) repeatingBases.push(ev)
-      }
-    }
-
-    const collectEventsForDate = (dateStr, curDateObj) => {
-      const storedEvents = []
-      for (const ev of calendarStore.events.values()) {
-        if (!ev.recur) {
-          const evEnd = toLocalString(
-            addDays(fromLocalString(ev.startDate, DEFAULT_TZ), (ev.days || 1) - 1),
-            DEFAULT_TZ,
-          )
-          if (dateStr >= ev.startDate && dateStr <= evEnd) {
-            storedEvents.push({ ...ev, endDate: evEnd })
-          }
-        }
-      }
-      const dayEvents = [...storedEvents]
-      for (const base of repeatingBases) {
-        const baseEnd = toLocalString(
-          addDays(fromLocalString(base.startDate, DEFAULT_TZ), (base.days || 1) - 1),
-          DEFAULT_TZ,
-        )
-        if (dateStr >= base.startDate && dateStr <= baseEnd) {
-          dayEvents.push({ ...base, endDate: baseEnd, _recurrenceIndex: 0, _baseId: base.id })
-          continue
-        }
-        const spanDays = (base.days || 1) - 1
-        const currentDate = curDateObj
-        let occurrenceFound = false
-        for (let offset = 0; offset <= spanDays && !occurrenceFound; offset++) {
-          const candidateStart = addDays(currentDate, -offset)
-          const candidateStartStr = toLocalString(candidateStart, DEFAULT_TZ)
-          const occurrenceIndex = getOccurrenceIndex(base, candidateStartStr, DEFAULT_TZ)
-          if (occurrenceIndex !== null) {
-            const virtualEndDate = getVirtualOccurrenceEndDate(base, candidateStartStr, DEFAULT_TZ)
-            if (dateStr >= candidateStartStr && dateStr <= virtualEndDate) {
-              const virtualId = base.id + '_v_' + candidateStartStr
-              const alreadyExists = dayEvents.some((ev) => ev.id === virtualId)
-              if (!alreadyExists) {
-                dayEvents.push({
-                  ...base,
-                  id: virtualId,
-                  startDate: candidateStartStr,
-                  endDate: virtualEndDate,
-                  _recurrenceIndex: occurrenceIndex,
-                  _baseId: base.id,
-                })
-              }
-              occurrenceFound = true
-            }
-          }
-        }
-      }
-      return dayEvents
-    }
-
     for (let i = 0; i < 7; i++) {
       const dateStr = toLocalString(cur, DEFAULT_TZ)
-      const dayEvents = collectEventsForDate(dateStr, fromLocalString(dateStr, DEFAULT_TZ))
+      const events = buildDayEvents(calendarStore.events.values(), dateStr, DEFAULT_TZ)
       const dow = cur.getDay()
       const isFirst = cur.getDate() === 1
       if (isFirst) {
@@ -133,10 +71,11 @@ export function createVirtualWeekManager({
         labelYear = cur.getFullYear()
       }
       let displayText = String(cur.getDate())
-      if (isFirst) {
-        if (cur.getMonth() === 0) displayText = cur.getFullYear()
-        else displayText = monthAbbr[cur.getMonth()].slice(0, 3).toUpperCase()
-      }
+      if (isFirst)
+        displayText =
+          cur.getMonth() === 0
+            ? cur.getFullYear()
+            : monthAbbr[cur.getMonth()].slice(0, 3).toUpperCase()
       let holiday = null
       if (calendarStore.config.holidays.enabled) {
         calendarStore._ensureHolidaysInitialized?.()
@@ -153,18 +92,33 @@ export function createVirtualWeekManager({
         lunarPhase: lunarPhaseSymbol(cur),
         holiday,
         isHoliday: holiday !== null,
-        isSelected:
-          selection.value.startDate &&
-          selection.value.dayCount > 0 &&
-          dateStr >= selection.value.startDate &&
-          dateStr <= addDaysStr(selection.value.startDate, selection.value.dayCount - 1),
-        events: dayEvents,
+        isSelected: isDateSelected(dateStr),
+        events,
       })
       cur = addDays(cur, 1)
     }
-    let monthLabel = null
-    if (hasFirst && monthToLabel !== null) {
-      if (labelYear && labelYear <= MAX_YEAR) {
+    const monthLabel = buildMonthLabel({ hasFirst, monthToLabel, labelYear, cur, virtualWeek })
+    return {
+      virtualWeek,
+      weekNumber: pad(weekNumber),
+      days,
+      monthLabel,
+      top: (virtualWeek - minVirtualWeek.value) * rowHeight.value,
+    }
+  }
+
+  function isDateSelected(dateStr) {
+    if (!selection.value.startDate || selection.value.dayCount <= 0) return false
+    const startDateObj = fromLocalString(selection.value.startDate, DEFAULT_TZ)
+    const endDateStr = addDaysStr(selection.value.startDate, selection.value.dayCount - 1)
+    const endDateObj = fromLocalString(endDateStr, DEFAULT_TZ)
+    const d = fromLocalString(dateStr, DEFAULT_TZ)
+    return !isBefore(d, startDateObj) && !isAfter(d, endDateObj)
+  }
+
+  function buildMonthLabel({ hasFirst, monthToLabel, labelYear, cur, virtualWeek }) {
+    if (!hasFirst || monthToLabel === null) return null
+    if (!labelYear || labelYear > MAX_YEAR) return null
     let weeksSpan = 0
     const d = addDays(cur, -1)
     for (let i = 0; i < 6; i++) {
@@ -175,22 +129,13 @@ export function createVirtualWeekManager({
     const remainingWeeks = Math.max(1, maxVirtualWeek.value - virtualWeek + 1)
     weeksSpan = Math.max(1, Math.min(weeksSpan, remainingWeeks))
     const year = String(labelYear).slice(-2)
-        monthLabel = {
+    return {
       text: `${getLocalizedMonthName(monthToLabel)} '${year}`,
       month: monthToLabel,
       weeksSpan,
       monthClass: monthAbbr[monthToLabel],
     }
   }
-    }
-    return {
-      virtualWeek,
-      weekNumber: pad(weekNumber),
-      days,
-      monthLabel,
-      top: (virtualWeek - minVirtualWeek.value) * rowHeight.value,
-    }
-  }
 
   function internalWindowCalc() {
     const buffer = 6
@@ -295,10 +240,6 @@ export function createVirtualWeekManager({
   // Reflective update of only events inside currently visible weeks (keeps week objects stable)
   function refreshEvents(reason = 'events-refresh') {
     if (!visibleWeeks.value.length) return
-    const repeatingBases = []
-    if (calendarStore.events) {
-      for (const ev of calendarStore.events.values()) if (ev.recur) repeatingBases.push(ev)
-    }
     const selStart = selection.value.startDate
     const selCount = selection.value.dayCount
     const selEnd = selStart && selCount > 0 ? addDaysStr(selStart, selCount - 1) : null
@@ -306,63 +247,13 @@ export function createVirtualWeekManager({
       for (const day of week.days) {
         const dateStr = day.date
         // Update selection flag
-        if (selStart && selEnd) day.isSelected = dateStr >= selStart && dateStr <= selEnd
-        else day.isSelected = false
-        // Rebuild events list for this day
-        const storedEvents = []
-        for (const ev of calendarStore.events.values()) {
-          if (!ev.recur) {
-            const evEnd = toLocalString(
-              addDays(fromLocalString(ev.startDate, DEFAULT_TZ), (ev.days || 1) - 1),
-              DEFAULT_TZ,
-            )
-            if (dateStr >= ev.startDate && dateStr <= evEnd) {
-              storedEvents.push({ ...ev, endDate: evEnd })
-            }
-          }
-        }
-        const dayEvents = [...storedEvents]
-        for (const base of repeatingBases) {
-          const baseEndStr = toLocalString(
-            addDays(fromLocalString(base.startDate, DEFAULT_TZ), (base.days || 1) - 1),
-            DEFAULT_TZ,
-          )
-          if (dateStr >= base.startDate && dateStr <= baseEndStr) {
-            dayEvents.push({ ...base, endDate: baseEndStr, _recurrenceIndex: 0, _baseId: base.id })
-            continue
-          }
-          const spanDays = (base.days || 1) - 1
-          const currentDate = fromLocalString(dateStr, DEFAULT_TZ)
-          let occurrenceFound = false
-          for (let offset = 0; offset <= spanDays && !occurrenceFound; offset++) {
-            const candidateStart = addDays(currentDate, -offset)
-            const candidateStartStr = toLocalString(candidateStart, DEFAULT_TZ)
-            const occurrenceIndex = getOccurrenceIndex(base, candidateStartStr, DEFAULT_TZ)
-            if (occurrenceIndex !== null) {
-              const virtualEndDate = getVirtualOccurrenceEndDate(
-                base,
-                candidateStartStr,
-                DEFAULT_TZ,
-              )
-              if (dateStr >= candidateStartStr && dateStr <= virtualEndDate) {
-                const virtualId = base.id + '_v_' + candidateStartStr
-                const alreadyExists = dayEvents.some((ev) => ev.id === virtualId)
-                if (!alreadyExists) {
-                  dayEvents.push({
-                    ...base,
-                    id: virtualId,
-                    startDate: candidateStartStr,
-                    endDate: virtualEndDate,
-                    _recurrenceIndex: occurrenceIndex,
-                    _baseId: base.id,
-                  })
-                }
-                occurrenceFound = true
-              }
-            }
-          }
-        }
-        day.events = dayEvents
+        if (selStart && selEnd) {
+          const d = fromLocalString(dateStr, DEFAULT_TZ),
+            s = fromLocalString(selStart, DEFAULT_TZ),
+            e = fromLocalString(selEnd, DEFAULT_TZ)
+          day.isSelected = !isBefore(d, s) && !isAfter(d, e)
+        } else day.isSelected = false
+        day.events = buildDayEvents(calendarStore.events.values(), dateStr, DEFAULT_TZ)
       }
     }
     if (process.env.NODE_ENV !== 'production') {

src/stores/CalendarStore.js

@@ -4,7 +4,6 @@ import {
   fromLocalString,
   getLocaleWeekendDays,
   getMondayOfISOWeek,
-  getOccurrenceDate,
   DEFAULT_TZ,
 } from '@/utils/date'
 import { differenceInCalendarDays, addDays } from 'date-fns'
@@ -201,11 +200,6 @@ export const useCalendarStore = defineStore('calendar', {
         this.deleteEvent(baseId)
         return
       }
-      const nextStartStr = getOccurrenceDate(base, 1, DEFAULT_TZ)
-      if (!nextStartStr) {
-        this.deleteEvent(baseId)
-        return
-      }
       base.startDate = nextStartStr
       // keep same days length
       if (numericCount !== Infinity) base.recur.count = String(Math.max(1, numericCount - 1))
@@ -228,9 +222,11 @@ export const useCalendarStore = defineStore('calendar', {
       }
       const snapshot = { ...base }
       snapshot.recur = snapshot.recur ? { ...snapshot.recur } : null
+      if (base.recur.count === occurrenceIndex + 1) {
+        base.recur.count = occurrenceIndex
+        return
+      }
       base.recur.count = occurrenceIndex
-      const nextStartStr = getOccurrenceDate(snapshot, occurrenceIndex + 1, DEFAULT_TZ)
-      if (!nextStartStr) return
       const originalNumeric =
         snapshot.recur.count === 'unlimited' ? Infinity : parseInt(snapshot.recur.count, 10)
       let remainingCount = 'unlimited'

src/utils/date.js

@@ -23,7 +23,7 @@ const monthAbbr = [
   'nov',
   'dec',
 ]
-const MIN_YEAR = 100 // less than 100 is interpreted as 19xx
+const MIN_YEAR = 1000
 const MAX_YEAR = 9999
 
 // Core helpers ------------------------------------------------------------
@@ -70,169 +70,7 @@ function getMondayOfISOWeek(date, timeZone = DEFAULT_TZ) {
 
 const mondayIndex = (d) => (dateFns.getDay(d) + 6) % 7
 
-// Count how many days in [startDate..endDate] match the boolean `pattern` array
-function countPatternDaysInInterval(startDate, endDate, patternArr) {
-  const days = dateFns.eachDayOfInterval({
-    start: dateFns.startOfDay(startDate),
-    end: dateFns.startOfDay(endDate),
-  })
-  return days.reduce((c, d) => c + (patternArr[dateFns.getDay(d)] ? 1 : 0), 0)
-}
-
-// Recurrence: Weekly ------------------------------------------------------
-function _getRecur(event) {
-  return event?.recur ?? null
-}
-
-function getWeeklyOccurrenceIndex(event, dateStr, timeZone = DEFAULT_TZ) {
-  const recur = _getRecur(event)
-  if (!recur || recur.freq !== 'weeks') return null
-  const pattern = recur.weekdays || []
-  if (!pattern.some(Boolean)) return null
-
-  const target = fromLocalString(dateStr, timeZone)
-  const baseStart = fromLocalString(event.startDate, timeZone)
-  if (target < baseStart) return null
-
-  const dow = dateFns.getDay(target)
-  if (!pattern[dow]) return null // target not active
-
-  const interval = recur.interval || 1
-  const baseBlockStart = getMondayOfISOWeek(baseStart, timeZone)
-  const currentBlockStart = getMondayOfISOWeek(target, timeZone)
-  // Number of weeks between block starts (each block start is a Monday)
-  const weekDiff = dateFns.differenceInCalendarWeeks(currentBlockStart, baseBlockStart)
-  if (weekDiff < 0 || weekDiff % interval !== 0) return null
-
-  const baseDow = dateFns.getDay(baseStart)
-  const baseCountsAsPattern = !!pattern[baseDow]
-
-  // Same ISO week as base: count pattern days from baseStart up to target (inclusive)
-  if (weekDiff === 0) {
-    let n = countPatternDaysInInterval(baseStart, target, pattern) - 1
-    if (!baseCountsAsPattern) n += 1
-    const maxCount = recur.count === 'unlimited' ? Infinity : parseInt(recur.count, 10)
-    return n < 0 || n >= maxCount ? null : n
-  }
-
-  const baseWeekEnd = dateFns.addDays(baseBlockStart, 6)
-  // Count pattern days in the first (possibly partial) week from baseStart..baseWeekEnd
-  const firstWeekCount = countPatternDaysInInterval(baseStart, baseWeekEnd, pattern)
-  const alignedWeeksBetween = weekDiff / interval - 1
-  const fullPatternWeekCount = pattern.filter(Boolean).length
-  const middleWeeksCount = alignedWeeksBetween > 0 ? alignedWeeksBetween * fullPatternWeekCount : 0
-  // Count pattern days in the current (possibly partial) week from currentBlockStart..target
-  const currentWeekCount = countPatternDaysInInterval(currentBlockStart, target, pattern)
-  let n = firstWeekCount + middleWeeksCount + currentWeekCount - 1
-  if (!baseCountsAsPattern) n += 1
-  const maxCount = recur.count === 'unlimited' ? Infinity : parseInt(recur.count, 10)
-  return n >= maxCount ? null : n
-}
-
-// Recurrence: Monthly -----------------------------------------------------
-function getMonthlyOccurrenceIndex(event, dateStr, timeZone = DEFAULT_TZ) {
-  const recur = _getRecur(event)
-  if (!recur || recur.freq !== 'months') return null
-  const baseStart = fromLocalString(event.startDate, timeZone)
-  const d = fromLocalString(dateStr, timeZone)
-  const diffMonths = dateFns.differenceInCalendarMonths(d, baseStart)
-  if (diffMonths < 0) return null
-  const interval = recur.interval || 1
-  if (diffMonths % interval !== 0) return null
-  const baseDay = dateFns.getDate(baseStart)
-  const effectiveDay = Math.min(baseDay, dateFns.getDaysInMonth(d))
-  if (dateFns.getDate(d) !== effectiveDay) return null
-  const n = diffMonths / interval
-  const maxCount = recur.count === 'unlimited' ? Infinity : parseInt(recur.count, 10)
-  return n >= maxCount ? null : n
-}
-
-function getOccurrenceIndex(event, dateStr, timeZone = DEFAULT_TZ) {
-  const recur = _getRecur(event)
-  if (!recur) return null
-  if (dateStr < event.startDate) return null
-  if (recur.freq === 'weeks') return getWeeklyOccurrenceIndex(event, dateStr, timeZone)
-  if (recur.freq === 'months') return getMonthlyOccurrenceIndex(event, dateStr, timeZone)
-  return null
-}
-
-// Reverse lookup: given a recurrence index (0-based) return the occurrence start date string.
-// Returns null if the index is out of range or the event is not repeating.
-function getWeeklyOccurrenceDate(event, occurrenceIndex, timeZone = DEFAULT_TZ) {
-  const recur = _getRecur(event)
-  if (!recur || recur.freq !== 'weeks') return null
-  if (occurrenceIndex < 0 || !Number.isInteger(occurrenceIndex)) return null
-  const maxCount = recur.count === 'unlimited' ? Infinity : parseInt(recur.count, 10)
-  if (occurrenceIndex >= maxCount) return null
-  const pattern = recur.weekdays || []
-  if (!pattern.some(Boolean)) return null
-  const interval = recur.interval || 1
-  const baseStart = fromLocalString(event.startDate, timeZone)
-  if (occurrenceIndex === 0) return toLocalString(baseStart, timeZone)
-  const baseWeekMonday = getMondayOfISOWeek(baseStart, timeZone)
-  const baseDow = dateFns.getDay(baseStart)
-  const baseCountsAsPattern = !!pattern[baseDow]
-  // Adjust index if base weekday is not part of the pattern (pattern occurrences shift by +1)
-  let occ = occurrenceIndex
-  if (!baseCountsAsPattern) occ -= 1
-  if (occ < 0) return null
-  // Sorted list of active weekday indices
-  const patternDays = []
-  for (let d = 0; d < 7; d++) if (pattern[d]) patternDays.push(d)
-  // First (possibly partial) week: only pattern days >= baseDow and >= baseStart date
-  const firstWeekDates = []
-  for (const d of patternDays) {
-    if (d < baseDow) continue
-    const date = dateFns.addDays(baseWeekMonday, d)
-    if (date < baseStart) continue
-    firstWeekDates.push(date)
-  }
-  const F = firstWeekDates.length
-  if (occ < F) {
-    return toLocalString(firstWeekDates[occ], timeZone)
-  }
-  const remaining = occ - F
-  const P = patternDays.length
-  if (P === 0) return null
-  // Determine aligned week group (k >= 1) in which the remaining-th occurrence lies
-  const k = Math.floor(remaining / P) + 1 // 1-based aligned week count after base week
-  const indexInWeek = remaining % P
-  const dow = patternDays[indexInWeek]
-  const occurrenceDate = dateFns.addDays(baseWeekMonday, k * interval * 7 + dow)
-  return toLocalString(occurrenceDate, timeZone)
-}
-
-function getMonthlyOccurrenceDate(event, occurrenceIndex, timeZone = DEFAULT_TZ) {
-  const recur = _getRecur(event)
-  if (!recur || recur.freq !== 'months') return null
-  if (occurrenceIndex < 0 || !Number.isInteger(occurrenceIndex)) return null
-  const maxCount = recur.count === 'unlimited' ? Infinity : parseInt(recur.count, 10)
-  if (occurrenceIndex >= maxCount) return null
-  const interval = recur.interval || 1
-  const baseStart = fromLocalString(event.startDate, timeZone)
-  const targetMonthOffset = occurrenceIndex * interval
-  const monthDate = dateFns.addMonths(baseStart, targetMonthOffset)
-  // Adjust day for shorter months (clamp like forward logic)
-  const baseDay = dateFns.getDate(baseStart)
-  const daysInTargetMonth = dateFns.getDaysInMonth(monthDate)
-  const day = Math.min(baseDay, daysInTargetMonth)
-  const actual = makeTZDate(dateFns.getYear(monthDate), dateFns.getMonth(monthDate), day, timeZone)
-  return toLocalString(actual, timeZone)
-}
-
-function getOccurrenceDate(event, occurrenceIndex, timeZone = DEFAULT_TZ) {
-  const recur = _getRecur(event)
-  if (!recur) return null
-  if (recur.freq === 'weeks') return getWeeklyOccurrenceDate(event, occurrenceIndex, timeZone)
-  if (recur.freq === 'months') return getMonthlyOccurrenceDate(event, occurrenceIndex, timeZone)
-  return null
-}
-
-function getVirtualOccurrenceEndDate(event, occurrenceStartDate, timeZone = DEFAULT_TZ) {
-  const spanDays = Math.max(0, (event.days || 1) - 1)
-  const occurrenceStart = fromLocalString(occurrenceStartDate, timeZone)
-  return toLocalString(dateFns.addDays(occurrenceStart, spanDays), timeZone)
-}
+// (Recurrence utilities moved to events.js)
 
 // Utility formatting & localization ---------------------------------------
 const pad = (n) => String(n).padStart(2, '0')
@@ -366,9 +204,6 @@ export {
   // recurrence
   getMondayOfISOWeek,
   mondayIndex,
-  getOccurrenceIndex,
-  getOccurrenceDate,
-  getVirtualOccurrenceEndDate,
   // formatting & localization
   pad,
   daysInclusive,

src/utils/events.js

@@ -0,0 +1,171 @@
+import * as dateFns from 'date-fns'
+import { fromLocalString, toLocalString, getMondayOfISOWeek, makeTZDate, DEFAULT_TZ } from './date'
+import { addDays, isBefore, isAfter, differenceInCalendarDays } from 'date-fns'
+
+function countPatternDaysInInterval(startDate, endDate, patternArr) {
+  const days = dateFns.eachDayOfInterval({
+    start: dateFns.startOfDay(startDate),
+    end: dateFns.startOfDay(endDate),
+  })
+  return days.reduce((c, d) => c + (patternArr[dateFns.getDay(d)] ? 1 : 0), 0)
+}
+
+export function getNWeekly(event, dateStr, timeZone = DEFAULT_TZ) {
+  const { recur } = event
+  if (!recur || recur.freq !== 'weeks') return null
+  const pattern = recur.weekdays || []
+  if (!pattern.some(Boolean)) return null
+  const target = fromLocalString(dateStr, timeZone)
+  const baseStart = fromLocalString(event.startDate, timeZone)
+  if (dateFns.isBefore(target, baseStart)) return null
+  const dow = dateFns.getDay(target)
+  if (!pattern[dow]) return null
+  const interval = recur.interval || 1
+  const baseBlockStart = getMondayOfISOWeek(baseStart, timeZone)
+  const currentBlockStart = getMondayOfISOWeek(target, timeZone)
+  const weekDiff = dateFns.differenceInCalendarWeeks(currentBlockStart, baseBlockStart)
+  if (weekDiff < 0 || weekDiff % interval !== 0) return null
+  const baseDow = dateFns.getDay(baseStart)
+  const baseCountsAsPattern = !!pattern[baseDow]
+  if (weekDiff === 0) {
+    let n = countPatternDaysInInterval(baseStart, target, pattern) - 1
+    if (!baseCountsAsPattern) n += 1
+    const maxCount = recur.count === 'unlimited' ? Infinity : parseInt(recur.count, 10)
+    return n < 0 || n >= maxCount ? null : n
+  }
+  const baseWeekEnd = dateFns.addDays(baseBlockStart, 6)
+  const firstWeekCount = countPatternDaysInInterval(baseStart, baseWeekEnd, pattern)
+  const alignedWeeksBetween = weekDiff / interval - 1
+  const fullPatternWeekCount = pattern.filter(Boolean).length
+  const middleWeeksCount = alignedWeeksBetween > 0 ? alignedWeeksBetween * fullPatternWeekCount : 0
+  const currentWeekCount = countPatternDaysInInterval(currentBlockStart, target, pattern)
+  let n = firstWeekCount + middleWeeksCount + currentWeekCount - 1
+  if (!baseCountsAsPattern) n += 1
+  const maxCount = recur.count === 'unlimited' ? Infinity : parseInt(recur.count, 10)
+  return n >= maxCount ? null : n
+}
+
+function getNMonthly(event, dateStr, timeZone = DEFAULT_TZ) {
+  const { recur } = event
+  if (!recur || recur.freq !== 'months') return null
+  const baseStart = fromLocalString(event.startDate, timeZone)
+  const d = fromLocalString(dateStr, timeZone)
+  const diffMonths = dateFns.differenceInCalendarMonths(d, baseStart)
+  if (diffMonths < 0) return null
+  const interval = recur.interval || 1
+  if (diffMonths % interval !== 0) return null
+  const baseDay = dateFns.getDate(baseStart)
+  const effectiveDay = Math.min(baseDay, dateFns.getDaysInMonth(d))
+  if (dateFns.getDate(d) !== effectiveDay) return null
+  const n = diffMonths / interval
+  const maxCount = recur.count === 'unlimited' ? Infinity : parseInt(recur.count, 10)
+  return n >= maxCount ? null : n
+}
+
+function getN(event, dateStr, timeZone = DEFAULT_TZ) {
+  const { recur } = event
+  if (!recur) return null
+  const targetDate = fromLocalString(dateStr, timeZone)
+  const eventStartDate = fromLocalString(event.startDate, timeZone)
+  if (dateFns.isBefore(targetDate, eventStartDate)) return null
+  if (recur.freq === 'weeks') return getNWeekly(event, dateStr, timeZone)
+  if (recur.freq === 'months') return getNMonthly(event, dateStr, timeZone)
+  return null
+}
+
+// Reverse lookup: occurrence index -> start date string
+function getDateWeekly(event, n, timeZone = DEFAULT_TZ) {
+  const { recur } = event
+  if (!recur || recur.freq !== 'weeks') return null
+  if (n < 0 || !Number.isInteger(n)) return null
+  const maxCount = recur.count === 'unlimited' ? Infinity : parseInt(recur.count, 10)
+  if (n >= maxCount) return null
+  const pattern = recur.weekdays || []
+  if (!pattern.some(Boolean)) return null
+  const interval = recur.interval || 1
+  const baseStart = fromLocalString(event.startDate, timeZone)
+  if (n === 0) return toLocalString(baseStart, timeZone)
+  const baseWeekMonday = getMondayOfISOWeek(baseStart, timeZone)
+  const baseDow = dateFns.getDay(baseStart)
+  const baseCountsAsPattern = !!pattern[baseDow]
+  let occ = n
+  if (!baseCountsAsPattern) occ -= 1
+  if (occ < 0) return null
+  const patternDays = []
+  for (let d = 0; d < 7; d++) if (pattern[d]) patternDays.push(d)
+  const firstWeekDates = []
+  for (const d of patternDays) {
+    if (d < baseDow) continue
+    const date = dateFns.addDays(baseWeekMonday, d)
+    if (date < baseStart) continue
+    firstWeekDates.push(date)
+  }
+  const F = firstWeekDates.length
+  if (occ < F) return toLocalString(firstWeekDates[occ], timeZone)
+  const remaining = occ - F
+  const P = patternDays.length
+  if (P === 0) return null
+  const k = Math.floor(remaining / P) + 1
+  const indexInWeek = remaining % P
+  const dow = patternDays[indexInWeek]
+  const occurrenceDate = dateFns.addDays(baseWeekMonday, k * interval * 7 + dow)
+  return toLocalString(occurrenceDate, timeZone)
+}
+
+function getDateMonthly(event, n, timeZone = DEFAULT_TZ) {
+  const { recur } = event
+  if (!recur || recur.freq !== 'months') return null
+  if (n < 0 || !Number.isInteger(n)) return null
+  const maxCount = recur.count === 'unlimited' ? Infinity : parseInt(recur.count, 10)
+  if (n >= maxCount) return null
+  const interval = recur.interval || 1
+  const baseStart = fromLocalString(event.startDate, timeZone)
+  const targetMonthOffset = n * interval
+  const monthDate = dateFns.addMonths(baseStart, targetMonthOffset)
+  const baseDay = dateFns.getDate(baseStart)
+  const daysInTargetMonth = dateFns.getDaysInMonth(monthDate)
+  const day = Math.min(baseDay, daysInTargetMonth)
+  const actual = makeTZDate(dateFns.getYear(monthDate), dateFns.getMonth(monthDate), day, timeZone)
+  return toLocalString(actual, timeZone)
+}
+
+export function getDate(event, n, timeZone = DEFAULT_TZ) {
+  const { recur } = event
+  if (!recur) return null
+  if (recur.freq === 'weeks') return getDateWeekly(event, n, timeZone)
+  if (recur.freq === 'months') return getDateMonthly(event, n, timeZone)
+  return null
+}
+
+export function buildDayEvents(events, dateStr, timeZone = DEFAULT_TZ) {
+  const date = fromLocalString(dateStr, timeZone)
+  const out = []
+  for (const ev of events) {
+    const spanDays = ev.days || 1
+    if (!ev.recur) {
+      const baseStart = fromLocalString(ev.startDate, timeZone)
+      const baseEnd = addDays(baseStart, spanDays - 1)
+      if (!isBefore(date, baseStart) && !isAfter(date, baseEnd)) {
+        const diffDays = differenceInCalendarDays(date, baseStart)
+        out.push({ ...ev, n: 0, nDay: diffDays })
+      }
+      continue
+    }
+    // Recurring: gather all events whose start for any recurrence lies within spanDays window
+    const maxBack = Math.min(spanDays - 1, spanScanCap(spanDays))
+    for (let back = 0; back <= maxBack; back++) {
+      const candidateStart = addDays(date, -back)
+      const candidateStartStr = toLocalString(candidateStart, timeZone)
+      const n = getN(ev, candidateStartStr, timeZone)
+      if (n === null) continue
+      if (back >= spanDays) continue
+      out.push({ ...ev, n, nDay: back })
+    }
+  }
+  return out
+}
+
+function spanScanCap(spanDays) {
+  if (spanDays <= 31) return spanDays - 1
+  return Math.min(spanDays - 1, 90)
+}