Make text view only set image configuration if it's not manually set …

…before
danielsaidi · Oct 8, 2024 · 7922c5d · 7922c5d
1 parent 4d3cb51
commit 7922c5d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -27,7 +27,11 @@ Reach out if you think that this version changes too much for a minor bump, or i
 
 * Many protocols now use `@preconcurrency @MainActor`.
 * All mutable `Image` and `Color` extensions are now computed.
-* All standard style and configuration values are now computed. 
+* All standard style and configuration values are now computed.
+
+### 🐛 Bug Fixes
+
+* `RichTextView` only sets image configuration if it's not manually set before.  
 
 
 

diff --git a/Sources/RichTextKit/RichTextView+Setup.swift b/Sources/RichTextKit/RichTextView+Setup.swift
@@ -16,7 +16,9 @@ extension RichTextView {
         _ format: RichTextDataFormat
     ) {
         attributedString = .empty
-        imageConfiguration = standardImageConfiguration(for: format)
+        if !imageConfigurationWasSet {
+            imageConfiguration = standardImageConfiguration(for: format)
+        }
         attributedString = text
         setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
     }

diff --git a/Sources/RichTextKit/RichTextView_AppKit.swift b/Sources/RichTextKit/RichTextView_AppKit.swift
@@ -39,7 +39,12 @@ open class RichTextView: NSTextView, RichTextViewComponent {
     public var highlightingStyle: RichTextHighlightingStyle = .standard
 
     /// The image configuration to use by the rich text view.
-    public var imageConfiguration: RichTextImageConfiguration = .disabled
+    public var imageConfiguration: RichTextImageConfiguration = .disabled {
+        didSet { imageConfigurationWasSet = true }
+    }
+
+    /// The image configuration to use by the rich text view.
+    var imageConfigurationWasSet = false
 
     // MARK: - Overrides
 

diff --git a/Sources/RichTextKit/RichTextView_UIKit.swift b/Sources/RichTextKit/RichTextView_UIKit.swift
@@ -98,10 +98,14 @@ open class RichTextView: UITextView, RichTextViewComponent {
         didSet {
             #if iOS || os(visionOS)
             refreshDropInteraction()
+            imageConfigurationWasSet = true
             #endif
         }
     }
 
+    /// The image configuration to use by the rich text view.
+    var imageConfigurationWasSet = false
+
     #if iOS || os(visionOS)
 
     /// The image drop interaction to use.