Fixed issue with double tapping on textblock that may cause selected …

Proton/Sources/Swift/Core/RichTextView.swift

@@ -247,6 +247,11 @@ class RichTextView: AutogrowingTextView {
               textBlockRange.contains(location)
         else { return nil }
 
+        // return textblock range if new range is entirely contained within textblock range
+        if textBlockRange.intersection(new) == new {
+            return textBlockRange
+        }
+
         if isReverseTraversal {
             return adjustedTextBlockRangeReverse(new: new, old: old, textBlockRange: textBlockRange)
         } else {

Proton/Tests/Core/TextBlockAttributeTests.swift

@@ -39,6 +39,17 @@ class TextBlockAttributeTests: XCTestCase {
         XCTAssertEqual(textView.selectedRange, NSRange(location: 8, length: 0))
     }
 
+    func testDoubleTapOnTextBlock() {
+        let textView = RichTextView(context: RichTextViewContext())
+        let text = NSMutableAttributedString(string: "01234", attributes: [.textBlock: true])
+        textView.attributedText = text
+
+        textView.selectedRange = text.fullRange
+        let range = NSRange(location: 0, length: 1).toTextRange(textInput: textView)
+        textView.selectedTextRange = range
+        XCTAssertEqual(textView.selectedRange, text.fullRange)
+    }
+
     func testSetsFocusBeforeForNonFocusableText() {
         let textView = RichTextView(context: RichTextViewContext())
         let text = NSMutableAttributedString(string: "0123")
@@ -147,7 +158,7 @@ class TextBlockAttributeTests: XCTestCase {
         XCTAssertEqual(range, NSRange(location: 12, length: 7))
     }
 
-    func testUnselectsSelectedTextBlockForward() {
+    func testRetainsSelectedTextBlockForward() {
         let textView = RichTextView(context: RichTextViewContext())
         let text = NSMutableAttributedString(string: "This is test string")
         textView.attributedText = text
@@ -157,10 +168,10 @@ class TextBlockAttributeTests: XCTestCase {
         textView.selectedTextRange = NSRange(location: 9, length: 3).toTextRange(textInput: textView) // "est"
         let range = textView.selectedRange
 
-        XCTAssertEqual(range, NSRange(location: 12, length: 0))
+        XCTAssertEqual(range, NSRange(location: 8, length: 4))
     }
 
-    func testUnselectsSelectedTextBlockReverse() {
+    func testRetainsSelectedTextBlockReverse() {
         let textView = RichTextView(context: RichTextViewContext())
         let text = NSMutableAttributedString(string: "This is test string")
         textView.attributedText = text
@@ -170,7 +181,7 @@ class TextBlockAttributeTests: XCTestCase {
         textView.selectedTextRange = NSRange(location: 8, length: 3).toTextRange(textInput: textView) // "tes"
         let range = textView.selectedRange
 
-        XCTAssertEqual(range, NSRange(location: 8, length: 0))
+        XCTAssertEqual(range, NSRange(location: 8, length: 4))
     }
 
     func testUnselectsTextSelectedWithTextBlockReverse() {

Proton/Tests/ExtensionTests/NSAttributedStringExtensionTests.swift

@@ -30,6 +30,12 @@ class NSAttributedStringExtensionTests: XCTestCase {
         XCTAssertEqual(range, NSRange(location: 0, length: text.length))
     }
 
+    func testGetsSubstring() {
+        let text = NSAttributedString(string: "This is a test string")
+        let substring = text.substring(from: NSRange(location: 5, length: 2))
+        XCTAssertEqual(substring, "is")
+    }
+
     func testGetRangeForAttachment() {
         let string = "This is a test string"
         let text = NSMutableAttributedString(string: string)