Fixed logic to not nil out selectedEditorView

rajdeep · Aug 22, 2024 · 62bd43f · 62bd43f
1 parent dc80a7c
commit 62bd43f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/Proton/Sources/Swift/Core/RichTextView.swift b/Proton/Sources/Swift/Core/RichTextView.swift
@@ -695,7 +695,9 @@ class RichTextView: AutogrowingTextView {
     }
 
     func didTap(at location: CGPoint) {
-        context?.selectedTextView = self
+        if isEditable == false {
+            context?.selectedTextView = self
+        }
         let characterRange = rangeOfCharacter(at: location)
         richTextViewDelegate?.richTextView(self, didTapAtLocation: location, characterRange: characterRange)
     }

diff --git a/Proton/Sources/Swift/Core/RichTextViewContext.swift b/Proton/Sources/Swift/Core/RichTextViewContext.swift
@@ -32,15 +32,10 @@ class RichTextViewContext: NSObject, UITextViewDelegate {
 
     func textViewDidChangeSelection(_ textView: UITextView) {
         guard textView.delegate === self else { return }
-        if textView.selectedTextRange != nil {
-            if (textView.isEditable && textView.isFirstResponder) ||
-                textView.isEditable == false {
+        if (textView.isEditable && textView.isFirstResponder) || textView.isEditable == false {
+            if textView.selectedTextRange != nil {
                 selectedTextView = textView.asRichTextView
-            } else {
-                selectedTextView = nil
             }
-        } else {
-            selectedTextView = nil
         }
 
         guard let richTextView = textView as? RichTextView else { return }

diff --git a/Proton/Tests/Core/RichTextViewContextTests.swift b/Proton/Tests/Core/RichTextViewContextTests.swift
@@ -383,14 +383,14 @@ class RichTextViewContextTests: XCTestCase {
         waitForExpectations(timeout: 1.0)
     }
 
-    func testSetsSelectedEditorOnTap() {
+    func testSetsSelectedReadOnlyEditorOnTap() {
         let testExpectation = expectation(description: #function)
         let mockTextViewDelegate = MockRichTextViewDelegate()
 
         let context = RichTextEditorContext.default
         let textView = RichTextView(context: context)
         textView.richTextViewDelegate = mockTextViewDelegate
-
+        textView.isEditable = false
         textView.text = "Sample text"
         textView.selectedTextRange = nil