Skip to content

fix(desktop-ui): event form logistics card matches web #4599 #4607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tyler-dane merged 1 commit into from
Oct 19, 2026
Merged

fix(desktop-ui): event form logistics card matches web #4599 #4607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormAttendeesSection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,6 @@ struct EventFormAttendeesSection: View {
EnableContactSuggestionsNudgeView(model: model)
}
}
.padding(12)
.background(theme.surfacePanelColor)
.clipShape(RoundedRectangle(cornerRadius: 8))
.overlay(
RoundedRectangle(cornerRadius: 8)
.stroke(focusField == .attendees ? theme.accentColor : theme.borderColor, lineWidth: 1)
)
.accessibilityIdentifier("compass-event-form-attendees")
.pageJumpChipAnchor(id: "form-attendees")
.onChange(of: focusField) { _, field in
Expand Down
9 changes: 1 addition & 8 deletions apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormConferenceSection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,9 @@ struct EventFormConferenceSection: View {
) {
Text("Add \(CalendarCapabilities.conferenceKindLabel(kind))")
.font(.rubik(13))
.foregroundStyle(theme.textColor)
.foregroundStyle(theme.textMutedColor)
}
.toggleStyle(.switch)
.padding(12)
.background(theme.surfacePanelColor)
.clipShape(RoundedRectangle(cornerRadius: 8))
.overlay(
RoundedRectangle(cornerRadius: 8)
.stroke(focusField == .conference ? theme.accentColor : theme.borderColor, lineWidth: 1)
)
.accessibilityIdentifier("compass-event-form-conference")
.pageJumpChipAnchor(id: "form-conference")
}
Expand Down
1 change: 0 additions & 1 deletion apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormLocationField.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ struct EventFormLocationField: View {
.accessibilityLabel("Location suggestions")
}
}
.eventFormSectionChrome(focused: focusField == .location)
.pageJumpChipAnchor(id: "form-location")
.onChange(of: focusField) { _, field in
fieldFocused = field == .location
Expand Down
50 changes: 29 additions & 21 deletions apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,28 +103,32 @@ public struct EventFormView: View {
.id(EventFormField.attendees)
}
}
.overlay {
if isLogisticsFieldFocused(model.eventFormFocusedField) {
RoundedRectangle(cornerRadius: NativeWebLayoutTokens.radiusDefault)
.stroke(theme.accentColor, lineWidth: 1)
}
}
.id(EventFormField.location)
DescriptionEditorView(
html: Binding(
get: { draft.description },
set: { model.updateDraftFromForm(description: $0) }
),
resetKey: draft.persistedEventId?.rawValue ?? draft.clientId.rawValue,
isFocused: model.eventFormFocusedField == .description,
isEditable: !isReadOnly,
onLinkCopied: { model.didCopyDescriptionLink() }
)
.frame(minHeight: 72, maxHeight: 140)
.padding(8)
.background(theme.surfaceOverlayColor)
.clipShape(RoundedRectangle(cornerRadius: 8))
.overlay(
RoundedRectangle(cornerRadius: 8)
.stroke(
model.eventFormFocusedField == .description ? theme.accentColor : theme.borderColor,
lineWidth: 1
)
)
EventFormCard {
DescriptionEditorView(
html: Binding(
get: { draft.description },
set: { model.updateDraftFromForm(description: $0) }
),
resetKey: draft.persistedEventId?.rawValue ?? draft.clientId.rawValue,
isFocused: model.eventFormFocusedField == .description,
isEditable: !isReadOnly,
onLinkCopied: { model.didCopyDescriptionLink() }
)
.frame(minHeight: 72, maxHeight: 140)
}
.overlay {
if model.eventFormFocusedField == .description {
RoundedRectangle(cornerRadius: NativeWebLayoutTokens.radiusDefault)
.stroke(theme.accentColor, lineWidth: 1)
}
}
.pageJumpChipAnchor(id: "form-description")
.id(EventFormField.description)

Expand Down Expand Up @@ -194,4 +198,8 @@ public struct EventFormView: View {
titleFocused = field == .title
}
}

private func isLogisticsFieldFocused(_ field: EventFormField) -> Bool {
field == .location || field == .conference || field == .attendees
}
}
2 changes: 2 additions & 0 deletions docs/features/desktop-web-parity-checklist.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ Legend: **Mod** = ⌘ on macOS. Web bindings from `APP_SHORTCUT_BINDINGS` / `KEY
3. **Command palette** — missing commands, fuzzy highlight, keycap chips, row chrome.
4. **Grid** — now line gradient/rim, now-cue timing/shimmer, all-day tip strip.
5. **Keyboard gaps** — `focus-event` (U), Shift+M week-day focus, palette undo/redo.
6. **Event form logistics card** — match web #4599: one FormCard for Location, Add Google Meet, Add guests; Description in the following FormCard (not nested mini-panels).

Each PR should link a child issue, include before/after screenshots (web Chromium + macOS snapshot or manual), label `agent-automerge`, and pass macOS workflow on GitHub runners.

Expand All @@ -318,6 +319,7 @@ Each PR should link a child issue, include before/after screenshots (web Chromiu
| 2026-10-19 | Initial audit checklist for #4331 dogfood gate |
| 2026-10-19 | §7 visual evidence table (web CI captures; macOS/compare pending runner) |
| 2026-10-19 | §7 updated from workflow run 39299882448 (macOS + compare artifacts) |
| 2026-10-19 | §5 queue: event form logistics grouping (web #4599); CI fixes on main (palette Range, e2e/parity shard) |

---

Expand Down
Loading