RichTextAction subscription

Sources/RichTextKit/Actions/RichTextAction.swift

@@ -19,7 +19,6 @@ public enum RichTextAction: Identifiable, Equatable, RichTextLabelValue {
 
     /// Copy the currently selected text, if any.
     case copy
-
     /// Dismiss any presented software keyboard.
     case dismissKeyboard
 
@@ -48,19 +47,7 @@ public enum RichTextAction: Identifiable, Equatable, RichTextLabelValue {
     case undoLatestChange
 
     // Change background color
-    case setBackgroundColor(ColorRepresentable)
-
-    // Change foreground color
-    case setForegroundColor(ColorRepresentable)
-
-    // Change underline color
-    case setUnderlineColor(ColorRepresentable)
-
-    // Change strikethrough color
-    case setStrikethroughColor(ColorRepresentable)
-
-    // Change stroke color
-    case setStrokeColor(ColorRepresentable)
+    case setColor(ColorRepresentable, RichTextColor)
 
     // Highlighted renge
     case setHighlightedRange(NSRange?)
@@ -101,11 +88,7 @@ public extension RichTextAction {
         case .stepSuperscript(let val): .richTextStepSuperscript(val)
         case .toggleStyle(let val): val.icon
         case .undoLatestChange: .richTextActionUndo
-        case .setBackgroundColor: .richTextColorBackground
-        case .setForegroundColor: .richTextColorForeground
-        case .setUnderlineColor: .richTextColorUnderline
-        case .setStrikethroughColor: .richTextColorStrikethrough
-        case .setStrokeColor: .richTextColorStroke
+        case .setColor(_, let richTextColor): richTextColor.icon ?? .richTextColorBackground
         case .setHighlightedRange: .richTextAlignmentCenter
         case .setHighlightingStyle: .richTextAlignmentCenter
         case .pasteImage: .richTextDocuments
@@ -149,11 +132,15 @@ public extension RichTextAction {
         case .stepSuperscript(let steps): .actionStepSuperscript(steps)
         case .toggleStyle(let style): style.titleKey
         case .undoLatestChange: .actionUndoLatestChange
-        case .setBackgroundColor: .backgroundColor
-        case .setForegroundColor: .foregroundColor
-        case .setUnderlineColor: .underlineColor
-        case .setStrikethroughColor: .strikethroughColor
-        case .setStrokeColor: .strokeColor
+        case .setColor(_, let richTextColor):
+            switch richTextColor {
+            case .foreground: .foregroundColor
+            case .background: .backgroundColor
+            case .strikethrough: .strikethroughColor
+            case .stroke: .strokeColor
+            case .underline: .underlineColor
+            case .undefined: .strokeColor
+            }
         case .setHighlightedRange: .highlightedRange
         case .setHighlightingStyle: .highlightingStyle
         case .pasteImage: .pasteImage

Sources/RichTextKit/Context/RichTextContext+Actions.swift

@@ -34,11 +34,7 @@ public extension RichTextContext {
         case .stepSuperscript: return false
         case .toggleStyle: return true
         case .undoLatestChange: return canUndoLatestChange
-        case .setBackgroundColor: return true
-        case .setForegroundColor: return true
-        case .setUnderlineColor: return true
-        case .setStrikethroughColor: return true
-        case .setStrokeColor: return true
+        case .setColor: return true
         case .setHighlightedRange: return true
         case .setHighlightingStyle: return true
         case .pasteImage: return true

Sources/RichTextKit/Context/RichTextContext+Colors.swift

@@ -36,12 +36,14 @@ public extension RichTextContext {
         for val: RichTextColor
     ) {
         guard self.color(for: val) != color else { return }
+        userActionPublisher.send(.setColor(color, val))
+
         switch val {
-        case .foreground: userActionPublisher.send(.setForegroundColor(color)); foregroundColor = color
-        case .background: userActionPublisher.send(.setBackgroundColor(color)); backgroundColor = color
-        case .strikethrough: userActionPublisher.send(.setStrikethroughColor(color)); strikethroughColor = color
-        case .stroke: userActionPublisher.send(.setStrokeColor(color)); strokeColor = color
-        case .underline: userActionPublisher.send(.setUnderlineColor(color)); underlineColor = color
+        case .foreground: foregroundColor = color
+        case .background: backgroundColor = color
+        case .strikethrough: strikethroughColor = color
+        case .stroke: strokeColor = color
+        case .underline: underlineColor = color
         case .undefined: return
         }
     }

Sources/RichTextKit/Coordinator/RichTextCoordinator+ColorSubscriptions.swift

@@ -15,59 +15,13 @@ extension RichTextCoordinator {
         if textView.hasSelectedRange {
             applyRange = textView.selectedRange
         }
-        switch coloredAttribute {
-        case .foreground:
-            setForegroundColor(color, at: applyRange)
-        case .background:
-            setBackgroundColor(color, at: applyRange)
-        case .strikethrough:
-            setStrikethroughColor(color, at: applyRange)
-        case .stroke:
-            setStrokeColor(color, at: applyRange)
-        case .underline:
-            setUnderlineColor(color, at: applyRange)
-        case .undefined:
-            break
-        }
-    }
-
-    private func setStrikethroughColor(_ color: ColorRepresentable, at range: NSRange?) {
-        if let range {
-            self.textView.setRichTextColor(.strikethrough, to: color, at: range)
-        } else {
-            self.textView.setRichTextAttribute(.strikethroughColor, to: color)
-        }
-    }
-
-    private func setStrokeColor(_ color: ColorRepresentable, at range: NSRange?) {
-        if let range {
-            self.textView.setRichTextColor(.stroke, to: color, at: range)
-        } else {
-            self.textView.setRichTextAttribute(.strokeColor, to: color)
-        }
-    }
-
-    private func setForegroundColor(_ color: ColorRepresentable, at range: NSRange?) {
-        if let range {
-            self.textView.setRichTextColor(.foreground, to: color, at: range)
-        } else {
-            self.textView.setRichTextAttribute(.foregroundColor, to: color)
-        }
-    }
-
-    private func setBackgroundColor(_ color: ColorRepresentable, at range: NSRange?) {
-        if let range {
-            self.textView.setRichTextColor(.background, to: color, at: range)
-        } else {
-            self.textView.setRichTextAttribute(.backgroundColor, to: color)
-        }
-    }
-
-    private func setUnderlineColor(_ color: ColorRepresentable, at range: NSRange?) {
-        if let range {
-            self.textView.setRichTextColor(.underline, to: color, at: range)
+
+        guard let attribute = coloredAttribute.attribute else { return }
+
+        if let applyRange {
+            self.textView.setRichTextColor(coloredAttribute, to: color, at: applyRange)
         } else {
-            self.textView.setRichTextAttribute(.underlineColor, to: color)
+            self.textView.setRichTextAttribute(attribute, to: color)
         }
     }
 }

Sources/RichTextKit/Coordinator/RichTextCoordinator+Subscriptions.swift

@@ -46,16 +46,8 @@ private extension RichTextCoordinator {
         case .undoLatestChange:
             textView.undoLatestChange()
             syncContextWithTextView()
-        case .setBackgroundColor(let color):
-            setColor(color, for: .background)
-        case .setForegroundColor(let color):
-            setColor(color, for: .foreground)
-        case .setUnderlineColor(let color):
-            setColor(color, for: .underline)
-        case .setStrikethroughColor(let color):
-            setColor(color, for: .strikethrough)
-        case .setStrokeColor(let color):
-            setColor(color, for: .stroke)
+        case .setColor(let color, let richTextColor):
+            setColor(color, for: richTextColor)
         case .setHighlightedRange(let range):
             setHighlightedRange(to: range)
         case .setHighlightingStyle(let style):