TMP add stepper and picker

danielsaidi · danielsaidi · commit 8d23f4b72df6 · 2025-04-04T16:29:19.000+02:00
diff --git a/Sources/RichTextKit/Paragraph/NSMutableParagraphStyle+Picker.swift b/Sources/RichTextKit/Paragraph/NSMutableParagraphStyle+Picker.swift
@@ -1,5 +1,5 @@
 //
-//  NSParagraphStyle+Picker.swift
+//  NSMutableParagraphStyle+Picker.swift
 //  RichTextKit
 //
 //  Created by Daniel Saidi on 2025-04-04.
@@ -8,28 +8,28 @@
 
 import SwiftUI
 
-public extension KeyPath where Root == NSParagraphStyle {
+public extension KeyPath where Root == NSMutableParagraphStyle {
     
     /// Get default picker values for the key path.
     var defaultPickerValues: [Value]? {
         switch self {
         case \.alignment: NSTextAlignment.defaultPickerValues as? [Value]
         case \.allowsDefaultTighteningForTruncation: [true, false] as? [Value]
         case \.baseWritingDirection: NSWritingDirection.defaultPickerValues as? [Value]
-        case \.defaultTabInterval: [28.0, 36.0, 72.0, 144.0] as? [Value]
-        case \.firstLineHeadIndent: [0.0, 10.0, 20.0, 30.0, 40.0, 50.0] as? [Value]
-        case \.headIndent: [0.0, 10.0, 20.0, 30.0, 40.0, 50.0] as? [Value]
+        case \.defaultTabInterval: [28.0, 36, 72, 144] as? [Value]
+        case \.firstLineHeadIndent: [0.0, 10, 20, 30, 40, 50] as? [Value]
+        case \.headIndent: [0.0, 10, 20, 30, 40, 50] as? [Value]
         case \.hyphenationFactor: [0.0, 0.5, 1.0] as? [Value]
         case \.lineBreakMode: NSLineBreakMode.defaultPickerValues as? [Value]
         case \.lineBreakStrategy: NSParagraphStyle.LineBreakStrategy.defaultPickerValues as? [Value]
         case \.lineHeightMultiple: [1.0, 1.1, 1.2, 1.5, 2.0] as? [Value]
-        case \.lineSpacing: [0.0, 2.0, 4.0, 6.0, 8.0, 10.0] as? [Value]
-        case \.maximumLineHeight: [0.0, 20.0, 24.0, 28.0, 32.0, 36.0] as? [Value]
-        case \.minimumLineHeight: [0.0, 16.0, 18.0, 20.0, 22.0, 24.0] as? [Value]
-        case \.paragraphSpacing: [0.0, 4.0, 8.0, 12.0, 16.0, 20.0] as? [Value]
-        case \.paragraphSpacingBefore: [0.0, 4.0, 8.0, 12.0, 16.0, 20.0] as? [Value]
+        case \.lineSpacing: [0.0, 2, 4, 6, 8, 10] as? [Value]
+        case \.maximumLineHeight: [0.0, 20, 24, 28, 32, 36] as? [Value]
+        case \.minimumLineHeight: [0.0, 16, 18, 20, 22, 24] as? [Value]
+        case \.paragraphSpacing: [0.0, 4, 8, 12, 16, 20] as? [Value]
+        case \.paragraphSpacingBefore: [0.0, 4, 8, 12, 16, 20] as? [Value]
         case \.tabStops: [[]] as? [Value] // Usually customized based on document needs
-        case \.tailIndent: [0.0, 10.0, 20.0, 30.0, 40.0, 50.0] as? [Value]
+        case \.tailIndent: [0.0, 10, 20, 30, 40, 50] as? [Value]
         case \.usesDefaultHyphenation: [true, false] as? [Value]
         default: [] as? [Value]
         }
diff --git a/Sources/RichTextKit/Paragraph/NSMutableParagraphStyle+Stepper.swift b/Sources/RichTextKit/Paragraph/NSMutableParagraphStyle+Stepper.swift
@@ -8,7 +8,7 @@
 
 import SwiftUI
 
-public extension KeyPath where Root == NSParagraphStyle {
+public extension KeyPath where Root == NSMutableParagraphStyle, Value: Hashable & Strideable {
     
     /// Get the default stepper interval for the key path.
     var defaultStepperInterval: Value? {
diff --git a/Sources/RichTextKit/Paragraph/NSParagraphStyle+Presentation.swift b/Sources/RichTextKit/Paragraph/NSParagraphStyle+Presentation.swift
@@ -1,5 +1,5 @@
 //
-//  NSParagraphStyle+Image.swift
+//  NSParagraphStyle+Presentation.swift
 //  RichTextKit
 //
 //  Created by Daniel Saidi on 2025-04-04.
@@ -48,6 +48,15 @@ public extension NSTextAlignment {
         @unknown default: .richTextUnknownValueType
         }
     }
+    
+    /// The default label for the text alignment.
+    var defaultLabel: some View {
+        Label {
+            Text(title)
+        } icon: {
+            defaultIcon
+        }
+    }
 }
 
 @ViewBuilder
diff --git a/Sources/RichTextKit/Paragraph/RichTextParagraphValuePicker.swift b/Sources/RichTextKit/Paragraph/RichTextParagraphValuePicker.swift
@@ -0,0 +1,99 @@
+//
+//  RichTextParagraphValuePicker.swift
+//  RichTextKit
+//
+//  Created by Daniel Saidi on 2025-04-04.
+//  Copyright © 2025 Daniel Saidi. All rights reserved.
+//
+
+import SwiftUI
+
+/// This picker can be used to pick a paragraph value.
+///
+/// The `label` builder is used as the main picker label and
+/// `valueLabel` as a label for each picker value.
+public struct RichTextParagraphValuePicker<ValueType: Hashable, Label: View, ValueLabel: View>: View {
+    
+    public init(
+        _ keyPath: WritableKeyPath<NSMutableParagraphStyle, ValueType>,
+        context: RichTextContext,
+        values: [ValueType]? = nil,
+        label: @escaping () -> Label,
+        valueLabel: @escaping (ValueType) -> ValueLabel
+    ) {
+        self.init(
+            keyPath,
+            binding: context.paragraphStyleValueBinding(for: keyPath),
+            values: values,
+            label: label,
+            valueLabel: valueLabel
+        )
+    }
+    
+    public init(
+        _ keyPath: WritableKeyPath<NSMutableParagraphStyle, ValueType>,
+        binding: Binding<ValueType>,
+        values: [ValueType]? = nil,
+        label: @escaping () -> Label,
+        valueLabel: @escaping (ValueType) -> ValueLabel
+    ) {
+        self.keyPath = keyPath
+        self.binding = binding
+        self.values = values
+        self.label = label
+        self.valueLabel = valueLabel
+    }
+    
+    private let keyPath: WritableKeyPath<NSMutableParagraphStyle, ValueType>
+    private let binding: Binding<ValueType>
+    private let values: [ValueType]?
+    private let label: () -> Label
+    private let valueLabel: (ValueType) -> ValueLabel
+    
+    private var indexBinding: Binding<Int> {
+        Binding<Int>(
+            get: { pickerValues.firstIndex(of: binding.wrappedValue) ?? 0 },
+            set: { binding.wrappedValue = pickerValues[$0] }
+        )
+    }
+    
+    private var pickerValues: [ValueType] {
+        values ?? keyPath.defaultPickerValues ?? []
+    }
+    
+    public var body: some View {
+        Picker(selection: indexBinding) {
+            ForEach(Array(pickerValues.enumerated()), id: \.offset) {
+                valueLabel($0.element).tag($0.offset)
+            }
+        } label: {
+            label()
+        }
+    }
+}
+
+#Preview {
+
+    struct Preview: View {
+
+        @State var alignment = NSTextAlignment.left
+        @StateObject var context = RichTextContext()
+
+        var body: some View {
+            VStack {
+                RichTextParagraphValuePicker(
+                    \.alignment,
+                     context: context
+                ) {
+                    Text("TEST")
+                } valueLabel: { value in
+                    value.defaultLabel
+                }
+                .labelStyle(.iconOnly)
+                .pickerStyle(.segmented)
+            }
+        }
+    }
+
+    return Preview()
+}
diff --git a/Sources/RichTextKit/Paragraph/RichTextParagraphValueStepper.swift b/Sources/RichTextKit/Paragraph/RichTextParagraphValueStepper.swift
@@ -0,0 +1,79 @@
+//
+//  RichTextParagraphValueStepper.swift
+//  RichTextKit
+//
+//  Created by Daniel Saidi on 2025-04-04.
+//  Copyright © 2025 Daniel Saidi. All rights reserved.
+//
+
+import SwiftUI
+
+/// This stepper can be used to step a paragraph value.
+///
+/// The `label` builder is used as the main picker label.
+public struct RichTextParagraphValueStepper<ValueType: Hashable & Strideable & Comparable & SignedNumeric, Label: View>: View {
+    
+    public init(
+        _ keyPath: WritableKeyPath<NSMutableParagraphStyle, ValueType>,
+        context: RichTextContext,
+        step: ValueType.Stride,
+        label: @escaping () -> Label
+    ) {
+        self.init(
+            keyPath,
+            binding: context.paragraphStyleValueBinding(for: keyPath),
+            step: step,
+            label: label
+        )
+    }
+    
+    public init(
+        _ keyPath: WritableKeyPath<NSMutableParagraphStyle, ValueType>,
+        binding: Binding<ValueType>,
+        step: ValueType.Stride,
+        label: @escaping () -> Label
+    ) {
+        self.keyPath = keyPath
+        self.binding = binding
+        self.step = step
+        self.label = label
+    }
+    
+    private let keyPath: WritableKeyPath<NSMutableParagraphStyle, ValueType>
+    private let binding: Binding<ValueType>
+    private let step: ValueType.Stride
+    private let label: () -> Label
+    
+    public var body: some View {
+        Stepper(value: binding, step: step, label: label)
+    }
+}
+
+#Preview {
+
+    struct Preview: View {
+
+        @StateObject var context = RichTextContext()
+        
+        var value: Double {
+            context.paragraphStyleValue(for: \.lineSpacing)
+        }
+
+        var body: some View {
+            VStack {
+                Text(String(format: "%.1f", value))
+                RichTextParagraphValueStepper(
+                    \.lineSpacing,
+                     context: context,
+                     step: 0.1
+                ) {
+                    Text("TEST")
+                }
+                .labelStyle(.iconOnly)
+                .pickerStyle(.segmented)
+            }
+        }
+    }
+
+    return Preview()
+}
diff --git a/Sources/RichTextKit/RichTextContext.swift b/Sources/RichTextKit/RichTextContext.swift
@@ -94,7 +94,7 @@ public class RichTextContext: ObservableObject {
     ) -> ValueType {
         paragraphStyle[keyPath: keyPath]
     }
-
+    
     /// A binding that binds to paragraph style values.
     public func paragraphStyleValueBinding<ValueType>(
         for keyPath: WritableKeyPath<NSMutableParagraphStyle, ValueType>
diff --git a/Sources/RichTextKit/_Foundation/RichTextCoordinator+Subscriptions.swift b/Sources/RichTextKit/_Foundation/RichTextCoordinator+Subscriptions.swift
@@ -22,11 +22,11 @@ extension RichTextCoordinator {
         }
         .store(in: &cancellables)
 
-        subscribeToAlignment()
-        subscribeToFontName()
-        subscribeToFontSize()
-        subscribeToIsEditable()
-        subscribeToIsEditingText()
+        subscribeToContextAlignment()
+        subscribeToContextFontName()
+        subscribeToContextFontSize()
+        subscribeToContextIsEditable()
+        subscribeToContextIsEditingText()
     }
 }
 
@@ -41,31 +41,31 @@ private extension RichTextCoordinator {
             .store(in: &cancellables)
     }
 
-    func subscribeToAlignment() {
+    func subscribeToContextAlignment() {
         subscribe(to: context.$textAlignment) { [weak self] in
             self?.handle(.setAlignment($0))
         }
     }
 
-    func subscribeToFontName() {
+    func subscribeToContextFontName() {
         subscribe(to: context.$fontName) { [weak self] in
             self?.textView.setRichTextFontName($0)
         }
     }
 
-    func subscribeToFontSize() {
+    func subscribeToContextFontSize() {
         subscribe(to: context.$fontSize) { [weak self] in
             self?.textView.setRichTextFontSize($0)
         }
     }
 
-    func subscribeToIsEditable() {
+    func subscribeToContextIsEditable() {
         subscribe(to: context.$isEditable) { [weak self] in
             self?.setIsEditable(to: $0)
         }
     }
 
-    func subscribeToIsEditingText() {
+    func subscribeToContextIsEditingText() {
         subscribe(to: context.$isEditingText) { [weak self] in
             self?.setIsEditing(to: $0)
         }

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public class RichTextContext: ObservableObject {`
`94`	`94`	`) -> ValueType {`
`95`	`95`	`paragraphStyle[keyPath: keyPath]`
`96`	`96`	`}`
`97`		`-`
	`97`	`+`
`98`	`98`	`/// A binding that binds to paragraph style values.`
`99`	`99`	`public func paragraphStyleValueBinding<ValueType>(`
`100`	`100`	`for keyPath: WritableKeyPath<NSMutableParagraphStyle, ValueType>`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ extension RichTextCoordinator {`
`22`	`22`	`}`
`23`	`23`	`.store(in: &cancellables)`
`24`	`24`
`25`		`- subscribeToAlignment()`
`26`		`- subscribeToFontName()`
`27`		`- subscribeToFontSize()`
`28`		`- subscribeToIsEditable()`
`29`		`- subscribeToIsEditingText()`
	`25`	`+ subscribeToContextAlignment()`
	`26`	`+ subscribeToContextFontName()`
	`27`	`+ subscribeToContextFontSize()`
	`28`	`+ subscribeToContextIsEditable()`
	`29`	`+ subscribeToContextIsEditingText()`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -41,31 +41,31 @@ private extension RichTextCoordinator {`
`41`	`41`	`.store(in: &cancellables)`
`42`	`42`	`}`
`43`	`43`
`44`		`- func subscribeToAlignment() {`
	`44`	`+ func subscribeToContextAlignment() {`
`45`	`45`	`subscribe(to: context.$textAlignment) { [weak self] in`
`46`	`46`	`self?.handle(.setAlignment($0))`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- func subscribeToFontName() {`
	`50`	`+ func subscribeToContextFontName() {`
`51`	`51`	`subscribe(to: context.$fontName) { [weak self] in`
`52`	`52`	`self?.textView.setRichTextFontName($0)`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- func subscribeToFontSize() {`
	`56`	`+ func subscribeToContextFontSize() {`
`57`	`57`	`subscribe(to: context.$fontSize) { [weak self] in`
`58`	`58`	`self?.textView.setRichTextFontSize($0)`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- func subscribeToIsEditable() {`
	`62`	`+ func subscribeToContextIsEditable() {`
`63`	`63`	`subscribe(to: context.$isEditable) { [weak self] in`
`64`	`64`	`self?.setIsEditable(to: $0)`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- func subscribeToIsEditingText() {`
	`68`	`+ func subscribeToContextIsEditingText() {`
`69`	`69`	`subscribe(to: context.$isEditingText) { [weak self] in`
`70`	`70`	`self?.setIsEditing(to: $0)`
`71`	`71`	`}`