Polish a bit

Author: DominikBucher12

Demo/Shared/Assets/Assets.xcassets/defaultTextColor.colorset/Contents.json

@@ -0,0 +1,56 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x00",
+          "green" : "0x00",
+          "red" : "0x00"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x52",
+          "green" : "0x24",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x23",
+          "green" : "0xFF",
+          "red" : "0x15"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/RichTextKit/Actions/RichTextAction+Button.swift

@@ -17,13 +17,6 @@ public extension RichTextAction {
      use and configure it as a normal button.
      */
     struct Button: View {
-        
-        #if macOS
-        private let systemSpecificTextColor: Color? = Color(NSColor.textColor)
-        #else
-        private let systemSpecificTextColor: Color? = nil
-        #endif
-        
         /**
          Create a rich text action button.
 
@@ -54,7 +47,7 @@ public extension RichTextAction {
                     .labelStyle(.iconOnly)
                     .frame(maxHeight: fillVertically ? .infinity : nil)
                     .contentShape(Rectangle())
-                    .foregroundColor(systemSpecificTextColor)
+                    .foregroundColor(.systemSpecificTextColor)
             }
             .keyboardShortcut(for: action)
             .disabled(!context.canHandle(action))

Sources/RichTextKit/Alignment/RichTextAlignment+Picker.swift

@@ -20,7 +20,7 @@ public extension RichTextAlignment {
         @Environment(\.colorScheme) var colorScheme
         /**
          Create a rich text alignment picker.
-
+         
          - Parameters:
            - selection: The binding to update with the picker.
            - values: The pickable alignments, by default `.allCases`.
@@ -34,17 +34,16 @@ public extension RichTextAlignment {
         }
 
         let values: [RichTextAlignment]
-
+        
         @Binding
         private var selection: RichTextAlignment
-
+        
         public var body: some View {
             SwiftUI.Picker("", selection: $selection) {
                 ForEach(RichTextAlignment.allCases) { value in
                     value.label
                         .labelStyle(.iconOnly)
                 }
-                
             }
             .labelsHidden()
             .accessibilityLabel(RTKL10n.textAlignment.text)

Sources/RichTextKit/Colors/Color+SystemSpecificTextColor.swift

@@ -0,0 +1,17 @@
+//
+//  Color+SystemSpecificTextColor.swift
+//
+//
+//  Created by Dominik Bucher on 22.01.2024.
+//
+
+import SwiftUI
+
+extension Color {
+#if macOS
+    // on macOS
+    static let systemSpecificTextColor: Color? = Color(NSColor.textColor)
+#else
+    static let systemSpecificTextColor: Color? = nil
+#endif
+}

Sources/RichTextKit/Component/RichTextViewComponent+Attributes.swift

@@ -19,7 +19,7 @@ public extension RichTextViewComponent {
         #if macOS
         let range = NSRange(location: selectedRange.location - 1, length: 1)
         let safeRange = safeRange(for: range)
-        return richTextAttributes(at: safeRange )
+        return richTextAttributes(at: safeRange)
         #else
         return typingAttributes
         #endif

Sources/RichTextKit/Coordinator/RichTextCoordinator+Subscriptions.swift

@@ -360,7 +360,7 @@ internal extension RichTextCoordinator {
     }
 }
 
-private extension ColorRepresentable {
+extension ColorRepresentable {
 
     #if iOS || os(tvOS) || os(visionOS)
     static var textColor: ColorRepresentable { .label }

Sources/RichTextKit/Styles/RichTextStyleButton.swift

@@ -78,7 +78,6 @@ public struct RichTextStyleButton: View {
                 .foregroundColor(tintColor)
                 .contentShape(Rectangle())
         }
-        .tint(tintColor)
         .keyboardShortcut(for: style)
         .accessibilityLabel(style.title)
     }
@@ -90,12 +89,6 @@ public extension RichTextStyleButton {
      This style can be used to style a ``RichTextStyleButton``.
      */
     struct Style {
-
-        #if macOS
-        private let systemSpecificTextColor: Color? = Color(NSColor.textColor)
-        #else
-        private let systemSpecificTextColor: Color? = nil
-        #endif
         /**
          Create a rich text style button style.
 
@@ -107,7 +100,7 @@ public extension RichTextStyleButton {
             inactiveColor: Color? = nil,
             activeColor: Color = .blue
         ) {
-            self.inactiveColor = inactiveColor ?? systemSpecificTextColor
+            self.inactiveColor = inactiveColor ?? Color.systemSpecificTextColor
             self.activeColor = activeColor
         }
 

Sources/RichTextKit/_Deprecated/RichTextAlignment+Deprecated.swift

@@ -2,12 +2,3 @@ import SwiftUI
 
 @available(*, deprecated, renamed: "RichTextAlignment.Picker")
 public typealias RichTextAlignmentPicker = RichTextAlignment.Picker
-
-public extension RichTextAlignment.Picker.Style {
-    
-    @available(*, deprecated, renamed: "init(lightIconColor:darkIconColor:)")
-    init(iconColor: Color = .primary) {
-        self.lightIconColor = iconColor
-        self.darkIconColor = iconColor
-    }
-}