Skip to content

Improve Card hit-testing and border rendering in SUCard #100

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
merged 4 commits into from
Jun 20, 2025
Merged

Improve Card hit-testing and border rendering in SUCard #100

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2903963
simultaneous tap fix
VislovIvan Jun 19, 2025
9067d1a
fix tap recognition on clear background
VislovIvan Jun 19, 2025
98852e4
swiftui card fix border bug
VislovIvan Jun 19, 2025
52c1dbc
revert touchesBegan and touchesEnded code
VislovIvan Jun 19, 2025
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
27 changes: 15 additions & 12 deletions Sources/ComponentsKit/Components/Card/SUCard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,27 +51,30 @@ public struct SUCard<Content: View>: View {
.cornerRadius(self.model.cornerRadius.value)
.overlay(
RoundedRectangle(cornerRadius: self.model.cornerRadius.value)
.stroke(
.strokeBorder(
self.model.borderColor.color,
lineWidth: self.model.borderWidth.value
)
)
.shadow(self.model.shadow)
.observeSize { self.contentSize = $0 }
.simultaneousGesture(DragGesture(minimumDistance: 0.0)
.onChanged { _ in
guard self.model.isTappable else { return }
self.isPressed = true
}
.onEnded { value in
guard self.model.isTappable else { return }
.contentShape(.rect)
.gesture(
DragGesture(minimumDistance: 0.0)
.onChanged { _ in
guard self.model.isTappable else { return }
self.isPressed = true
}
.onEnded { value in
guard self.model.isTappable else { return }

defer { self.isPressed = false }
defer { self.isPressed = false }

if CGRect(origin: .zero, size: self.contentSize).contains(value.location) {
self.onTap()
if CGRect(origin: .zero, size: self.contentSize)
.contains(value.location) {
self.onTap()
}
}
}
)
.scaleEffect(
self.isPressed ? self.model.animationScale.value : 1,
Expand Down