Fixed an issue where it was possible to set focus in middle of textbl…

…ock by setting textblock range
rajdeep · Jun 27, 2024 · a6ca98a · a6ca98a
1 parent 293aec2
commit a6ca98a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/Proton/Sources/Swift/Core/RichTextView.swift b/Proton/Sources/Swift/Core/RichTextView.swift
@@ -179,6 +179,15 @@ class RichTextView: AutogrowingTextView {
         }
     }
 
+    override var selectedRange: NSRange {
+        didSet{
+            if let range = adjustedTextBlockRangeOnSelectionChange(oldRange: oldValue, newRange: selectedRange) {
+                selectedRange = range
+            }
+            richTextViewDelegate?.richTextView(self, selectedRangeChangedFrom: oldValue, to: selectedRange)
+        }
+    }
+
     override var contentInset: UIEdgeInsets {
         didSet {
             updatePlaceholderVisibility()

diff --git a/Proton/Tests/Core/TextBlockAttributeTests.swift b/Proton/Tests/Core/TextBlockAttributeTests.swift
@@ -39,6 +39,19 @@ class TextBlockAttributeTests: XCTestCase {
         XCTAssertEqual(textView.selectedRange, NSRange(location: 8, length: 0))
     }
 
+    func testSetsFocusAfterForNonFocusableTextWithSelectedRange() {
+        let textView = RichTextView(context: RichTextViewContext())
+        let text = NSMutableAttributedString(string: "0123")
+        text.append(NSAttributedString(string: "4567", attributes: [.textBlock: true]))
+        text.append(NSAttributedString(string: "890"))
+        textView.attributedText = text
+
+        textView.selectedRange = .zero
+        let range = NSRange(location: 5, length: 0)
+        textView.selectedRange = range
+        XCTAssertEqual(textView.selectedRange, NSRange(location: 8, length: 0))
+    }
+
     func testDoubleTapOnTextBlock() {
         let textView = RichTextView(context: RichTextViewContext())
         let text = NSMutableAttributedString(string: "01234", attributes: [.textBlock: true])