Skip to content

fix(desktop-ui): tighten event form density toward web FormCard #4610

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): tighten event form density toward web FormCard #4610

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
2 changes: 1 addition & 1 deletion apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormCard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ struct EventFormCard<Content: View>: View {

var body: some View {
content()
.padding(10)
.padding(8)
.frame(maxWidth: .infinity, alignment: .leading)
.background(theme.surfaceOverlayColor)
.clipShape(RoundedRectangle(cornerRadius: NativeWebLayoutTokens.radiusDefault))
Expand Down
10 changes: 5 additions & 5 deletions apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormCompactDateField.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ struct EventFormCompactDateField: View {
var body: some View {
TextField("Date", text: $text)
.textFieldStyle(.plain)
.font(.rubik(13))
.font(.rubik(NativeWebLayoutTokens.fontSizeBody))
.foregroundStyle(theme.textColor)
.padding(.horizontal, 8)
.padding(.vertical, 6)
.background(theme.surfacePanelColor)
.clipShape(RoundedRectangle(cornerRadius: 4))
.frame(minHeight: 38)
.background(theme.surfaceOverlayColor)
.clipShape(RoundedRectangle(cornerRadius: NativeWebLayoutTokens.radiusDefault))
.overlay {
RoundedRectangle(cornerRadius: 4)
RoundedRectangle(cornerRadius: NativeWebLayoutTokens.radiusDefault)
.stroke(isFocused ? theme.accentColor : theme.borderColor, lineWidth: 1)
}
.focused($isFocused)
Expand Down
6 changes: 5 additions & 1 deletion apps/calendar-macos/CompassUI/Sources/CompassUI/EventForm/EventFormScheduleSection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ struct EventFormScheduleSection: View {
}

var body: some View {
VStack(alignment: .leading, spacing: 8) {
VStack(alignment: .leading, spacing: 6) {
Toggle("All day", isOn: Binding(
get: { draft.schedule.kind == .allDay },
set: { model.setDraftAllDay($0) }
Expand Down Expand Up @@ -43,6 +43,8 @@ struct EventFormScheduleSection: View {
displayedComponents: [.hourAndMinute]
)
.labelsHidden()
.controlSize(.small)
.frame(minHeight: 38)
.disabled(scheduleLocked)
.accessibilityIdentifier("compass-event-form-start")
}
Expand All @@ -67,6 +69,8 @@ struct EventFormScheduleSection: View {
displayedComponents: [.hourAndMinute]
)
.labelsHidden()
.controlSize(.small)
.frame(minHeight: 38)
.disabled(scheduleLocked)
.accessibilityIdentifier("compass-event-form-end")
}
Expand Down
8 changes: 4 additions & 4 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 @@ -30,7 +30,7 @@ public struct EventFormView: View {

private func formPanel(draft: GridEventDraft) -> some View {
let isReadOnly = model.isEventFormReadOnly(for: draft)
return VStack(alignment: .leading, spacing: 12) {
return VStack(alignment: .leading, spacing: 10) {
EventFormToolbarView(model: model, draft: draft)
.pageJumpChipAnchor(id: "form-actions")

Expand All @@ -39,7 +39,7 @@ public struct EventFormView: View {
set: { model.updateDraftFromForm(title: $0) }
))
.textFieldStyle(.plain)
.font(.rubik(16))
.font(.rubik(NativeWebLayoutTokens.fontSizeBody))
.foregroundStyle(theme.textColor)
.focused($titleFocused)
.disabled(isReadOnly)
Expand All @@ -48,7 +48,7 @@ public struct EventFormView: View {

ScrollViewReader { proxy in
ScrollView {
VStack(alignment: .leading, spacing: 12) {
VStack(alignment: .leading, spacing: 10) {
EventFormCard {
VStack(alignment: .leading, spacing: 10) {
EventFormScheduleSection(
Expand Down Expand Up @@ -171,7 +171,7 @@ public struct EventFormView: View {
.font(.rubik(14, weight: .medium))
.foregroundStyle(theme.onAccentColor)
.padding(.horizontal, 20)
.frame(maxWidth: .infinity, minHeight: 36)
.frame(maxWidth: .infinity, minHeight: 36, maxHeight: 36)
.background(theme.accentColor)
.clipShape(RoundedRectangle(cornerRadius: NativeWebLayoutTokens.radiusDefault))
}
Expand Down
Loading