fix(macos): event jump mode and quick-time slot stack like web

.github/scripts/compose-desktop-parity-shots.py

@@ -14,8 +14,14 @@
 
 SURFACES = (
     "week-grid",
+    "week-grid-allday",
+    "demo-events-banner",
+    "mod-hold-overlay",
+    "up-next-banner",
     "mini-calendar",
     "event-form",
+    "event-form-date-picker",
+    "event-form-time-picker",
     "command-palette",
     "settings",
     "onboarding-welcome",

.github/scripts/record-macos-parity-captures.sh

@@ -5,7 +5,20 @@ set -euo pipefail
 ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)
 OUT="${PARITY_OUTPUT_DIR:-$ROOT/build/desktop-parity/macos}"
 RESULT="$ROOT/apps/calendar-macos/build/ParityCapture.xcresult"
-SURFACES=(week-grid mini-calendar event-form command-palette settings onboarding-welcome)
+SURFACES=(
+  week-grid
+  week-grid-allday
+  demo-events-banner
+  mod-hold-overlay
+  up-next-banner
+  mini-calendar
+  event-form
+  event-form-date-picker
+  event-form-time-picker
+  command-palette
+  settings
+  onboarding-welcome
+)
 mkdir -p "$OUT"
 cd "$ROOT/apps/calendar-macos"
 

apps/calendar-macos/Compass/AppDelegate.swift

