Clamped range for invalidating layout of RichTextView

rajdeep · Mar 13, 2024 · 788ebca · 788ebca
1 parent 2c4fccd
commit 788ebca
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Proton/Sources/Swift/Core/RichTextView.swift b/Proton/Sources/Swift/Core/RichTextView.swift
@@ -490,10 +490,11 @@ class RichTextView: AutogrowingTextView {
     }
 
     func invalidateLayout(for range: NSRange) {
-        layoutManager.invalidateLayout(forCharacterRange: range, actualCharacterRange: nil)
+        layoutManager.invalidateLayout(forCharacterRange: range.clamped(upperBound: textStorage.length), actualCharacterRange: nil)
     }
 
     func invalidateDisplay(for range: NSRange) {
+        // invalidateDisplay does not need clamping like required by invalidateLayout
         layoutManager.invalidateDisplay(forCharacterRange: range)
     }
 

diff --git a/Proton/Tests/Core/RichTextViewTests.swift b/Proton/Tests/Core/RichTextViewTests.swift
@@ -147,6 +147,20 @@ class RichTextViewTests: XCTestCase {
         XCTAssertEqual(textView.attributedText.string, "")
     }
 
+    func testUsesValidRangeForInvalidatingLayout() {
+        let text = NSAttributedString(string: "test")
+        let textView = RichTextView(context: RichTextViewContext())
+        textView.attributedText = text
+        textView.invalidateLayout(for: NSRange(location: 20, length: 4))
+    }
+
+    func testUsesValidRangeForInvalidatingDisplay() {
+        let text = NSAttributedString(string: "test")
+        let textView = RichTextView(context: RichTextViewContext())
+        textView.attributedText = text
+        textView.invalidateDisplay(for: NSRange(location: 20, length: 4))
+    }
+
     private func assertKeyCommand(input: String, modifierFlags: UIKeyModifierFlags, assertions: @escaping ((EditorKey, UIKeyModifierFlags) -> Void), file: StaticString = #file, line: UInt = #line) {
         let funcExpectation = functionExpectation()
         let textView = RichTextView(context: RichTextViewContext())