Add a configuration to disable the animation when the drag ends (#2)

Hengyu · Oct 22, 2024 · 1162887 · 1162887
1 parent a970b4c
commit 1162887
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Sources/DiscreteSlider/View/DiscreteSlider.swift b/Sources/DiscreteSlider/View/DiscreteSlider.swift
@@ -38,6 +38,7 @@ public struct DiscreteSlider<Option: Equatable>: View {
     private let handle: AnySliderHandle
     private let label: AnySliderLabel<Option>?
     private let tickDisplayGuide: TickDisplayGuide
+    private let animated: Bool
     private var onItemPreselected: ((Option) -> Void)?
 
     private var sliderHeight: CGFloat {
@@ -52,6 +53,7 @@ public struct DiscreteSlider<Option: Equatable>: View {
     ///   - options: Options that is used as a data source for the slider.
     ///   - track: Customized slider's track.
     ///   - tick: Customized slider's tick.
+    ///   - animated: Enable animation of the slider.
     ///   - handle: Customized slider's handle.
     ///   - label: Customized slider's label.
     ///   - selectedItem: Binding to the property that will store the selected item.
@@ -62,6 +64,7 @@ public struct DiscreteSlider<Option: Equatable>: View {
         handle: Handle,
         label: Label,
         tickDisplayGuide: TickDisplayGuide = .alwaysPresent,
+        animated: Bool = true,
         selectedItem: Binding<Option>,
         onItemPreselected: ((Option) -> Void)? = nil
     ) where Label.Option == Option {
@@ -70,6 +73,7 @@ public struct DiscreteSlider<Option: Equatable>: View {
         self.handle = .init(handle: handle)
         self.label = AnySliderLabel<Option>(label: label)
         self.tickDisplayGuide = tickDisplayGuide
+        self.animated = animated
         self.options = options
         self._selectedItem = selectedItem
         self.onItemPreselected = onItemPreselected
@@ -82,13 +86,15 @@ public struct DiscreteSlider<Option: Equatable>: View {
     ///   - options: Options that is used as a data source for the slider.
     ///   - track: Customized slider's track.
     ///   - handle: Customized slider's handle.
+    ///   - animated: Enable animation of the slider.
     ///   - selectedItem: Binding to the property that will store the selected item.
     public init<Track: SliderTrack, Tick: SliderTick, Handle: SliderHandle>(
         options: [Option],
         track: Track = DefaultSliderTrack(),
         tick: Tick? = DefaultSliderTick(),
         handle: Handle = DefaultSliderHandle(),
         tickDisplayGuide: TickDisplayGuide = .alwaysPresent,
+        animated: Bool = true,
         selectedItem: Binding<Option>,
         onItemPreselected: ((Option) -> Void)? = nil
     ) {
@@ -102,6 +108,7 @@ public struct DiscreteSlider<Option: Equatable>: View {
         self.label = nil
         self.options = options
         self.tickDisplayGuide = tickDisplayGuide
+        self.animated = animated
         self._selectedItem = selectedItem
         self.onItemPreselected = onItemPreselected
     }
@@ -121,6 +128,7 @@ public struct DiscreteSlider<Option: Equatable>: View {
                 tick: tick,
                 handle: handle,
                 tickDisplayGuide: tickDisplayGuide,
+                animated: animated,
                 selectedItem: $selectedItem,
                 onItemPreselected: onItemPreselected
             )

diff --git a/Sources/DiscreteSlider/View/SliderControl.swift b/Sources/DiscreteSlider/View/SliderControl.swift
@@ -41,6 +41,7 @@ struct SliderControl<Option: Equatable>: View {
     private let tick: AnySliderTick?
     private let handle: AnySliderHandle
     private let tickDisplayGuide: TickDisplayGuide
+    private let animated: Bool
 
     private let step: CGFloat
     @Binding private var selectedItem: Option
@@ -68,6 +69,7 @@ struct SliderControl<Option: Equatable>: View {
         tick: Tick? = DefaultSliderTick(),
         handle: Handle = DefaultSliderHandle(),
         tickDisplayGuide: TickDisplayGuide = .alwaysPresent,
+        animated: Bool = true,
         selectedItem: Binding<Option>,
         onItemPreselected: ((Option) -> Void)? = nil
     ) {
@@ -80,6 +82,7 @@ struct SliderControl<Option: Equatable>: View {
         }
         self.options = options
         self.tickDisplayGuide = tickDisplayGuide
+        self.animated = animated
         self._selectedItem = selectedItem
 
         if options.count > 1 {
@@ -121,7 +124,7 @@ struct SliderControl<Option: Equatable>: View {
             updateHandleOffset(width: width, animated: false)
         }
         .onChange(of: selectedItem) { _ in
-            updateHandleOffset(width: width, animated: true)
+            updateHandleOffset(width: width, animated: animated)
         }
         .onChange(of: width) { newValue in
             updateHandleOffset(width: newValue, animated: false)
@@ -167,7 +170,7 @@ struct SliderControl<Option: Equatable>: View {
 
     private func dragEnded(on location: CGFloat, width: CGFloat) {
         if step == 0, let item = options.first {
-            setSelectedItem(item, animated: true)
+            setSelectedItem(item, animated: animated)
             return
         }
 
@@ -176,7 +179,7 @@ struct SliderControl<Option: Equatable>: View {
         let percentage = max(0, min(location / lineWidth, 1))
         let page = round(percentage / step)
 
-        setSelectedItem(options[Int(page)], animated: true)
+        setSelectedItem(options[Int(page)], animated: animated)
     }
 
     private func setSelectedItem(_ item: Option, animated: Bool) {