feat:

follow selected position to latest drag position
tomosaaan · Oct 25, 2024 · f6195f3 · f6195f3
1 parent cfe0ada
commit f6195f3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 23 deletions.
diff --git a/Example/Example/ContentView.swift b/Example/Example/ContentView.swift
@@ -7,15 +7,7 @@ struct Element: GraphRangeElement {
 }
 
 struct ContentView: View {
-    let data: [Element] = [
-        .init(x: 10, y: 10),
-        .init(x: 20, y: 20),
-        .init(x: 30, y: 30),
-        .init(x: 40, y: 40),
-        .init(x: 50, y: 50),
-        .init(x: 60, y: 60),
-        .init(x: 70, y: 70),
-    ]
+    let data: [Element] = (1...50).map { .init(x: $0 * 10, y: $0 * 10) }
 
     @State var selectedData = [Element]()
 

diff --git a/Sources/GraphRangeSlider/Extensions/Array+.swift b/Sources/GraphRangeSlider/Extensions/Array+.swift
@@ -0,0 +1,7 @@
+import Foundation
+
+extension Array where Element: Comparable {
+    func argmin() -> Index? {
+        indices.min(by: { self[$0] < self[$1] })
+    }
+}
diff --git a/Sources/GraphRangeSlider/GraphRangeSlider.swift b/Sources/GraphRangeSlider/GraphRangeSlider.swift
@@ -15,7 +15,7 @@ public struct GraphRangeSlider<Data, ID>: View where Data: RandomAccessCollectio
     @Binding private var selectedData: Data
     @State private var leftCurrentIndex = 0
     @State private var rightCurrentIndex = 0
-    @State private var positions = [CGFloat]()
+    @State private var positions = ContiguousArray<CGFloat>()
     @Environment(\.graphBarWidth) private var graphBarWidth: CGFloat
     @Environment(\.activeColor) private var activeColor: Color
     @Environment(\.inactiveColor) private var inactiveColor: Color

diff --git a/Sources/GraphRangeSlider/Slider.swift b/Sources/GraphRangeSlider/Slider.swift
@@ -1,7 +1,7 @@
 import SwiftUI
 
 struct Slider: View {
-    let positions: [CGFloat]
+    let positions: ContiguousArray<CGFloat>
     @Binding var leftCurrentIndex: Int
     @Binding var rightCurrentIndex: Int
     @State private var viewSize = CGSize.zero

diff --git a/Sources/GraphRangeSlider/SliderToggle.swift b/Sources/GraphRangeSlider/SliderToggle.swift
@@ -5,7 +5,7 @@ struct SliderToggle: View {
         case left, right
     }
 
-    let togglePositions: [CGFloat]
+    let togglePositions: ContiguousArray<CGFloat>
     let limitIndex: Int
     @Binding var currentIndex: Int
     @Environment(\.activeColor) private var activeColor: Color
@@ -31,23 +31,16 @@ struct SliderToggle: View {
             .gesture(
                 DragGesture()
                     .onChanged { value in
-                        let nextIndex = min(currentIndex + 1, togglePositions.endIndex - 1)
-                        let previousIndex = max(currentIndex - 1, 0)
-
                         switch position {
                         case .left:
                             let locationX = value.location.x - toggleRadius
-                            if togglePositions[nextIndex] < locationX {
-                                currentIndex = min(nextIndex, limitIndex - 1)
-                            } else if locationX < togglePositions[previousIndex] {
-                                currentIndex = previousIndex
+                            if let index = togglePositions.map { abs($0 - locationX) }.argmin() {
+                                currentIndex = min(index, limitIndex - 1)
                             }
                         case .right:
                             let locationX = value.location.x + toggleRadius * 3
-                            if togglePositions[nextIndex] < locationX {
-                                currentIndex = nextIndex
-                            } else if locationX < togglePositions[previousIndex] {
-                                currentIndex = max(previousIndex, limitIndex + 1)
+                            if let index = togglePositions.map { abs($0 - locationX) }.argmin() {
+                                currentIndex = max(index, limitIndex + 1)
                             }
                         }
                     }