Feature/support multi finger tap (#21)

* DragGestureをSpatialEventGestureに置換する。

* 一度フォーマットかけとく

* ピンチのデフォルトジェスチャを追加。

---------

Co-authored-by: Ie So <[email protected]>

Author: Saw-000

.claude/settings.local.json

@@ -1,7 +1,8 @@
 {
   "permissions": {
     "allow": [
-      "Bash(git log:*)"
+      "Bash(git log:*)",
+      "Bash(swift build:*)"
     ],
     "deny": [],
     "ask": []

Package.swift

@@ -1,20 +1,20 @@
 // swift-tools-version: 6.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
-import PackageDescription
 import Foundation
+import PackageDescription
 
 let package = Package(
     name: "SwiftUI-DetectGestureUtil",
     platforms: [
-        .iOS(.v14),
+        .iOS(.v18),
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
             name: "SwiftUI-DetectGestureUtil",
             targets: [
-                MyModule.swiftUIDetectGestureUtil.name // "SwiftUI-DetectGestureUtil"
+                MyModule.swiftUIDetectGestureUtil.name, // "SwiftUI-DetectGestureUtil"
             ]
         ),
     ],
@@ -23,32 +23,33 @@ let package = Package(
             name: MyModule.swiftUIDetectGestureUtil.name,
             dependencies: [
                 MyModule.featureDetectGesture.dependency,
-                MyModule.core.dependency
+                MyModule.core.dependency,
             ],
             path: MyModule.swiftUIDetectGestureUtil.folderPath
         ),
         .target(
             name: MyModule.featureDetectGesture.name,
             dependencies: [
-                MyModule.core.dependency
+                MyModule.core.dependency,
             ],
             path: MyModule.featureDetectGesture.folderPath
         ),
         .target(
             name: MyModule.core.name,
             path: MyModule.core.folderPath
-        )
+        ),
     ]
 )
 
 // MARK: - Utility
 
