Fix an issue with draft not being deleted after sending a reply

Author: kean

WordPress/Classes/ViewRelated/Comments/Controllers/CommentDetailViewController.swift

@@ -982,8 +982,7 @@ private extension CommentDetailViewController {
     }
 
     @objc func buttonAddCommentTapped() {
-        let viewModel = CommentCreateViewModel(replyingTo: comment)
-        viewModel.save = { [weak self] in
+        let viewModel = CommentCreateViewModel(replyingTo: comment) { [weak self] in
             try await self?.createReply(content: $0)
         }
         let composerVC = CommentCreateViewController(viewModel: viewModel)

WordPress/Classes/ViewRelated/Comments/Controllers/Create/CommentCreateViewController.swift

@@ -74,7 +74,7 @@ final class CommentCreateViewController: UIViewController {
         Task { @MainActor in
             do {
                 let text = await editorVC.text
-                try await viewModel.save(text)
+                try await viewModel.save(content: text)
                 UINotificationFeedbackGenerator().notificationOccurred(.success)
                 presentingViewController?.dismiss(animated: true)
             } catch {

WordPress/Classes/ViewRelated/Comments/Controllers/Create/CommentCreateViewModel.swift

@@ -13,37 +13,37 @@ final class CommentCreateViewModel {
     /// Comment you are replying it.
     private(set) var replyToComment: Comment?
 
-    /// - note: It's a temporary solution until the respective save logic
-    /// can be moved from the view controllers.
-    var save: (String) async throws -> Void = { _ in
-        wpAssertionFailure("must be specified")
-    }
-
     let suggestionsViewModel: SuggestionsListViewModel?
 
     private let siteID: NSNumber
     private let context = ContextManager.shared.mainContext
 
+    /// - note: It's a temporary solution until the respective save logic
+    /// can be moved from the view controllers.
+    private let _save: (String) async throws -> Void
+
     var isGutenbergEnabled: Bool {
         FeatureFlag.readerGutenbergCommentComposer.enabled
     }
 
     /// Create a new top-level comment to the given post.
-    init(post: ReaderPost) {
+    init(post: ReaderPost, save: @escaping (String) async throws -> Void) {
         self.siteID = post.siteID ?? 0
         wpAssert(siteID != 0, "missing required parameter siteID")
+        self._save = save
 
         self.suggestionsViewModel = SuggestionsListViewModel.make(siteID: post.siteID)
         self.suggestionsViewModel?.enableProminentSuggestions(postAuthorID: post.authorID)
     }
 
     /// Create a reply to the given comment.
-    init(replyingTo comment: Comment) {
+    init(replyingTo comment: Comment, save: @escaping (String) async throws -> Void) {
         let siteID = comment.associatedSiteID ?? 0
         wpAssert(siteID != 0, "missing required parameter siteID")
 
         self.siteID = siteID
         self.replyToComment = comment
+        self._save = save
 
         self.suggestionsViewModel = SuggestionsListViewModel.make(siteID: siteID)
         self.suggestionsViewModel?.enableProminentSuggestions(
@@ -56,6 +56,12 @@ final class CommentCreateViewModel {
         Strings.leaveComment
     }
 
+    @MainActor
+    func save(content: String) async throws {
+        try await _save(content)
+        deleteDraft()
+    }
+
     // MARK: Drafts
 
     func restoreDraft() -> String? {

WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.swift

@@ -52,16 +52,14 @@ extension NSNotification.Name {
     }
 
     func buttonAddCommentTapped() {
-        let viewModel = CommentCreateViewModel(post: post)
-        viewModel.save = { [weak self] in
+        let viewModel = CommentCreateViewModel(post: post) { [weak self] in
             try await self?.sendComment($0)
         }
         showCommentComposer(viewModel: viewModel)
     }
 
     func didTapReply(comment: Comment) {
-        let viewModel = CommentCreateViewModel(replyingTo: comment)
-        viewModel.save = { [weak self] in
+        let viewModel = CommentCreateViewModel(replyingTo: comment) { [weak self] in
             try await self?.sendComment($0, comment: comment)
         }
         showCommentComposer(viewModel: viewModel)