Skip to content

Fix Paste Bar card alignment and bottom spacing #41

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

Open
alvst wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix Paste Bar card alignment and bottom spacing #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d13f8eb
Fix Paste Bar card alignment
alvst Jul 24, 2026
5c4b38e
Add breathing room below card strip
alvst Jul 25, 2026
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
50 changes: 29 additions & 21 deletions Sources/Pesty/UI/BarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import SwiftUI

struct BarView: View {
private static let stripTopInset: CGFloat = 16
private static let stripBottomInset: CGFloat = 26

@Bindable private var store = ClipboardStore.shared
@Bindable private var settings = Settings.shared

Expand Down Expand Up @@ -87,31 +90,36 @@ struct BarView: View {
}

private var strip: some View {
ScrollViewReader { proxy in
ScrollView(.horizontal, showsIndicators: false) {
LazyHStack(spacing: Theme.cardSpacing) {
ForEach(Array(store.visibleItems.enumerated()), id: \.element.id) { index, item in
ClipCardView(item: item,
index: index,
selected: item.id == store.selectedID)
.id(item.id)
.transition(.asymmetric(
insertion: .scale(scale: 0.92).combined(with: .opacity),
removal: .opacity))
GeometryReader { geometry in
let cardHeight = max(1, geometry.size.height - Self.stripTopInset - Self.stripBottomInset)

ScrollViewReader { proxy in
ScrollView(.horizontal, showsIndicators: false) {
LazyHStack(alignment: .top, spacing: Theme.cardSpacing) {
ForEach(Array(store.visibleItems.enumerated()), id: \.element.id) { index, item in
ClipCardView(item: item,
index: index,
selected: item.id == store.selectedID)
.frame(height: cardHeight)
.id(item.id)
.transition(.asymmetric(
insertion: .scale(scale: 0.92).combined(with: .opacity),
removal: .opacity))
}
}
.padding(.horizontal, 18)
.padding(.top, Self.stripTopInset)
.padding(.bottom, Self.stripBottomInset)
.animation(.spring(response: 0.34, dampingFraction: 0.8), value: store.visibleItems.count)
}
.padding(.horizontal, 18)
.padding(.top, 4)
.padding(.bottom, 18)
.animation(.spring(response: 0.34, dampingFraction: 0.8), value: store.visibleItems.count)
}
.onChange(of: store.selectedID) { _, id in
guard let id else { return }
withAnimation(.spring(response: 0.3, dampingFraction: 0.78)) {
proxy.scrollTo(id, anchor: .center)
.onChange(of: store.selectedID) { _, id in
guard let id else { return }
withAnimation(.spring(response: 0.3, dampingFraction: 0.78)) {
proxy.scrollTo(id, anchor: .center)
}
}
.overlay { if store.visibleItems.isEmpty { emptyState } }
}
.overlay { if store.visibleItems.isEmpty { emptyState } }
}
.frame(maxHeight: .infinity)
}
Expand Down