Merge release/26.5.2 into trunk (#25071)

* Bump version number

* Fix CMM-1065: Find existing tag before creating a new one (#25061)

* Fix CMM-1065: Find existing tag before creating a new one

The issue was introduced in
#24955.

* Replace original input with the actual tag

* Invert a boolean check of most recently used tags first (#25065)

The issue was introduced in #24955. I missed a `!` in the refactor.

* Fix an issue where the app fails to remove tags from posts (#25067)

This is a regression introduced in #24964. We should not check if values
are an empty list in the "update" parameter types.

* Move finding existing tag code (#25068)

Moving the code to the view model, so that it can cover tags and custom
taxonomy terms, which are two seperate `TagsServiceProtocol`
implementations.

* Clear the tag input field after tapping the Enter key (#25069)

We already have code that clears the text field in the `addTag`
function. However, during testing, I noticed it does not always work.
The new change here makes sure the `UITextField` is cleared, because we
are calling the UIKit directly, instead of relying on SwiftUI to pass
the `text` changes to UIKit.

* Manually bump version number

---------

Co-authored-by: Tony Li <[email protected]>

Author: wpmobilebot

Modules/Sources/WordPressKit/RemotePostParameters.swift

@@ -350,10 +350,10 @@ struct RemotePostUpdateParametersWordPressComEncoder: Encodable {
 
         // Terms (including tags)
         var terms = [String: [String]]()
-        if let tags = parameters.tags, !tags.isEmpty {
+        if let tags = parameters.tags {
             terms[RemotePostWordPressComCodingKeys.postTags] = tags
         }
-        if let otherTerms = parameters.otherTerms, !otherTerms.isEmpty {
+        if let otherTerms = parameters.otherTerms {
             terms.merge(otherTerms) { old, _ in old }
         }
         if !terms.isEmpty {
@@ -476,10 +476,10 @@ struct RemotePostUpdateParametersXMLRPCEncoder: Encodable {
 
         // Terms (including tags)
         var terms = [String: [String]]()
-        if let tags = parameters.tags, !tags.isEmpty {
+        if let tags = parameters.tags {
             terms[RemotePostXMLRPCCodingKeys.taxonomyTag] = tags
         }
-        if let otherTerms = parameters.otherTerms, !otherTerms.isEmpty {
+        if let otherTerms = parameters.otherTerms {
             terms.merge(otherTerms) { old, _ in old }
         }
         if !terms.isEmpty {

WordPress/Classes/ViewRelated/Post/PostSettings/Views/PostTagsView.swift

@@ -328,6 +328,8 @@ private struct AddTagsTextField: UIViewRepresentable {
 
         func textFieldShouldReturn(_ textField: UITextField) -> Bool {
             view.onSubmit()
+            self.view.text = ""
+            textField.text = ""
             return false
         }
     }

WordPress/Classes/ViewRelated/Tags/TagsViewModel.swift

@@ -90,7 +90,7 @@ class TagsViewModel: ObservableObject {
                 let page = pageIndex ?? 0
                 let remoteTags = try await self.tagsService.getTags(
                     page: page,
-                    recentlyUsed: self.isBrowseMode
+                    recentlyUsed: !self.isBrowseMode
                 )
 
                 let hasMore = remoteTags.count == 100
@@ -159,7 +159,21 @@ class TagsViewModel: ObservableObject {
         // Create a new tag in the background, which is consistent with the web editor.
         Task {
             do {
-                _ = try await tagsService.createTag(name: name, description: "")
+                let newTag: AnyTermWithViewContext
+                if let existing = try await tagsService.searchTags(with: name)
+                    .first(where: { $0.name.compare(name, options: .caseInsensitive) == .orderedSame }) {
+                    newTag = existing
+                } else {
+                    newTag = try await tagsService.createTag(name: name, description: "")
+                }
+
+                // The original input `name` was used as a temporary tag before sending the API request.
+                // Replace it with the actual tag returned by the API.
+                if newTag.name != name, let index = selectedTags.firstIndex(of: name) {
+                    selectedTagsSet.remove(lowercasedName)
+                    selectedTagsSet.insert(newTag.name.lowercased())
+                    selectedTags[index] = newTag.name
+                }
             } catch {
                 removeSelectedTag(name)
             }

config/Version.public.xcconfig

@@ -1,2 +1,2 @@
-VERSION_LONG = 26.5.1.0
-VERSION_SHORT = 26.5.1
+VERSION_LONG = 26.5.2.1
+VERSION_SHORT = 26.5.2