Skip to content

Update gesture modifier - can modify proposed velocity #24

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 1 commit into from
Apr 26, 2023
Merged

Update gesture modifier - can modify proposed velocity #24

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
10 changes: 6 additions & 4 deletions Sources/SwiftUISupport/Modifiers/VelocityDraggingModifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ public struct VelocityDraggingModifier: ViewModifier {
For example, return CGSize.zero to put it back to the original position.
*/
public var onEndDragging:
(_ velocity: CGVector, _ offset: CGSize, _ contentSize: CGSize) -> CGSize
(_ velocity: inout CGVector, _ offset: CGSize, _ contentSize: CGSize) -> CGSize

public init(
onEndDragging: @escaping (_ velocity: CGVector, _ offset: CGSize, _ contentSize: CGSize)
onEndDragging: @escaping (_ velocity: inout CGVector, _ offset: CGSize, _ contentSize: CGSize)
-> CGSize = { _, _, _ in .zero }
) {
self.onEndDragging = onEndDragging
Expand Down Expand Up @@ -126,13 +126,15 @@ public struct VelocityDraggingModifier: ViewModifier {
})
.onEnded({ value in

var usingVelocity = self.velocity

let targetOffset: CGSize = handler.onEndDragging(
self.velocity,
&usingVelocity,
self.currentOffset,
self.contentSize
)

let velocity = self.velocity
let velocity = usingVelocity

let distance = CGSize(
width: targetOffset.width - currentOffset.width,
Expand Down