Introduced EditorViewContext.selectedEditorView to get currently sele…

…cted EditorView (#203)
rajdeep · Jul 21, 2023 · 6816cf4 · 6816cf4
1 parent ba0ae71
commit 6816cf4
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 4 deletions.
diff --git a/Proton/Sources/Swift/Core/RichTextEditorContext.swift b/Proton/Sources/Swift/Core/RichTextEditorContext.swift
@@ -27,8 +27,9 @@ class RichTextEditorContext: RichTextViewContext {
 
     func textViewDidBeginEditing(_ textView: UITextView) {
         guard textView.delegate === self else { return }
+        selectedTextView = textView.asRichTextView
+        activeTextView = textView.asRichTextView
 
-        activeTextView = textView as? RichTextView
         guard let richTextView = activeTextView else { return }
 
         let range = richTextView.selectedRange
@@ -51,6 +52,7 @@ class RichTextEditorContext: RichTextViewContext {
 
         defer {
             activeTextView = nil
+            selectedTextView = nil
         }
         guard let richTextView = activeTextView else { return }
         richTextView.richTextViewDelegate?.richTextView(richTextView, didLoseFocusFrom: textView.selectedRange)
@@ -150,9 +152,10 @@ class RichTextEditorContext: RichTextViewContext {
     }
 
     func textViewDidChange(_ textView: UITextView) {
-        guard textView.delegate === self,
-              let richTextView = activeTextView
-        else { return }
+        guard textView.delegate === self else { return }
+        selectedTextView = textView.asRichTextView
+
+        guard let richTextView = activeTextView else { return }
 
         applyFontFixForEmojiIfRequired(in: richTextView, at: textView.selectedRange)
         invokeDidProcessIfRequired(richTextView)

diff --git a/Proton/Sources/Swift/Core/RichTextView.swift b/Proton/Sources/Swift/Core/RichTextView.swift
@@ -191,6 +191,10 @@ class RichTextView: AutogrowingTextView {
         selectedTextRange = rangeToSet?.toTextRange(textInput: self) ?? oldRange
     }
 
+    var context: RichTextViewContext? {
+        delegate as? RichTextViewContext
+    }
+
     init(frame: CGRect = .zero, context: RichTextViewContext, allowAutogrowing: Bool = false) {
         let textContainer = TextContainer()
         let layoutManager = LayoutManager()
@@ -498,6 +502,7 @@ class RichTextView: AutogrowingTextView {
     }
 
     func didTap(at location: CGPoint) {
+        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
@@ -24,12 +24,19 @@ import UIKit
 class RichTextViewContext: NSObject, UITextViewDelegate {
     weak var activeTextView: RichTextView?
 
+    weak var selectedTextView: RichTextView?
+
     func textView(_ textView: UITextView, shouldInteractWith textAttachment: NSTextAttachment, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
         return interaction != .presentActions
     }
 
     func textViewDidChangeSelection(_ textView: UITextView) {
         guard textView.delegate === self else { return }
+        if textView.selectedTextRange != nil {
+            selectedTextView = textView.asRichTextView
+        } else {
+            selectedTextView = nil
+        }
 
         guard let richTextView = textView as? RichTextView else { return }
         let range = textView.selectedRange
@@ -72,3 +79,9 @@ class RichTextViewContext: NSObject, UITextViewDelegate {
         }
     }
 }
+
+extension UITextView {
+    var asRichTextView: RichTextView? {
+        self as? RichTextView
+    }
+}
diff --git a/Proton/Sources/Swift/Editor/EditorViewContext.swift b/Proton/Sources/Swift/Editor/EditorViewContext.swift
@@ -53,6 +53,14 @@ public class EditorViewContext {
         return richTextViewContext.activeTextView?.editorView
     }
 
+    /// `EditorView` for this context that is currently selected. An editor is selected when in any of the following states even if it is read-only:
+    /// * Gets focus
+    /// * Selected range is changed to non-nil value
+    /// * Is tapped on
+    public var selectedEditorView: EditorView? {
+        richTextViewContext.selectedTextView?.editorView
+    }
+
     /// Initializes a new context
     /// - Parameter name: Friendly name for the context.
     public convenience init(name: String) {

diff --git a/Proton/Tests/Core/RichTextViewContextTests.swift b/Proton/Tests/Core/RichTextViewContextTests.swift
@@ -220,4 +220,68 @@ class RichTextViewContextTests: XCTestCase {
 
         waitForExpectations(timeout: 1.0)
     }
+
+    func testSetsSelectedEditorOnTextRangeChange() {
+        let testExpectation = expectation(description: #function)
+        let mockTextViewDelegate = MockRichTextViewDelegate()
+
+        let context = RichTextEditorContext.default
+        let textView = RichTextView(context: context)
+        textView.richTextViewDelegate = mockTextViewDelegate
+
+        textView.text = "Sample text"
+        textView.selectedRange = .zero
+
+        mockTextViewDelegate.onSelectionChanged = { _, _, _, _ in
+            XCTAssertEqual(context.selectedTextView, textView)
+            testExpectation.fulfill()
+        }
+
+        context.textViewDidChangeSelection(textView)
+
+        waitForExpectations(timeout: 1.0)
+    }
+
+    func testUnsetsSelectedEditorOnTextRangeNil() {
+        let testExpectation = expectation(description: #function)
+        let mockTextViewDelegate = MockRichTextViewDelegate()
+
+        let context = RichTextEditorContext.default
+        let textView = RichTextView(context: context)
+        textView.richTextViewDelegate = mockTextViewDelegate
+
+        textView.text = "Sample text"
+        textView.selectedTextRange = nil
+
+        mockTextViewDelegate.onSelectionChanged = { _, _, _, _ in
+            XCTAssertNil(context.selectedTextView)
+            testExpectation.fulfill()
+        }
+
+        context.textViewDidChangeSelection(textView)
+
+        waitForExpectations(timeout: 1.0)
+    }
+
+    func testSetsSelectedEditorOnTap() {
+        let testExpectation = expectation(description: #function)
+        let mockTextViewDelegate = MockRichTextViewDelegate()
+
+        let context = RichTextEditorContext.default
+        let textView = RichTextView(context: context)
+        textView.richTextViewDelegate = mockTextViewDelegate
+
+        textView.text = "Sample text"
+        textView.selectedTextRange = nil
+
+        mockTextViewDelegate.onDidTapAtLocation = { _, _, _ in
+            XCTAssertEqual(context.selectedTextView, textView)
+            testExpectation.fulfill()
+        }
+
+        textView.didTap(at: .zero)
+
+        waitForExpectations(timeout: 1.0)
+    }
+
 }