🐛 Ensure an error color overrides rich text coloring

appcues · Mar 28, 2023 · 2b9f49e · 2b9f49e
1 parent 3969783
commit 2b9f49e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Sources/AppcuesKit/Presentation/UI/Components/AppcuesText.swift b/Sources/AppcuesKit/Presentation/UI/Components/AppcuesText.swift
@@ -27,7 +27,7 @@ internal struct AppcuesText: View {
 
 @available(iOS 13.0, *)
 extension Text {
-    init(textModel: ExperienceComponent.TextModel) {
+    init(textModel: ExperienceComponent.TextModel, skipColor: Bool = false) {
         self.init("")
 
         // Note: a ViewBuilder approach here doesn't work because the requirement that we operate strictly on `Text`
@@ -41,7 +41,7 @@ extension Text {
                 text = text.font(font)
             }
 
-            if let foregroundColor = Color(dynamicColor: span.style?.foregroundColor) {
+            if !skipColor, let foregroundColor = Color(dynamicColor: span.style?.foregroundColor) {
                 text = text.foregroundColor(foregroundColor)
             }
 

diff --git a/Sources/AppcuesKit/Presentation/UI/Components/TintedTextView.swift b/Sources/AppcuesKit/Presentation/UI/Components/TintedTextView.swift
@@ -18,7 +18,7 @@ internal struct TintedTextView: View {
     var body: some View {
         let style = AppcuesStyle(from: model.style)
 
-        Text(textModel: model)
+        Text(textModel: model, skipColor: tintColor != nil)
             .applyTextStyle(style, model: model)
             .setupActions(on: viewModel, for: model)
             .ifLet(tintColor) { view, val in