Add isWheelScrolling for the focus state. Animated

Author: buh

Demo/Sources/Demo/Demo.swift

@@ -111,6 +111,7 @@ struct CompactSliderDemo: View {
     private func baseHorizontalSliders() -> some View {
         Group {
             CompactSlider(value: $progress).compactSliderStyle(default: .horizontal(.leading))
+                .compactSliderOnChange { print("CompactSlider onChange:", $0.focusState) }
             CompactSlider(value: $progress).compactSliderStyle(default: .horizontal(.center))
             CompactSlider(value: $progress).compactSliderStyle(default: .horizontal(.trailing))
 

Sources/CompactSlider/CompactSlider+Dragging.swift

@@ -11,12 +11,14 @@ extension CompactSlider {
             startDragTime = CFAbsoluteTimeGetCurrent()
         }
 
-        if let animation = animations[.dragging] {
-            withAnimation(animation) {
+        if !isDragging {
+            if let animation = animations[.dragging] {
+                withAnimation(animation) {
+                    isDragging = true
+                }
+            } else {
                 isDragging = true
             }
-        } else {
-            isDragging = true
         }
 
         if startDragLocation == nil {
@@ -66,12 +68,14 @@ extension CompactSlider {
             )
         }
 
-        if let animation = animations[.dragging] {
-            withAnimation(animation) {
+        if isDragging {
+            if let animation = animations[.dragging] {
+                withAnimation(animation) {
+                    isDragging = false
+                }
+            } else {
                 isDragging = false
             }
-        } else {
-            isDragging = false
         }
     }
 

Sources/CompactSlider/CompactSlider+ScrollWheel.swift

@@ -10,7 +10,29 @@ extension CompactSlider {
     func scrollWheelOnChange(_ event: ScrollWheelEvent, size: CGSize, location: CGPoint) {
         guard isHovering else { return }
 
-        if !event.isEnded {
+        if event.isEnded {
+            defer {
+                if isWheelScrolling {
+                    if let animation = animations[.wheelScrolling] {
+                        withAnimation(animation) {
+                            isWheelScrolling = false
+                        }
+                    } else {
+                        isWheelScrolling = false
+                    }
+                }
+            }
+        } else {
+            if !isWheelScrolling {
+                if let animation = animations[.wheelScrolling] {
+                    withAnimation(animation) {
+                        isWheelScrolling = true
+                    }
+                } else {
+                    isWheelScrolling = true
+                }
+            }
+            
             if style.type.isHorizontal, !event.isHorizontalDelta {
                 return
             }

Sources/CompactSlider/CompactSlider.swift

@@ -151,6 +151,7 @@ public struct CompactSlider<Value: BinaryFloatingPoint, Point: CompactSliderPoin
 
     @State var isHovering = false
     @State var isDragging = false
+    @State var isWheelScrolling = false
     @State var startDragTime: CFAbsoluteTime?
     @State var startDragLocation: CGPoint?
     @State var scrollWheelEvent = ScrollWheelEvent.zero
@@ -180,24 +181,27 @@ public struct CompactSlider<Value: BinaryFloatingPoint, Point: CompactSliderPoin
                 height: proxy.size.height - style.padding.vertical
             )
 
-            style.makeBody(
-                configuration: CompactSliderStyleConfiguration(
+            style.makeBody(configuration: {
+                let configuration = CompactSliderStyleConfiguration(
                     type: style.type,
                     size: size,
-                    focusState: .init(isHovering: isHovering, isDragging: isDragging),
+                    focusState: .init(
+                        isHovering: isHovering,
+                        isDragging: isDragging,
+                        isWheelScrolling: isWheelScrolling
+                    ),
                     progress: progress,
                     step: step,
                     colorScheme: colorScheme
                 )
-            )
+                
+                onChangeAction?(configuration)
+                return configuration
+            }())
             .dragGesture(
                 options: options,
-                onChanged: {
-                    dragGestureOnChange($0, size: size)
-                },
-                onEnded: {
-                    dragGestureOnEnded($0, size: size)
-                }
+                onChanged: { dragGestureOnChange($0, size: size) },
+                onEnded: { dragGestureOnEnded($0, size: size) }
             )
             #if os(macOS)
             .onScrollWheel(isEnabled: options.contains(.scrollWheel)) {

Sources/CompactSlider/CompactSliderAnimations.swift

@@ -10,6 +10,7 @@ public enum CompactSliderAnimationEvent {
     case hovering
     case dragging
     case tapping
+    case wheelScrolling
 }
 
 // MARK: - Environment

Sources/CompactSlider/CompactSliderStyleConfiguration.swift

@@ -57,16 +57,19 @@ extension CompactSliderStyleConfiguration {
         public var isHovering: Bool
         /// True, when dragging the slider.
         public var isDragging: Bool
+        /// True, when wheel-scrolling the slider.
+        public var isWheelScrolling: Bool
         /// True, when dragging or hovering the slider.
-        public var isFocused: Bool { isHovering || isDragging }
+        public var isFocused: Bool { isHovering || isDragging || isWheelScrolling }
 
         /// Create a focus state.
-        init(isHovering: Bool, isDragging: Bool) {
+        init(isHovering: Bool, isDragging: Bool, isWheelScrolling: Bool) {
             self.isHovering = isHovering
             self.isDragging = isDragging
+            self.isWheelScrolling = isWheelScrolling
         }
 
-        static var none = FocusState(isHovering: false, isDragging: false)
+        static var none = FocusState(isHovering: false, isDragging: false, isWheelScrolling: false)
     }
 }
 
@@ -390,7 +393,7 @@ struct CompactSliderStyleConfigurationKey: EnvironmentKey {
     static var defaultValue: CompactSliderStyleConfiguration = CompactSliderStyleConfiguration(
         type: .horizontal(.leading),
         size: .zero,
-        focusState: .init(isHovering: false, isDragging: false),
+        focusState: .none,
         progress: Progress(),
         step: nil,
         colorScheme: .light