@@ -58,8 +58,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         installRootContent(on: window)
         if UITestLaunchPolicy.isParityCapture {
             // Parity XCUITest must match web 1280×820; never restore a narrow autosaved frame.
-            window.setContentSize(NSSize(width: 1280, height: 820))
-            window.center()
+            ParityCaptureWindowPolicy.scheduleReapply(to: window)
         } else {
             // Installing the content controller resizes the window, so restore the saved frame afterwards.
             window.setFrameUsingName(Self.windowFrameName)

apps/calendar-macos/Compass/NativeGridKeyboardRouter.swift

@@ -9,7 +9,6 @@ final class NativeGridKeyboardRouter {
     private let model: NativeCalendarRootModel
     private let modHold: ModHoldDetector
     private let formModHold: ModHoldDetector
-    private let eventJumpHold: HoldModifierDetector
     private let viewSwitchIds: Set<ShortcutId> = [.navDayView, .navWeekView, .navLifeView]
 
     init(model: NativeCalendarRootModel, registry: ShortcutRegistry) {
@@ -25,12 +24,6 @@ final class NativeGridKeyboardRouter {
                 model?.jumpEventFormField(digit: digit)
             }
         }
-        eventJumpHold = HoldModifierDetectorFactory.eventJumpHold { [weak model] digit in
-            Task { @MainActor in
-                model?.focusEventJump(digit: digit)
-            }
-        }
-
         let focusIds: Set<ShortcutId> = [
             .editFocusPrev,
             .editFocusNext,
@@ -119,6 +112,7 @@ final class NativeGridKeyboardRouter {
     func handleFlagsChanged(_ event: NSEvent) {
         let commandDown = event.modifierFlags.contains(.command)
         if model.settingsStore.isPresented || model.authStore.isModalPresented || model.pendingLogoutConfirmation
+            || model.pendingDeleteAccountConfirmation
             || model.invitationPrompt != nil || model.pendingRsvpChoice != nil {
             modHold.handleFlagsChanged(modifierDown: false)
             formModHold.handleFlagsChanged(modifierDown: false)
@@ -347,26 +341,10 @@ final class NativeGridKeyboardRouter {
             return false
         }
 
-        if case .character(let char) = keyEvent.key, char == "f", keyEvent.modifiers.isEmpty {
-            eventJumpHold.handleModifierDown(isRepeat: keyEvent.isRepeat)
-            if !keyEvent.isRepeat {
-                Task { @MainActor [weak self] in
-                    try? await Task.sleep(for: .milliseconds(280))
-                    self?.syncEventJumpHints()
-                }
-            }
-        }
-
-        if eventJumpHold.handleKeyDown(keyEvent) {
-            syncEventJumpHints()
-            return true
-        }
         if modHold.handleKeyDown(keyEvent) {
             return true
         }
 
-        syncEventJumpHints()
-
         if keyEvent.modifiers == .shift, case .character(let letter) = keyEvent.key {
             model.handleShiftDayJump(letter: letter)
             return true
@@ -534,6 +512,9 @@ final class NativeGridKeyboardRouter {
         }
 
         if keyEvent.modifiers.isEmpty, case .character(let digit) = keyEvent.key, digit.isNumber {
+            if model.eventJumpSelection.modeActive, model.focusEventJumpIfAvailable(digit: digit) {
+                return true
+            }
             model.handleQuickTimeDigit(digit)
             if !model.draftStore.quickTimeDigits.isEmpty {
                 return true
@@ -798,17 +779,6 @@ final class NativeGridKeyboardRouter {
         return false
     }
 
-    func handleKeyUp(_ event: NSEvent) {
-        if event.keyCode == 4 {
-            eventJumpHold.handleModifierUp()
-            model.setEventJumpHintsVisible(false)
-        }
-    }
-
-    private func syncEventJumpHints() {
-        model.setEventJumpHintsVisible(eventJumpHold.phase == .hintsVisible)
-    }
-
     private func performUndo() {
         if model.draftStore.gridDraft != nil,
             model.draftStore.status.activity == .keyboardPlace

apps/calendar-macos/Compass/NativeRootController.swift

@@ -90,6 +90,9 @@ final class NativeRootController: NSHostingController<ThemedRootView> {
         configureNativeServices()
         configureKeyboard()
         configureResume()
+        model.onParityCapturePresentationApplied = { [weak self] in
+            ParityCaptureWindowPolicy.applyIfNeeded(to: self?.view.window)
+        }
         Task {
             await model.start()
             deepLinkRouter.markConsumerReady()
@@ -105,6 +108,7 @@ final class NativeRootController: NSHostingController<ThemedRootView> {
 
     override func viewDidAppear() {
         super.viewDidAppear()
+        ParityCaptureWindowPolicy.scheduleReapply(to: view.window)
         // AppKit hands launch focus to the first key view, the header Previous
         // button, which then draws a ring and swallows Space and typing. The
         // grid owns the keyboard through the router, so start with no control

apps/calendar-macos/Compass/ParityCaptureWindowPolicy.swift

@@ -0,0 +1,39 @@
+import AppKit
+import CompassData
+import CompassKit
+
+/// Keeps the main window at web parity dimensions during XCUITest PNG export.
+enum ParityCaptureWindowPolicy {
+    private static let contentSize = NSSize(
+        width: ParityCaptureGeometry.viewportWidth,
+        height: ParityCaptureGeometry.viewportHeight
+    )
+
+    @MainActor
+    static func applyIfNeeded(to window: NSWindow?) {
+        guard UITestLaunchPolicy.isParityCapture, let window else { return }
+        // Always use the canonical parity viewport so five day columns are not
+        // clipped when the host display is smaller than 1280×820.
+        let target = contentSize
+        let visible = window.screen?.visibleFrame ?? NSScreen.main?.visibleFrame
+        let contentRect = NSRect(origin: .zero, size: target)
+        let frame = window.frameRect(forContentRect: contentRect)
+        if abs(window.frame.width - frame.width) > 2 || abs(window.frame.height - frame.height) > 2 {
+            var origin = frame.origin
+            if let visible {
+                origin.x = visible.midX - frame.width / 2
+                origin.y = visible.midY - frame.height / 2
+            }
+            window.setFrame(NSRect(origin: origin, size: frame.size), display: true)
+        }
+    }
+
+    @MainActor
+    static func scheduleReapply(to window: NSWindow?) {
+        guard UITestLaunchPolicy.isParityCapture, window != nil else { return }
+        applyIfNeeded(to: window)
+        DispatchQueue.main.async {
+            applyIfNeeded(to: window)
+        }
+    }
+}

apps/calendar-macos/CompassData/Sources/CompassData/DemoSeedFixture.swift

@@ -152,7 +152,7 @@ public struct DemoSeedFixture: Sendable {
             isActive: true,
             isPrimary: true,
             isVisible: true,
-            name: "Work",
+            name: "Compass",
             provider: "local",
             timeZone: IANATimeZone(rawValue: timeZone)
         )

apps/calendar-macos/CompassData/Sources/CompassData/NativeCalendarRootModel+AccountActions.swift

@@ -48,4 +48,33 @@ extension NativeCalendarRootModel {
             logoutError = "Could not log out. Try again."
         }
     }
+
+    public func requestDeleteAccount() {
+        guard !isDeletingAccount else { return }
+        deleteAccountError = nil
+        pendingDeleteAccountConfirmation = true
+    }
+
+    public func cancelDeleteAccount() {
+        guard !isDeletingAccount else { return }
+        pendingDeleteAccountConfirmation = false
+    }
+
+    public func confirmDeleteAccount() async {
+        guard pendingDeleteAccountConfirmation, !isDeletingAccount else { return }
+        deleteAccountError = nil
+        isDeletingAccount = true
+        defer { isDeletingAccount = false }
+        guard isSignedIn else {
+            deleteAccountError = "Sign in to delete your Compass account."
+            return
+        }
+        do {
+            try await UserAPI(client: environment.apiClient).deleteAccount()
+            pendingDeleteAccountConfirmation = false
+            try await signOut()
+        } catch {
+            deleteAccountError = "Could not delete your account. Try again."
+        }
+    }
 }

apps/calendar-macos/CompassData/Sources/CompassData/NativeCalendarRootModel+Draft.swift

@@ -118,6 +118,7 @@ extension NativeCalendarRootModel {
 
     public func handleQuickTimeDigit(_ digit: Character) {
         guard viewStore.view != .life, draftStore.gridDraft == nil else { return }
+        guard eventJumpSelection.modeActive || eventJumpSelection.isActive else { return }
         guard digit.isNumber else { return }
 
         let next = draftStore.quickTimeDigits + String(digit)
@@ -150,6 +151,7 @@ extension NativeCalendarRootModel {
             calendarId: defaultTargetCalendarId()
         )
         draftStore.startGridDraft(activity: .keyboardPlace, draft: draft)
+        clearEventJumpSelection()
         rebuildPresentation()
         focusDraftCard()
     }

apps/calendar-macos/CompassData/Sources/CompassData/NativeCalendarRootModel+EventJump.swift

@@ -6,6 +6,13 @@ extension NativeCalendarRootModel {
 
     public var eventJumpStatusText: String? {
         guard eventJumpSelection.isActive else { return nil }
+        if eventJumpSelection.modeActive,
+            eventJumpSelection.activeDayKeys.isEmpty,
+            eventJumpSelection.dayJumpBuffer.isEmpty,
+            eventJumpSelection.announcement == nil
+        {
+            return "Event jump on · Esc"
+        }
         if eventJumpSelection.dayJumpBuffer == "s", eventJumpSelection.activeDayKeys.isEmpty {
             return "Shift+U Sunday · Shift+A Saturday · Esc"
         }
@@ -18,8 +25,33 @@ extension NativeCalendarRootModel {
         return "Event jump · Esc"
     }
 
+    public func toggleEventJumpMode() {
+        if eventJumpSelection.modeActive {
+            clearEventJumpSelection()
+            draftStore.setQuickTimeDigits("")
+            return
+        }
+        eventJumpSelection.setModeActive(true)
+        recordShortcut(.focusShiftHold)
+        refreshEventJumpPresentation()
+    }
+
+    func refreshEventJumpPresentation() {
+        if eventJumpSelection.modeActive {
+            eventJumpHintLabels = buildEventJumpHints()
+            quickTimeSlotHintLabels = buildQuickTimeSlotHints()
+        } else {
+            eventJumpHintLabels = []
+            quickTimeSlotHintLabels = []
+        }
+        applyFocusPresentation()
+    }
+
     public func handleShiftDayJump(letter: Character) {
         guard viewStore.view == .week || viewStore.view == .day else { return }
+        if !eventJumpSelection.modeActive {
+            eventJumpSelection.setModeActive(true)
+        }
         let lower = String(letter).lowercased()
 
         if eventJumpSelection.dayJumpBuffer == "s" {
@@ -36,7 +68,7 @@ extension NativeCalendarRootModel {
         if lower == "s" {
             eventJumpSelection.setWeekendDisambiguation(announcement: "Weekend")
             recordShortcut(.focusWeekDay)
-            applyFocusPresentation()
+            refreshEventJumpPresentation()
             return
         }
 
@@ -62,16 +94,63 @@ extension NativeCalendarRootModel {
             }) {
                 focusEvent(eventId: first.id.rawValue)
             }
-            applyFocusPresentation()
+            refreshEventJumpPresentation()
             return
         }
     }
 
     public func clearEventJumpSelection() {
         eventJumpSelection.clear()
+        eventJumpHintLabels = []
+        quickTimeSlotHintLabels = []
         applyFocusPresentation()
     }
 
+    func buildQuickTimeSlotHints() -> [QuickTimeSlotHint] {
+        guard eventJumpSelection.modeActive else { return [] }
+        let focusedDay = QuickTime.quickTimeFocusedColumnDay(
+            activeDayKeys: eventJumpSelection.activeDayKeys)
+        let targetDay = QuickTime.quickTimeTargetDay(
+            startOfView: startOfView,
+            endOfView: endOfView,
+            now: referenceNow,
+            focusedDay: focusedDay
+        )
+        let timedStarts: [Date] = loadedEvents.compactMap { event in
+            guard case .timed(let timed) = event.schedule else { return nil }
+            return CompassDateParsing.parseInEffectiveTimeZone(timed.start.rawValue)
+        }
+        let timedEnds: [Date] = loadedEvents.compactMap { event in
+            guard case .timed(let timed) = event.schedule else { return nil }
+            return CompassDateParsing.parseInEffectiveTimeZone(timed.end.rawValue)
+        }
+        let busy = QuickTime.timedEventsToBusyIntervals(startDates: timedStarts, endDates: timedEnds)
+        let slots = QuickTime.buildQuickTimeSlots(busy: busy, targetDay: targetDay)
+        let visibleDates = GridVisibleDate.fromKeys(timeGridState.scenario.visibleDateKeys)
+        let colWidths = timeGridState.resolvedColumnWidths()
+        let snapshotMetrics = timeGridState.snapshot(colWidths: colWidths).metrics
+        let gridMetrics = GridMetrics(
+            colWidths: snapshotMetrics.colWidths,
+            hourHeight: snapshotMetrics.hourHeight
+        )
+        let columnIndex: Int? = {
+            let key = CompassDateParsing.formatCalendarDay(targetDay)
+            return visibleDates.firstIndex(where: { $0.key == key })
+        }()
+        return slots.compactMap { slot in
+            let frame = EventPositionCalculator.getBusyPeriodPosition(
+                segmentStart: slot.start,
+                segmentEnd: slot.end,
+                measurements: gridMetrics,
+                visibleDates: visibleDates,
+                columnIndex: columnIndex,
+                hasSecondaryTimeZone: timeGridState.hasSecondaryTimeZone
+            )
+            guard frame.width > 0, frame.height > 0 else { return nil }
+            return QuickTimeSlotHint(sequence: slot.sequence, frame: frame)
+        }
+    }
+
     private func eventJumpDayKey(for event: Event) -> String {
         switch event.schedule {
         case .timed(let timed):