-// 自作モジュール
+/// Custom modules for package organization
 enum MyModule {
     case core
     case featureDetectGesture
     case swiftUIDetectGestureUtil
 
+    /// Folder path for the module
     var folderPath: String {
         return switch self {
         case .core:
@@ -60,6 +61,7 @@ enum MyModule {
         }
     }
 
+    /// Module name
     var name: String {
         return switch self {
         case .swiftUIDetectGestureUtil:
@@ -71,6 +73,7 @@ enum MyModule {
         }
     }
 
+    /// Target dependency
     var dependency: Target.Dependency {
         return .byName(name: name, condition: nil)
     }

README.md

@@ -2,11 +2,13 @@
 
 一つのViewに複数のカスタムジェスチャを設定し、その中の一つだけを検知させられるSwift Packageです。
 
-内部的には、DragGestureをカスタムしたものです。
+内部的には、SpatialEventGestureを利用しており、マルチタップ（複数の指）にも対応しています。
 
 A Swift Package that allows you to detect only one of multiple custom gestures on a single SwiftUI View.
 
-It is internally something that customs DragGesture.
+It uses [SpatialEventGesture](https://developer.apple.com/documentation/swiftui/spatialeventgesture) internally and supports multi-touch (multiple fingers).
+
+**Requirements: iOS 18.0+**
 
 <img width="400" alt="Simulator Screenshot - iPad (A16) - 2025-11-03 at 05 22 09" src="https://github.com/user-attachments/assets/1ee868bc-91ad-48bd-9a0a-c507ba95c56a" />
 
@@ -69,7 +71,7 @@ struct ContentView: View {
 
                 // Return value:
                 // - Non-nil: Indicates that a gesture was detected and returns the detected gesture. The gesture detection phase is then complete and this closure will no longer be called. From then on, handleGesture will be called.
-                // - nil: Indicates that no gesture was detected. As long as nil is returned, it will be called when the gesture state is updated, similar to Gesture.onChanged() and Gesture.onEnded(). Unlike DragGesture, new coordinates are added and called even if they remain at the same location.
+                // - nil: Indicates that no gesture was detected. As long as nil is returned, it will be called when the gesture state is updated, similar to Gesture.onChanged() and Gesture.onEnded(). A heartbeat mechanism ensures continuous updates even if fingers remain at the same location.
 
                 if state.detected(.tap) { // Several default gesture detections are provided. See DefaultDetectGesture type.
                     // Detect tap gesture
@@ -80,8 +82,8 @@ struct ContentView: View {
                 } else {
                     // Custom: Detect circle gesture without using default gestures
                     let points = state.gestureValues
-                        .withRawDragGesture()
-                        .map { $0.dragGestureValue.location }
+                        .filterdWithRawDragGesture
+                        .compactMap { $0.spatialEventCollection.gestureValue?.location }
 
                     if detectCircle(points: points) {
                         return .circle
@@ -96,7 +98,7 @@ struct ContentView: View {
 
                 // Return value:
                 // - .finished: Indicates processing is complete. Gesture processing is completely finished. The closure will no longer be called.
-                // - .yet: Indicates processing is incomplete. As long as .yet is returned, it will be called when the gesture state is updated, similar to Gesture.onChanged() and Gesture.onEnded(). Unlike DragGesture, new coordinates are added and called even if they remain at the same location.
+                // - .yet: Indicates processing is incomplete. As long as .yet is returned, it will be called when the gesture state is updated, similar to Gesture.onChanged() and Gesture.onEnded(). A heartbeat mechanism ensures continuous updates even if fingers remain at the same location.
 
                 switch detection {
                 case .tap:
@@ -144,23 +146,34 @@ You can access it in each handler of `View.detectGesture()`.
 
 - `gestureValues: [DetectGestureValue]`: History of gesture information
 - `detected(_:gestureValues:) -> Bool`: Whether the specified default gesture has already been detected
-- `tapSplittedGestureValues: [[DetectGestureValue]]`: History of gesture information separated by tap
-- `lastTapGestureValues: [DetectGestureValue]?`: GestureValues with last (or current in tapping) tap
-- `lastGestureValue: DetectGestureValue?`: Last Detected Gestrue Value
+- `gestureValuesAsTapSequences: [DetectGestureTapSequence]`: Gesture values converted to tap sequences
+- `lastTapSequence: DetectGestureTapSequence?`: Last tap sequence
+- `lastGestureValue: DetectGestureValue?`: Last detected gesture value
+- `processPerSingleFingerTouch(_:)`: Process taps for each individual finger
 - etc...
 
 ### DetectGestureValue
-Value containing gesture state information. (like DragGesture.Value)
+Value containing gesture state information.
 
-- `dragGestureValue: DragGesture.Value`: Drag gesture value from SwiftUI
+- `spatialEventCollection: SpatialEventCollection`: Spatial event collection from SwiftUI (supports multi-touch)
 - `geometryProxy: GeometryProxy`: Geometry proxy for view bounds
-- `timing: Timing`: Timing of this state update
-- `time: Date`: Timestamp of this state (using custom Date because DragGesture.Value.time has bugs)
-- `isInView() -> Bool`: Check if gesture location is within view bounds
+- `timing: Timing`: Timing of this state update (`.changed`, `.ended`, or `.heartbeat`)
+- `time: Date`: Timestamp of this state
+- `fingerCount: Int`: Number of fingers currently touching
+- `locations: [CGPoint]`: Locations of all fingers
+- `isAllFingersInView() -> Bool`: Check if all fingers are within view bounds
+- `asSingleFingerValues() -> [DetectGestureSingleFingerValue]`: Convert to single finger values for individual finger processing
 - etc...
 
-## Caution
-- ※ Multi-Fingered Gesture has not supported yet. (No plans)
+### SpatialEventCollection Extensions
+
+Convenience properties added to [SpatialEventCollection](https://developer.apple.com/documentation/swiftui/spatialeventcollection) for easier access:
+
+- `translation: CGSize`: Translation from start location
+- `velocity: CGSize`: Velocity of the gesture movement
+- `diff: CGPoint`: Distance moved from the initial tap location
+
+For more information about SpatialEventGesture, see [Apple's official documentation](https://developer.apple.com/documentation/swiftui/spatialeventgesture).
 
 ## Sample
 Run the project in Sample folder.

Sample/SwiftUIDetectGestureSample/SwiftUIDetectGestureSample/ContentView.swift

@@ -13,20 +13,20 @@ struct ContentView: View {
 
             // First gesture detection view
             VStack {
-                Text("tap\n" + "long tap\n" + "drag")
+                Text("tap\n" + "long tap\n" + "pinch")
                     .font(.title2)
             }
             .frame(maxWidth: .infinity, maxHeight: .infinity)
             .background(.blue)
             .detectGesture(
                 MyGestureDetection1.self,
                 detectGesture: { state in
-                    if state.detected(.tap) {
+                    if state.detected(.tap()) {
                         return .tap
                     } else if state.detected(.longTap(minimumMilliSeconds: 1000)) {
                         return .longTap
-                    } else if state.detected(.drag(minimumDistance: 30)) {
-                        return .drag
+                    } else if state.detected(.pinch(minimumDistance: 30)) {
+                        return .pinch
                     } else {
                         return nil
                     }
@@ -41,13 +41,22 @@ struct ContentView: View {
                         detectedGestureText = "Long Tap"
                         return .finished
 
-                    case .drag:
-                        if state.lastGestureValue?.timing == .ended {
-                            detectedGestureText = "Drag End"
-                            return .finished
-                        } else {
-                            detectedGestureText = "Drag location: \(state.lastGestureValue?.dragGestureValue.location)"
+                    case .pinch:
+                        // Display center position and distance
+                        if let lastPinch = state.pinchState.last, let lastValue = lastPinch.values.last {
+                            if lastPinch.isEnded {
+                                detectedGestureText = nil
+                                return .finished
+                            }
+
+                            let center = lastValue.center
+                            let distance = lastValue.distance
+                            detectedGestureText = "Pinch center: (\(String(format: "%.1f", center.x)), \(String(format: "%.1f", center.y))) distance: \(String(format: "%.1f", distance))"
+
                             return .yet
+                        } else {
+                            detectedGestureText = "Pinch failed??"
+                            return .finished
                         }
                     }
                 }
@@ -80,7 +89,7 @@ struct ContentView: View {
                             detectedGestureText = "Right Slide End"
                             return .finished
                         } else {
-                            detectedGestureText = "Right Slide location: \(state.lastGestureValue?.dragGestureValue.location)"
+                            detectedGestureText = "Right Slide location: \(state.lastGestureValue?.locations)"
                             return .yet
                         }
 
@@ -95,7 +104,6 @@ struct ContentView: View {
                 }
             )
 
-
             ZStack {
                 // Third gesture detection view
                 VStack {
@@ -109,15 +117,21 @@ struct ContentView: View {
                     detectGesture: { state in
                         detectGestureState3 = state
 
-                        for values in state.tapSplittedGestureValues {
-                            let points = values
-                                .withRawDragGesture() // Get coordinates only when moved.
-                                .map { $0.dragGestureValue.location }
-
-                            if detectStar(points: points) {
-                                return .star_swipe
-                            } else if detectCircle(points: points) {
-                                return .circle
+                        for tapSequence in state.gestureValuesAsTapSequences {
+                            for singleFingerTouch in tapSequence.touches {
+                                guard !singleFingerTouch.isOverlapped(with: tapSequence.touches) else {
+                                    continue
+                                }
+
+                                let points = singleFingerTouch.values
+                                    .withRawNotifiedGesture() // Get coordinates only when moved.
+                                    .map { $0.fingerEvent.location }
+
+                                if detectStar(points: points) {
+                                    return .star_swipe
+                                } else if detectCircle(points: points) {
+                                    return .circle
+                                }
                             }
                         }
 
@@ -132,7 +146,7 @@ struct ContentView: View {
                                 detectedGestureText = "Circle End"
                                 return .finished
                             } else {
-                                detectedGestureText = "Circle location: \(state.lastGestureValue?.dragGestureValue.location)"
+                                detectedGestureText = "Circle location: \(state.lastGestureValue?.locations)"
                                 return .yet
                             }
 
@@ -141,18 +155,22 @@ struct ContentView: View {
 
                             // End when swiped
                             guard
-                                let lastTapValues = state.lastTapGestureValues?.withRawDragGesture(),
-                                lastTapValues.count >= 2
+                                let lastTapSequence = state.lastTapSequence,
+                                lastTapSequence.touches.count > 0
                             else {
                                 return .yet
                             }
 
-                            if
-                                state.detected(.swipe(direction: .up), gestureValues: lastTapValues)
+                            let isSwiped = lastTapSequence.anySingleFingerTouchContains { singleFingerTouch, _ in
+                                let lastTapValues = singleFingerTouch.values.map { $0.attachmentInfo }
+
+                                return state.detected(.swipe(direction: .up), gestureValues: lastTapValues)
                                     || state.detected(.swipe(direction: .left), gestureValues: lastTapValues)
                                     || state.detected(.swipe(direction: .right), gestureValues: lastTapValues)
                                     || state.detected(.swipe(direction: .down), gestureValues: lastTapValues)
-                            {
+                            }
+
+                            if isSwiped {
                                 detectedGestureText = "Star Swiped!"
                                 return .finished
                             }
@@ -167,11 +185,13 @@ struct ContentView: View {
 
                 // Drawing trajectory
                 Path { path in
-                    detectGestureState3?.tapSplittedGestureValues.forEach { gestureValues in
-                        let points = gestureValues.map { $0.dragGestureValue.location }
+                    detectGestureState3?.processPerSingleFingerTouch { singleFingerTouch, _ in
+                        let points = singleFingerTouch.values.map { $0.fingerEvent.location }
                         guard let first = points.first else { return }
                         path.move(to: first)
-                        for p in points { path.addLine(to: p) }
+                        for p in points {
+                            path.addLine(to: p)
+                        }
                     }
                 }
                 .stroke(.black.opacity(0.5), lineWidth: 3)
@@ -193,8 +213,8 @@ enum MyGestureDetection1 {
     case tap
     /// Long tap gesture
     case longTap
-    /// Drag gesture
-    case drag
+    /// Pinch gesture
+    case pinch
 }
 
 /// Wanted Gesture Detection
@@ -216,6 +236,7 @@ enum MyGestureDetection3 {
 }
 
 // MARK: - Shape detection algorithms
+
 /// Simple circle detection
 private func detectCircle(points: [CGPoint]) -> Bool {
     guard points.count > 100 else { return false }
@@ -227,12 +248,12 @@ private func detectCircle(points: [CGPoint]) -> Bool {
 
     // Calculate variance (variation) of radius (distance from center to each point).
     let center = CGPoint(
-        x: points.map{$0.x}.reduce(0,+)/CGFloat(points.count),
-        y: points.map{$0.y}.reduce(0,+)/CGFloat(points.count)
+        x: points.map { $0.x }.reduce(0,+) / CGFloat(points.count),
+        y: points.map { $0.y }.reduce(0,+) / CGFloat(points.count)
     )
     let radii = points.map { hypot($0.x - center.x, $0.y - center.y) }
-    let mean = radii.reduce(0,+)/CGFloat(radii.count)
-    let variance = radii.map{ pow($0 - mean, 2.0) }.reduce(0,+) / CGFloat(radii.count)
+    let mean = radii.reduce(0,+) / CGFloat(radii.count)
+    let variance = radii.map { pow($0 - mean, 2.0) }.reduce(0,+) / CGFloat(radii.count)
 
     // Calculate number of corners: consider as circle only if there are few sharp angle changes
     let angles = calculateTurningAngles(points: points)
@@ -278,10 +299,10 @@ private func totalLength(_ points: [CGPoint]) -> CGFloat {
 private func calculateTurningAngles(points: [CGPoint]) -> [CGFloat] {
     guard points.count > 2 else { return [] }
     var angles: [CGFloat] = []
-    for i in 1..<points.count-1 {
-        let a = points[i-1]
+    for i in 1 ..< points.count - 1 {
+        let a = points[i - 1]
         let b = points[i]
-        let c = points[i+1]
+        let c = points[i + 1]
         let v1 = CGPoint(x: b.x - a.x, y: b.y - a.y)
         let v2 = CGPoint(x: c.x - b.x, y: c.y - b.y)
         let angle = atan2(v2.y, v2.x) - atan2(v1.y, v1.x)

Sources/Core/CGSize+Extension.swift

@@ -1,6 +1,7 @@
 import Foundation
 
 public extension CGSize {
+    /// Calculate the Euclidean distance (magnitude) of the size vector
     var distance: CGFloat {
         return sqrt(width * width + height * height)
     }