tame the reply swipe so vertical scrolling stays clean
- Raise the swipe dominance threshold to 2.0 and add a 24pt activation distance so diagonal timeline scrolls never move bubbles or fire haptics, and snap the indicator back when a gesture turns vertical mid-drag. - Cover the stricter thresholds in MessageReplySwipeTests.
This commit is contained in:
1 parent
1a26651daa
commit
0ef77f7f6a
7 files changed
+61
-25
No files matched your search
@@ -2,12 +2,19 @@ import CoreGraphics
|
||||
|
||||
struct MessageReplySwipePolicy {
|
||||
static let triggerDistance: CGFloat = 64
|
||||
/// Horizontal travel required before the reply indicator appears. Keeps
|
||||
/// the per-cell state untouched during ordinary vertical scrolling.
|
||||
static let activationDistance: CGFloat = 24
|
||||
static let maximumOffset: CGFloat = 76
|
||||
static let horizontalDominance: CGFloat = 1.4
|
||||
/// The drag must be clearly horizontal: a mostly vertical timeline scroll
|
||||
/// (even a diagonal one) must never arm the reply swipe or move bubbles.
|
||||
static let horizontalDominance: CGFloat = 2.0
|
||||
|
||||
static func offset(for translation: CGSize) -> CGFloat {
|
||||
guard isHorizontal(translation) else { return 0 }
|
||||
let distance = min(abs(translation.width) * 0.72, maximumOffset)
|
||||
let width = abs(translation.width)
|
||||
guard width >= activationDistance else { return 0 }
|
||||
let distance = min((width - activationDistance) * 0.72 + 12, maximumOffset)
|
||||
return translation.width < 0 ? -distance : distance
|
||||
}
|
||||
|
||||
|
||||
@@ -177,9 +177,16 @@ struct MessageBubble: View {
|
||||
DragGesture(minimumDistance: 20)
|
||||
.onChanged { value in
|
||||
let offset = MessageReplySwipePolicy.offset(for: value.translation)
|
||||
guard offset != 0 || replySwipeOffset != 0 else {
|
||||
// A vertical timeline pan must not publish per-cell state
|
||||
// changes or compete with UIScrollView's own recognizer.
|
||||
guard offset != 0 else {
|
||||
// Vertical (or not clearly horizontal) movement: snap the
|
||||
// indicator back and never publish per-cell state changes
|
||||
// during an ordinary timeline scroll.
|
||||
if replySwipeOffset != 0 || replySwipeArmed {
|
||||
withAnimation(.spring(response: 0.24, dampingFraction: 0.82)) {
|
||||
replySwipeOffset = 0
|
||||
}
|
||||
replySwipeArmed = false
|
||||
}
|
||||
return
|
||||
}
|
||||
replySwipeOffset = offset
|
||||
|
||||
Reference in new issue
Block a user