Merge pull request #128 from danielsaidi/bugfix/style_colors

Minor UI tweaks
danielsaidi · Jan 23, 2024 · 69580bb · 69580bb
2 parents 3dbad7a + 42f7796
commit 69580bb
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 8 deletions.
diff --git a/Demo/iOS/EditorScreen.swift b/Demo/iOS/EditorScreen.swift
@@ -59,7 +59,7 @@ private extension EditorScreen {
             trailingButtons: {}
         ) {
             var sheet = $0
-            // sheet.colorPickers = .all
+            sheet.colorPickers = .all
             return sheet
         }
     }

diff --git a/Sources/RichTextKit/Actions/RichTextAction+Button.swift b/Sources/RichTextKit/Actions/RichTextAction+Button.swift
@@ -17,7 +17,6 @@ public extension RichTextAction {
      use and configure it as a normal button.
      */
     struct Button: View {
-
         /**
          Create a rich text action button.
          

diff --git a/Sources/RichTextKit/Alignment/RichTextAlignment+Picker.swift b/Sources/RichTextKit/Alignment/RichTextAlignment+Picker.swift
@@ -17,7 +17,6 @@ public extension RichTextAlignment {
      be styled and configured with plain SwiftUI.
      */
     struct Picker: View {
-
         /**
          Create a rich text alignment picker.
 

diff --git a/Sources/RichTextKit/Colors/Color+SystemSpecificTextColor.swift b/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
+}
diff --git a/Sources/RichTextKit/Colors/RichTextColor.swift b/Sources/RichTextKit/Colors/RichTextColor.swift
@@ -86,7 +86,12 @@ public extension RichTextColor {
     }
 }
 
-public extension Collection where Element == RichTextColor {
+public extension Collection where Element == RichTextColor {    
+    static var all: [RichTextColor] { Element.allCases - .undefined }
+}
 
-    static var all: [RichTextColor] { Element.allCases }
+extension Array where Element == RichTextColor {
+    static func - (lhs: [RichTextColor], rhs: RichTextColor) -> [RichTextColor] {
+        return lhs.filter { $0 != rhs }
+    }
 }
diff --git a/Sources/RichTextKit/Coordinator/RichTextCoordinator+Subscriptions.swift b/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 }

diff --git a/Sources/RichTextKit/Styles/RichTextStyle+Button.swift b/Sources/RichTextKit/Styles/RichTextStyle+Button.swift
@@ -86,7 +86,7 @@ extension View {
         if cond {
             self.foregroundStyle(Color.accentColor)
         } else {
-            self
+            self.foregroundStyle(color)
         }
     }
 }

diff --git a/Sources/RichTextKit/Styles/RichTextStyle+Toggle.swift b/Sources/RichTextKit/Styles/RichTextStyle+Toggle.swift
@@ -77,6 +77,7 @@ public extension RichTextStyle {
                 style.icon
                     .frame(maxHeight: fillVertically ? .infinity : nil)
             }
+            .foreground(Color(ColorRepresentable.textColor), if: isOn)
             .keyboardShortcut(for: style)
             .accessibilityLabel(style.title)
         }

diff --git a/Sources/RichTextKit/_Deprecated/RichTextViewComponent+Deprecated.swift b/Sources/RichTextKit/_Deprecated/RichTextViewComponent+Deprecated.swift
@@ -135,7 +135,6 @@ public extension RichTextViewComponent {
         setRichTextAttributes(attributes)
     }
 
-
     @available(*, deprecated, message: "richTextAlignment")
     var currentTextAlignment: RichTextAlignment? {
         richTextAlignment