Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .jules/palette.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## 2024-05-24 - Wide Hit Targets for List Rows
**Learning:** List rows containing checkboxes (like CategoryRow and NodeModulesRow) initially only had the checkbox itself acting as a button, making the hit target very small. When making the entire row clickable in SwiftUI, wrapping it in a Button with `.buttonStyle(.plain)` prevents text from turning blue, while `.contentShape(Rectangle())` ensures empty space inside the row registers taps. Additionally, VoiceOver users benefit significantly when the entire row is combined into a single accessibility element using `.accessibilityElement(children: .combine)` and state-driven traits like `.accessibilityAddTraits(.isSelected)`.
**Action:** When creating clickable list rows in SwiftUI, ensure a wide hit target and good VoiceOver experience by wrapping the entire row contents (e.g., `HStack`) in a `Button`, applying `.contentShape(Rectangle())` to make empty space clickable, using `.buttonStyle(.plain)` to prevent unintended text styling, and adding `.accessibilityElement(children: .combine)` along with state-appropriate traits like `.accessibilityAddTraits(.isSelected)`.
77 changes: 40 additions & 37 deletions Sources/Cacheout/Views/CategoryRow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,55 +24,58 @@ struct CategoryRow: View {
let onToggle: () -> Void

var body: some View {
HStack(spacing: 12) {
// Checkbox
Button(action: onToggle) {
Button(action: onToggle) {
HStack(spacing: 12) {
// Checkbox
Image(systemName: result.isSelected ? "checkmark.circle.fill" : "circle")
.font(.title3)
.foregroundStyle(result.isSelected ? .blue : .secondary)
}
.buttonStyle(.plain)
.disabled(result.isEmpty)

// Icon
Image(systemName: result.category.icon)
.font(.title3)
.frame(width: 24)
.foregroundStyle(iconColor)
// Icon
Image(systemName: result.category.icon)
.font(.title3)
.frame(width: 24)
.foregroundStyle(iconColor)

// Name + description
VStack(alignment: .leading, spacing: 2) {
Text(result.category.name)
.font(.body.weight(.medium))
if result.isEmpty {
Text("Not found")
.font(.caption)
.foregroundStyle(.tertiary)
} else {
Text(result.category.description)
.font(.caption)
.foregroundStyle(.secondary)
.lineLimit(1)
// Name + description
VStack(alignment: .leading, spacing: 2) {
Text(result.category.name)
.font(.body.weight(.medium))
if result.isEmpty {
Text("Not found")
.font(.caption)
.foregroundStyle(.tertiary)
} else {
Text(result.category.description)
.font(.caption)
.foregroundStyle(.secondary)
.lineLimit(1)
}
}
}

Spacer()
Spacer()

// Size
if !result.isEmpty {
Text(result.formattedSize)
.font(.body.monospacedDigit())
.foregroundStyle(.primary)
}
// Size
if !result.isEmpty {
Text(result.formattedSize)
.font(.body.monospacedDigit())
.foregroundStyle(.primary)
}

// Risk badge
if !result.isEmpty {
RiskBadge(level: result.category.riskLevel)
// Risk badge
if !result.isEmpty {
RiskBadge(level: result.category.riskLevel)
}
}
.padding(.vertical, 6)
.padding(.horizontal, 10)
.contentShape(Rectangle())
}
.padding(.vertical, 6)
.padding(.horizontal, 10)
.buttonStyle(.plain)
.disabled(result.isEmpty)
.opacity(result.isEmpty ? 0.5 : 1)
.accessibilityElement(children: .combine)
.accessibilityAddTraits(result.isSelected ? [.isSelected] : [])
}

private var iconColor: Color {
Expand Down
63 changes: 33 additions & 30 deletions Sources/Cacheout/Views/NodeModulesSection.swift
Original file line number Diff line number Diff line change
Expand Up @@ -120,44 +120,47 @@ struct NodeModulesRow: View {
let onToggle: () -> Void

var body: some View {
HStack(spacing: 10) {
Button(action: onToggle) {
Button(action: onToggle) {
HStack(spacing: 10) {
Image(systemName: item.isSelected ? "checkmark.circle.fill" : "circle")
.font(.title3)
.foregroundStyle(item.isSelected ? .purple : .secondary)
}
.buttonStyle(.plain)

Image(systemName: "shippingbox.fill")
.foregroundStyle(.purple.opacity(0.7))
.frame(width: 20)
Image(systemName: "shippingbox.fill")
.foregroundStyle(.purple.opacity(0.7))
.frame(width: 20)

VStack(alignment: .leading, spacing: 1) {
Text(item.projectName)
.font(.body.weight(.medium))
Text(item.projectPath.path.replacingOccurrences(of: FileManager.default.homeDirectoryForCurrentUser.path, with: "~"))
.font(.caption2)
.foregroundStyle(.tertiary)
.lineLimit(1)
.truncationMode(.middle)
}
VStack(alignment: .leading, spacing: 1) {
Text(item.projectName)
.font(.body.weight(.medium))
Text(item.projectPath.path.replacingOccurrences(of: FileManager.default.homeDirectoryForCurrentUser.path, with: "~"))
.font(.caption2)
.foregroundStyle(.tertiary)
.lineLimit(1)
.truncationMode(.middle)
}

Spacer()
Spacer()

// Stale badge
if let badge = item.staleBadge {
Text(badge)
.font(.caption2.weight(.semibold))
.padding(.horizontal, 5)
.padding(.vertical, 2)
.background(Color.orange.opacity(0.15), in: Capsule())
.foregroundStyle(.orange)
}
// Stale badge
if let badge = item.staleBadge {
Text(badge)
.font(.caption2.weight(.semibold))
.padding(.horizontal, 5)
.padding(.vertical, 2)
.background(Color.orange.opacity(0.15), in: Capsule())
.foregroundStyle(.orange)
}

Text(item.formattedSize)
.font(.body.monospacedDigit())
Text(item.formattedSize)
.font(.body.monospacedDigit())
}
.padding(.vertical, 4)
.padding(.horizontal, 10)
.contentShape(Rectangle())
}
.padding(.vertical, 4)
.padding(.horizontal, 10)
.buttonStyle(.plain)
.accessibilityElement(children: .combine)
.accessibilityAddTraits(item.isSelected ? [.isSelected] : [])
}
}