Make ID generic

Author: Trent Guillory

SnapToScrollDemo/SnapToScrollDemo.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		84C99CD826D99BA100C1D5C4 /* Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C99CD726D99BA100C1D5C4 /* Model.swift */; };
+		84C99CD826D99BA100C1D5C4 /* CellModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C99CD726D99BA100C1D5C4 /* CellModel.swift */; };
 		84D9FA3626D9753600F87EF5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D9FA3526D9753600F87EF5 /* AppDelegate.swift */; };
 		84D9FA3826D9753600F87EF5 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D9FA3726D9753600F87EF5 /* SceneDelegate.swift */; };
 		84D9FA3A26D9753600F87EF5 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D9FA3926D9753600F87EF5 /* ContentView.swift */; };
@@ -18,7 +18,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		84C99CD726D99BA100C1D5C4 /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = "<group>"; };
+		84C99CD726D99BA100C1D5C4 /* CellModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CellModel.swift; sourceTree = "<group>"; };
 		84D9FA3226D9753600F87EF5 /* SnapToScrollDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SnapToScrollDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		84D9FA3526D9753600F87EF5 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		84D9FA3726D9753600F87EF5 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -67,7 +67,7 @@
 				84D9FA3526D9753600F87EF5 /* AppDelegate.swift */,
 				84D9FA3726D9753600F87EF5 /* SceneDelegate.swift */,
 				84D9FA3926D9753600F87EF5 /* ContentView.swift */,
-				84C99CD726D99BA100C1D5C4 /* Model.swift */,
+				84C99CD726D99BA100C1D5C4 /* CellModel.swift */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
@@ -174,7 +174,7 @@
 				84D9FA3626D9753600F87EF5 /* AppDelegate.swift in Sources */,
 				84D9FA3826D9753600F87EF5 /* SceneDelegate.swift in Sources */,
 				84D9FA3A26D9753600F87EF5 /* ContentView.swift in Sources */,
-				84C99CD826D99BA100C1D5C4 /* Model.swift in Sources */,
+				84C99CD826D99BA100C1D5C4 /* CellModel.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

SnapToScrollDemo/Sources/Model.swift renamed to SnapToScrollDemo/Sources/CellModel.swift

@@ -1,8 +1,8 @@
-
+//
 //
 //import Foundation
 //
-//struct Model: Identifiable {
+//struct CellModel: Identifiable {
 //
 //    var systemImage: String
 //    var

Sources/HStackSnap.swift

@@ -32,7 +32,7 @@ public struct HStackSnap<Content: View>: View {
 
                 for pref in preferences {
 
-                    itemFrames[pref.id] = pref
+                    itemFrames[pref.id.hashValue] = pref
                 }
 
             })
@@ -95,7 +95,7 @@ public struct HStackSnap<Content: View>: View {
     /// Calculated offset based on `SnapLocation`
     @State private var targetOffset: CGFloat
 
-    @State private var itemFrames: [UUID: ContentPreferenceData] = [:]
+    @State private var itemFrames: [Int: ContentPreferenceData] = [:]
 
     private let coordinateSpace: String
 }

Sources/Model/ContentPreferenceKey.swift

@@ -5,7 +5,7 @@ import SwiftUI
 
 struct ContentPreferenceData: Equatable {
 
-    let id: UUID
+    let id: Int
     let rect: CGRect
 }
 

Sources/Views/GeometryReaderOverlay.swift

@@ -1,11 +1,11 @@
 import Foundation
 import SwiftUI
 
-public struct GeometryReaderOverlay: View {
+public struct GeometryReaderOverlay<ID: Hashable>: View {
 
     // MARK: Lifecycle
 
-    public init(id: UUID, coordinateSpace: String = "SnapToScroll") {
+    public init(id: ID, coordinateSpace: String = "SnapToScroll") {
 
         self.id = id
         self.coordinateSpace = coordinateSpace
@@ -21,13 +21,13 @@ public struct GeometryReaderOverlay: View {
                 .preference(
                     key: ContentPreferenceKey.self,
                     value: [ContentPreferenceData(
-                        id: id,
+                        id: id.hashValue,
                         rect: geometry.frame(in: .named(coordinateSpace)))])
         }
     }
 
     // MARK: Internal
 
-    let id: UUID
+    let id: ID
     let coordinateSpace: String
 }