Remove MarkdownStyle.Color (onevcat#93)

nicoster · Feb 26, 2022 · 3c6b679 · 3c6b679
1 parent 81c6651
commit 3c6b679
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 216 deletions.
diff --git a/Sources/MarkdownUI/Rendering/AttributedStringRenderer.swift b/Sources/MarkdownUI/Rendering/AttributedStringRenderer.swift
@@ -4,7 +4,7 @@ import SwiftUI
 struct AttributedStringRenderer {
   struct State {
     var font: MarkdownStyle.Font
-    var foregroundColor: MarkdownStyle.Color
+    var foregroundColor: SwiftUI.Color
     var paragraphSpacing: CGFloat
     var headIndent: CGFloat = 0
     var tailIndent: CGFloat = 0
@@ -343,7 +343,7 @@ extension AttributedStringRenderer {
         attributes: [
           .font: state.font.resolve(),
           .strikethroughStyle: NSUnderlineStyle.single.rawValue,
-          .strikethroughColor: MarkdownStyle.Color.separator.platformColor!,
+          .strikethroughColor: PlatformColor.separator,
         ]
       )
     )
@@ -425,7 +425,7 @@ extension AttributedStringRenderer {
       string: text,
       attributes: [
         .font: state.font.resolve(),
-        .foregroundColor: state.foregroundColor.platformColor!,
+        .foregroundColor: PlatformColor(state.foregroundColor),
       ]
     )
   }
@@ -549,3 +549,15 @@ extension NSTextAlignment {
     }
   }
 }
+
+// MARK: - PlatformColor
+
+#if os(macOS)
+  private typealias PlatformColor = NSColor
+
+  extension NSColor {
+    fileprivate static var separator: NSColor { .separatorColor }
+  }
+#elseif os(iOS) || os(tvOS)
+  private typealias PlatformColor = UIColor
+#endif
diff --git a/Sources/MarkdownUI/Style/Color.swift b/Sources/MarkdownUI/Style/Color.swift
diff --git a/Sources/MarkdownUI/Style/MarkdownStyle.swift b/Sources/MarkdownUI/Style/MarkdownStyle.swift
@@ -6,7 +6,7 @@ public struct MarkdownStyle: Hashable {
   public var font: MarkdownStyle.Font
 
   /// The text color.
-  public var foregroundColor: MarkdownStyle.Color
+  public var foregroundColor: SwiftUI.Color
 
   /// The measurements of the Markdown elements.
   public var measurements: Measurements
@@ -18,7 +18,7 @@ public struct MarkdownStyle: Hashable {
   ///   - measurements: The measurements of the Markdown elements.
   public init(
     font: MarkdownStyle.Font = .body,
-    foregroundColor: MarkdownStyle.Color = .primary,
+    foregroundColor: SwiftUI.Color = .primary,
     measurements: MarkdownStyle.Measurements = .init()
   ) {
     self.font = font

diff --git a/Tests/MarkdownUITests/ColorTests.swift b/Tests/MarkdownUITests/ColorTests.swift