Skip to content

fix(activity): remove gap above selected-file detail #34

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
tcballard merged 1 commit into from
Jul 23, 2026
Merged

fix(activity): remove gap above selected-file detail #34

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
113 changes: 68 additions & 45 deletions Sources/SortingHatApp/Views/DashboardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,57 +207,67 @@ struct DashboardView: View {
reviewRules: { openWindow(id: "rules") }
)
} else {
VSplitView {
Table(store.recent, selection: $selection) {
TableColumn("Status") { activity in
Label(activity.outcome.rawValue, systemImage: activity.outcome.symbol)
.foregroundStyle(color(for: activity.outcome))
.labelStyle(.titleAndIcon)
GeometryReader { geometry in
VStack(spacing: 0) {
Table(store.recent, selection: $selection) {
TableColumn("Status") { activity in
Label(activity.outcome.rawValue, systemImage: activity.outcome.symbol)
.foregroundStyle(color(for: activity.outcome))
.labelStyle(.titleAndIcon)
}
.width(min: 96, ideal: 112, max: 132)

TableColumn("Original") { activity in
Text(activity.sourceName).lineLimit(1).help(activity.sourceName)
}
.width(min: 130, ideal: 190)

TableColumn("Filed As") { activity in
Text(activity.filedName ?? "—")
.lineLimit(1)
.foregroundStyle(activity.filedName == nil ? .secondary : .primary)
.help(activity.filedName ?? "Not filed")
}
.width(min: 130, ideal: 190)

TableColumn("Destination") { activity in
Text(activity.destination ?? "Inbox")
.lineLimit(1)
.help(activity.destination ?? "Remains in Inbox")
}
.width(min: 150, ideal: 230)

TableColumn("When") { activity in
Text(activity.date, style: .time).monospacedDigit()
}
.width(72)
}
.width(min: 96, ideal: 112, max: 132)

TableColumn("Original") { activity in
Text(activity.sourceName).lineLimit(1).help(activity.sourceName)
.frame(height: ActivityPaneMetrics.tableHeight(
itemCount: store.recent.count,
availableHeight: geometry.size.height
))
.accessibilityLabel("Recent filing activity")
.contextMenu(forSelectionType: Activity.ID.self) { selectedIDs in
if let activity = store.recent.first(where: { selectedIDs.contains($0.id) }) {
activityContextMenu(for: activity)
}
}
.width(min: 130, ideal: 190)

TableColumn("Filed As") { activity in
Text(activity.filedName ?? "—")
.lineLimit(1)
.foregroundStyle(activity.filedName == nil ? .secondary : .primary)
.help(activity.filedName ?? "Not filed")
}
.width(min: 130, ideal: 190)
Divider()

TableColumn("Destination") { activity in
Text(activity.destination ?? "Inbox")
.lineLimit(1)
.help(activity.destination ?? "Remains in Inbox")
}
.width(min: 150, ideal: 230)
ActivityDetailView(
activity: selectedActivity ?? store.recent.first!,
store: store,
differentiateWithoutColor: differentiateWithoutColor,
reduceMotion: reduceMotion,
retry: retry,
resolveManually: resolveManually,
removeFromActivity: removeFromActivity
)
.frame(height: ActivityPaneMetrics.detailHeight, alignment: .top)

TableColumn("When") { activity in
Text(activity.date, style: .time).monospacedDigit()
}
.width(72)
}
.accessibilityLabel("Recent filing activity")
.contextMenu(forSelectionType: Activity.ID.self) { selectedIDs in
if let activity = store.recent.first(where: { selectedIDs.contains($0.id) }) {
activityContextMenu(for: activity)
}
Spacer(minLength: 0)
}

ActivityDetailView(
activity: selectedActivity ?? store.recent.first!,
store: store,
differentiateWithoutColor: differentiateWithoutColor,
reduceMotion: reduceMotion,
retry: retry,
resolveManually: resolveManually,
removeFromActivity: removeFromActivity
)
.frame(minHeight: 118, idealHeight: 142, maxHeight: 190)
}
}
}
Expand Down Expand Up @@ -315,6 +325,19 @@ struct DashboardView: View {

private enum DashboardSection: Hashable { case inbox, activity }

private enum ActivityPaneMetrics {
static let detailHeight: CGFloat = 154
private static let headerHeight: CGFloat = 31
private static let rowHeight: CGFloat = 30
private static let minimumTableHeight = headerHeight + rowHeight

static func tableHeight(itemCount: Int, availableHeight: CGFloat) -> CGFloat {
let maximumHeight = max(minimumTableHeight, availableHeight - detailHeight)
let fittedHeight = headerHeight + (CGFloat(itemCount) * rowHeight)
return min(maximumHeight, max(minimumTableHeight, fittedHeight))
}
}

private struct DashboardSectionButton: View {
let title: String
let symbol: String
Expand Down
Loading