Fix an issue with CommentComposer using the outdated text

Author: kean

WordPress/Classes/ViewRelated/Comments/Controllers/Composer/CommentComposerViewController.swift

@@ -111,6 +111,7 @@ final class CommentComposerViewController: UIViewController {
     private func sendComment() async {
         do {
             setLoading(true)
+            await editor?.refresh()
             try await viewModel.save(text)
             UINotificationFeedbackGenerator().notificationOccurred(.success)
             presentingViewController?.dismiss(animated: true)
@@ -128,10 +129,15 @@ final class CommentComposerViewController: UIViewController {
     }
 
     @objc private func buttonCancelTapped() {
-        if text.isEmpty {
-            presentingViewController?.dismiss(animated: true)
-        } else {
-            showCloseDraftConfirmationAlert(content: text)
+        navigationItem.leftBarButtonItem?.isEnabled = false
+        Task { @MainActor in
+            await editor?.refresh()
+            navigationItem.leftBarButtonItem?.isEnabled = true
+            if text.isEmpty {
+                presentingViewController?.dismiss(animated: true)
+            } else {
+                showCloseDraftConfirmationAlert(content: text)
+            }
         }
     }
 

WordPress/Classes/ViewRelated/Comments/Controllers/Composer/CommentGutenbergEditorViewController.swift

@@ -10,16 +10,7 @@ final class CommentGutenbergEditorViewController: UIViewController, CommentEdito
 
     var initialContent: String?
 
-    var text: String {
-        set {
-            wpAssertionFailure("not supported")
-        }
-        get {
-            currentText
-        }
-    }
-
-    private var currentText = ""
+    private(set) var text = ""
 
     var isEnabled: Bool = true {
         didSet {
@@ -56,22 +47,24 @@ final class CommentGutenbergEditorViewController: UIViewController, CommentEdito
 
         editorDidUpdate
             .throttle(for: 1.0, scheduler: DispatchQueue.main, latest: true)
-            .sink { [weak self] in self?.refreshText() }
+            .sink { [weak self] in
+                Task {
+                    await self?.refresh()
+                }
+            }
             .store(in: &cancellables)
     }
 
-    private func refreshText() {
-        guard let editorVC else { return }
-        Task { @MainActor in
-            do {
-                let text = try await editorVC.getContent()
-                if text != self.currentText {
-                    self.currentText = text
-                    self.delegate?.commentEditor(self, didUpateText: text)
-                }
-            } catch {
-                // TODO: handle errors
+    func refresh() async {
+        do {
+            guard let editorVC else { return }
+            let text = try await editorVC.getContent()
+            if text != self.text {
+                self.text = text
+                self.delegate?.commentEditor(self, didUpateText: text)
             }
+        } catch {
+            wpAssertionFailure("failed to refresh content", userInfo: ["error": "\(error)"])
         }
     }
 }

WordPress/Classes/ViewRelated/Comments/Controllers/Composer/CommentPlainTextEditorViewController.swift

@@ -1,9 +1,20 @@
 import UIKit
 import WordPressUI
 
+@MainActor
 protocol CommentEditor {
-    var text: String { get set }
+    /// - warning: The latest cached text can be a bit behind. Use `refresh()`
+    /// to ensure the editor has the latest content.
+    var text: String { get }
     var isEnabled: Bool { get set }
+
+    func refresh() async
+}
+
+extension CommentEditor {
+    func refresh() async {
+        // Do nothing
+    }
 }
 
 protocol CommentEditorDelegate: AnyObject {