Cleaned up code

Author: Trent Guillory

Sources/HStackSnap.swift

@@ -26,76 +26,65 @@ public struct HStackSnap<Content: View>: View {
                 for pref in preferences {
 
                     itemFrames[pref.id] = pref
-//                        print(pref.rect.minX)
                 }
             })
-            .coordinateSpace(name: ContentPreferenceKey.coordinateSpace)
             .disabled(true)
-            .gesture(
-
-                DragGesture()
-                    .onChanged { gesture in
-
-                        self.scrollOffset = gesture.translation.width + prevScrollOffset
-
-                    }.onEnded { event in
-
-//                    scrollOffset += event.translation.width
-//                    dragOffset = 0
+            .gesture(snapDrag)
+        }
+            .coordinateSpace(name: ContentPreferenceKey.coordinateSpace)
+    }
 
-                        guard var closestFrame: ContentPreferenceData = itemFrames.first?.value else { return }
+    // MARK: Internal
 
-                        func distanceToFrame(x: CGFloat, absolute: Bool) -> CGFloat {
+    var content: () -> Content
 
-                            if absolute {
-                                return abs(targetOffset - x)
-                            } else {
-                                return targetOffset - x
-                            }
-                        }
+    var snapDrag: some Gesture {
 
-                        for (key, value) in itemFrames {
+        DragGesture()
+            .onChanged { gesture in
 
-                            let currDistance = distanceToFrame(
-                                x: closestFrame.rect.minX,
-                                absolute: true)
-                            let newDistance = distanceToFrame(x: value.rect.minX, absolute: true)
+                self.scrollOffset = gesture.translation.width + prevScrollOffset
 
-                            print("~~ \(value.rect.maxX)")
+            }.onEnded { event in
 
-                            if newDistance < currDistance {
+                guard var closestFrame: ContentPreferenceData = itemFrames.first?.value else { return }
 
-                                closestFrame = value
-                            }
-                        }
+                for (_, value) in itemFrames {
 
-                        withAnimation {
+                    let currDistance = distanceToTarget(
+                        x: closestFrame.rect.minX)
+                    let newDistance = distanceToTarget(x: value.rect.minX)
 
-                            print(distanceToFrame(x: closestFrame.rect.minX, absolute: false))
+                    if abs(newDistance) < abs(currDistance) {
 
-                            scrollOffset += distanceToFrame(
-                                x: closestFrame.rect.minX,
-                                absolute: false)
-                        }
+                        closestFrame = value
+                    }
+                }
 
-                    })
-            .onTapGesture {
+                withAnimation(.easeOut(duration: 0.2)) {
 
-                scrollOffset = 0
-                prevScrollOffset = 0
+                    scrollOffset += distanceToTarget(
+                        x: closestFrame.rect.minX)
+                }
+                
+                prevScrollOffset = scrollOffset
             }
-        }
     }
 
-    // MARK: Internal
+    func distanceToTarget(x: CGFloat) -> CGFloat {
 
-    var content: () -> Content
+        return targetOffset - x
+    }
 
     // MARK: Private
 
+    /// Current scroll offset.
     @State private var scrollOffset: CGFloat = 0
+    
+    /// Stored offset of previous scroll, so scroll state is resumed between drags.
     @State private var prevScrollOffset: CGFloat = 0
-
+    
+    ///
     @State private var targetOffset: CGFloat = 0
 
     @State private var itemFrames: [UUID: ContentPreferenceData] = [:]

Sources/Model/SnapLocation.swift

@@ -0,0 +1,16 @@
+//
+//  File.swift
+//  File
+//
+//  Created by Trent Guillory on 8/28/21.
+//
+
+import Foundation
+import SwiftUI
+
+enum SnapLocation {
+    
+    case leading(CGFloat)
+    case trailing(CGFloat)
+    case center(CGFloat)
+}