FIX: horizontal value slider with RTL Languages

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -14,5 +14,6 @@ let package = Package(
     targets: [
         .target(name: "Sliders"),
         .testTarget(name: "SlidersTests", dependencies: ["Sliders"])
-    ]
+    ],
+    swiftLanguageModes: [.version("6")]
 )

Sources/Sliders/Base/DefaultThumb.swift

@@ -1,7 +1,7 @@
 import SwiftUI
 
 public struct DefaultThumb: View {
-    public init() {}
+    nonisolated public init() {}
     public var body: some View {
         Capsule()
             .foregroundColor(.white)

Sources/Sliders/Base/LinearValueMath.swift

@@ -3,27 +3,78 @@ import SwiftUI
 
 /// Linear calculations
 
-/// Calculates distance from zero in points
-@inlinable func distanceFrom(value: CGFloat, availableDistance: CGFloat, bounds: ClosedRange<CGFloat> = 0.0...1.0, leadingOffset: CGFloat = 0, trailingOffset: CGFloat = 0) -> CGFloat {
+/// Calculates the distance in points from the leading edge based on a value within a range.
+///
+/// This method computes a visual position (e.g., slider thumb) in a given layout space, taking into account offsets and layout direction.
+///
+/// - Parameters:
+///   - value: The input value to convert to a position, typically within `bounds`.
+///   - availableDistance: The total space available for the layout, excluding leading/trailing offsets.
+///   - bounds: The range representing the minimum and maximum values (default is 0.0...1.0).
+///   - leadingOffset: The offset at the start of the available space.
+///   - trailingOffset: The offset at the end of the available space.
+///   - isRightToLeft: Whether the layout should be mirrored (right-to-left).
+/// - Returns: The position in points corresponding to the value.
+@inlinable
+func distanceFrom(
+    value: CGFloat,
+    availableDistance: CGFloat,
+    bounds: ClosedRange<CGFloat> = 0.0...1.0,
+    leadingOffset: CGFloat = 0,
+    trailingOffset: CGFloat = 0,
+    isRightToLeft: Bool = false
+) -> CGFloat {
     guard availableDistance > leadingOffset + trailingOffset else { return 0 }
-    let boundsLenght = bounds.upperBound - bounds.lowerBound
-    let relativeValue = (value - bounds.lowerBound) / boundsLenght
-    let offset = (leadingOffset - ((leadingOffset + trailingOffset) * relativeValue))
-    return offset + (availableDistance * relativeValue)
+
+    let boundsLength = bounds.upperBound - bounds.lowerBound
+    let relativeValue = (value - bounds.lowerBound) / boundsLength
+
+    let adjustedRelativeValue = isRightToLeft ? 1.0 - relativeValue : relativeValue
+    let offset = (leadingOffset - ((leadingOffset + trailingOffset) * adjustedRelativeValue))
+
+    return offset + (availableDistance * adjustedRelativeValue)
 }
 
-/// Calculates value for relative point in bounds with step.
-/// Example: For relative value 0.5 in range 2.0..4.0 produces 3.0
-@inlinable func valueFrom(distance: CGFloat, availableDistance: CGFloat, bounds: ClosedRange<CGFloat> = 0.0...1.0, step: CGFloat = 0.001, leadingOffset: CGFloat = 0, trailingOffset: CGFloat = 0) -> CGFloat {
+/// Calculates the value corresponding to a point along a layout axis, clamped to the provided bounds and snapped to the nearest step.
+///
+/// This method is typically the inverse of `distanceFrom`, converting a position (e.g., user touch location) back to a value in a specified range.
+///
+/// - Parameters:
+///   - distance: The visual position in points, such as a touch location.
+///   - availableDistance: The total space available for layout.
+///   - bounds: The valid value range (default is 0.0...1.0).
+///   - step: The smallest allowed step size when calculating the value (default is 0.001).
+///   - leadingOffset: Offset before the usable area.
+///   - trailingOffset: Offset after the usable area.
+///   - isRightToLeft: Whether the layout is in a right-to-left direction.
+/// - Returns: The value corresponding to the given distance, clamped and stepped.
+@inlinable
+func valueFrom(
+    distance: CGFloat,
+    availableDistance: CGFloat,
+    bounds: ClosedRange<CGFloat> = 0.0...1.0,
+    step: CGFloat = 0.001,
+    leadingOffset: CGFloat = 0,
+    trailingOffset: CGFloat = 0,
+    isRightToLeft: Bool = false
+) -> CGFloat {
     let relativeValue = (distance - leadingOffset) / (availableDistance - (leadingOffset + trailingOffset))
-    let newValue = bounds.lowerBound + (relativeValue * (bounds.upperBound - bounds.lowerBound))
+    let adjustedRelativeValue = isRightToLeft ? 1.0 - relativeValue : relativeValue
+
+    let newValue = bounds.lowerBound + (adjustedRelativeValue * (bounds.upperBound - bounds.lowerBound))
     let steppedNewValue = (round(newValue / step) * step)
     let validatedValue = min(bounds.upperBound, max(bounds.lowerBound, steppedNewValue))
+
     return validatedValue
 }
 
+/// Clamps the current value to the specified closed range.
+///
+/// - Parameter range: The closed range to clamp the value to.
+/// - Returns: The value, clamped to the given range.
 extension Comparable {
     func clamped(to range: ClosedRange<Self>) -> Self {
         min(max(self, range.lowerBound), range.upperBound)
     }
 }
+

Sources/Sliders/PointSlider/Style/AnyPointSliderStyle.swift

@@ -1,5 +1,6 @@
 import SwiftUI
 
+@MainActor
 public struct AnyPointSliderStyle: PointSliderStyle {
     private let styleMakeBody: (PointSliderStyle.Configuration) -> AnyView
 

Sources/Sliders/PointSlider/Style/EnvironmentValues+PointSliderStyle.swift

@@ -11,7 +11,8 @@ public extension EnvironmentValues {
     }
 }
 
-struct PointSliderStyleKey: EnvironmentKey {
+@MainActor
+struct PointSliderStyleKey: @preconcurrency EnvironmentKey {
     static let defaultValue: AnyPointSliderStyle = AnyPointSliderStyle(
         RectangularPointSliderStyle()
     )

Sources/Sliders/PointSlider/Style/PointSliderStyle.swift

@@ -6,6 +6,7 @@ import SwiftUI
 /// To configure the current `PointSlider` for a view hiearchy, use the
 /// `.valueSliderStyle()` modifier.
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
+@MainActor
 public protocol PointSliderStyle {
     /// A `View` representing the body of a `PointSlider`.
     associatedtype Body : View

Sources/Sliders/PointSlider/Styles/PointSliderOptions.swift

@@ -3,8 +3,8 @@ import SwiftUI
 public struct PointSliderOptions: OptionSet {
     public let rawValue: Int
 
-    public static let interactiveTrack = PointSliderOptions(rawValue: 1 << 0)
-    public static let defaultOptions: PointSliderOptions = []
+    @MainActor public static let interactiveTrack = PointSliderOptions(rawValue: 1 << 0)
+    @MainActor public static let defaultOptions: PointSliderOptions = []
 
     public init(rawValue: Int) {
         self.rawValue = rawValue

Sources/Sliders/PointTrack/EnvironmentValues+PointTrackConfiguration.swift

@@ -11,6 +11,7 @@ extension EnvironmentValues {
     }
 }
 
-struct PointTrackConfigurationKey: EnvironmentKey {
+@MainActor
+struct PointTrackConfigurationKey: @preconcurrency EnvironmentKey {
     static let defaultValue: PointTrackConfiguration = .defaultConfiguration
 }

Sources/Sliders/PointTrack/PointTrackConfiguration.swift

@@ -1,5 +1,6 @@
 import SwiftUI
 
+@MainActor
 public struct PointTrackConfiguration {
     public static let defaultConfiguration = PointTrackConfiguration()
 

Sources/Sliders/RangeSlider/Style/EnvironmentValues+RangeSliderStyle.swift

@@ -11,7 +11,8 @@ public extension EnvironmentValues {
     }
 }
 
-struct RangeSliderStyleKey: EnvironmentKey {
+@MainActor
+struct RangeSliderStyleKey: @preconcurrency EnvironmentKey {
     static let defaultValue: AnyRangeSliderStyle = AnyRangeSliderStyle(
         HorizontalRangeSliderStyle()
     )

Sources/Sliders/RangeSlider/Style/RangeSliderStyle.swift

@@ -5,7 +5,8 @@ import SwiftUI
 ///
 /// To configure the current `RangeSlider` for a view hiearchy, use the
 /// `.valueSliderStyle()` modifier.
-@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
+@MainActor
+@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *) // nonisolated
 public protocol RangeSliderStyle {
     /// A `View` representing the body of a `RangeSlider`.
     associatedtype Body : View

Sources/Sliders/RangeSlider/Styles/Horizontal/HorizontalRangeSliderStyle.swift

@@ -1,5 +1,6 @@
 import SwiftUI
 
+@MainActor
 public struct HorizontalRangeSliderStyle<Track: View, LowerThumb: View, UpperThumb: View>: RangeSliderStyle {
     private let track: Track
     private let lowerThumb: LowerThumb

Sources/Sliders/RangeSlider/Styles/RangeSliderOptions.swift

@@ -1,12 +1,13 @@
 import SwiftUI
 
+@MainActor
 public struct RangeSliderOptions: OptionSet {
     public let rawValue: Int
 
     public static let forceAdjacentValue = RangeSliderOptions(rawValue: 1 << 0)
     public static let defaultOptions: RangeSliderOptions = .forceAdjacentValue
 
-    public init(rawValue: Int) {
+    nonisolated public init(rawValue: Int) {
         self.rawValue = rawValue
     }
 }

Sources/Sliders/RangeSlider/Styles/Vertical/VerticalRangeSliderStyle.swift

@@ -1,5 +1,6 @@
 import SwiftUI
 
+@MainActor
 public struct VerticalRangeSliderStyle<Track: View, LowerThumb: View, UpperThumb: View>: RangeSliderStyle {
     private let track: Track
     private let lowerThumb: LowerThumb

Sources/Sliders/RangeTrack/EnvironmentValues+RangeTrackConfiguration.swift

@@ -11,6 +11,7 @@ extension EnvironmentValues {
     }
 }
 
-struct RangeTrackConfigurationKey: EnvironmentKey {
+@MainActor
+struct RangeTrackConfigurationKey: @preconcurrency EnvironmentKey {
     static let defaultValue: RangeTrackConfiguration = .defaultConfiguration
 }

Sources/Sliders/RangeTrack/RangeTrackConfiguration.swift

@@ -1,5 +1,6 @@
 import SwiftUI
 
+@MainActor
 public struct RangeTrackConfiguration {
     public static let defaultConfiguration = RangeTrackConfiguration()
 
@@ -10,7 +11,7 @@ public struct RangeTrackConfiguration {
     public let upperLeadingOffset: CGFloat
     public let upperTrailingOffset: CGFloat
 
-    public init(bounds: ClosedRange<CGFloat> = 0.0...1.0, lowerLeadingOffset: CGFloat = 0, lowerTrailingOffset: CGFloat = 0, upperLeadingOffset: CGFloat = 0, upperTrailingOffset: CGFloat = 0) {
+    nonisolated public init(bounds: ClosedRange<CGFloat> = 0.0...1.0, lowerLeadingOffset: CGFloat = 0, lowerTrailingOffset: CGFloat = 0, upperLeadingOffset: CGFloat = 0, upperTrailingOffset: CGFloat = 0) {
         self.bounds = bounds
         self.lowerLeadingOffset = lowerLeadingOffset
         self.lowerTrailingOffset = lowerTrailingOffset
@@ -20,7 +21,7 @@ public struct RangeTrackConfiguration {
 }
 
 public extension RangeTrackConfiguration {
-    init(bounds: ClosedRange<CGFloat> = 0.0...1.0, lowerOffset: CGFloat = 0, upperOffset: CGFloat = 0) {
+    nonisolated init(bounds: ClosedRange<CGFloat> = 0.0...1.0, lowerOffset: CGFloat = 0, upperOffset: CGFloat = 0) {
         self.bounds = bounds
         self.lowerLeadingOffset = lowerOffset / 2
         self.lowerTrailingOffset = lowerOffset / 2 + upperOffset
@@ -30,7 +31,7 @@ public extension RangeTrackConfiguration {
 }
 
 public extension RangeTrackConfiguration {
-    init(bounds: ClosedRange<CGFloat> = 0.0...1.0, offsets: CGFloat = 0) {
+    nonisolated init(bounds: ClosedRange<CGFloat> = 0.0...1.0, offsets: CGFloat = 0) {
         self.bounds = bounds
         self.lowerLeadingOffset = offsets / 2
         self.lowerTrailingOffset = offsets / 2 + offsets

Sources/Sliders/ValueSlider/Style/EnvironmentValues+ValueSliderStyle.swift

@@ -11,7 +11,8 @@ public extension EnvironmentValues {
     }
 }
 
-struct ValueSliderStyleKey: EnvironmentKey {
+@MainActor
+struct ValueSliderStyleKey: @preconcurrency EnvironmentKey {
     static let defaultValue: AnyValueSliderStyle = AnyValueSliderStyle(
         HorizontalValueSliderStyle()
     )

Sources/Sliders/ValueSlider/Style/ValueSliderStyle.swift

@@ -5,6 +5,8 @@ import SwiftUI
 ///
 /// To configure the current `ValueSlider` for a view hiearchy, use the
 /// `.valueSliderStyle()` modifier.
+///
+@MainActor
 @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
 public protocol ValueSliderStyle {
     /// A `View` representing the body of a `ValueSlider`.

Sources/Sliders/ValueSlider/Style/ValueSliderStyleConfiguration.swift

@@ -6,7 +6,7 @@ public struct ValueSliderStyleConfiguration {
     public let step: CGFloat
     public let onEditingChanged: (Bool) -> Void
     public var dragOffset: Binding<CGFloat?>
-    
+
     public init(value: Binding<CGFloat>, bounds: ClosedRange<CGFloat>, step: CGFloat, onEditingChanged: @escaping (Bool) -> Void, dragOffset: Binding<CGFloat?>) {
         self.value = value
         self.bounds = bounds