Feature: Post Settings

CLAUDE.md

@@ -42,6 +42,7 @@ WordPress-iOS uses a modular architecture with the main app and separate Swift p
 - Follow Swift API Design Guidelines
 - Use strict access control modifiers where possible
 - Use four spaces (not tabs)
+- Lines should not have trailing whitespace 
 - Follow the standard formatting practices enforced by SwiftLint
 - Don't create `body` for `View` that are too long
 - Use semantics text sizes like `.headline`

Modules/Sources/UITestsFoundation/Screens/Editor/EditorPostSettings.swift

@@ -4,39 +4,39 @@ import XCTest
 public class EditorPostSettings: ScreenObject {
 
     private let settingsTableGetter: (XCUIApplication) -> XCUIElement = {
-        $0.tables["SettingsTable"]
+        $0.collectionViews["post_settings_form"].firstMatch
     }
 
     private let categoriesSectionGetter: (XCUIApplication) -> XCUIElement = {
-        $0.cells["Categories"]
+        $0.buttons["post_settings_categories"].firstMatch
     }
 
     private let tagsSectionGetter: (XCUIApplication) -> XCUIElement = {
-        $0.cells["Tags"]
+        $0.buttons["post_settings_tags"].firstMatch
     }
 
     private let publishDateButtonGetter: (XCUIApplication) -> XCUIElement = {
-        $0.staticTexts["Publish Date"]
+        $0.staticTexts["Publish Date"].firstMatch
     }
 
     private let dateSelectorGetter: (XCUIApplication) -> XCUIElement = {
-        $0.staticTexts["Immediately"]
+        $0.staticTexts["Immediately"].firstMatch
     }
 
     private let nextMonthButtonGetter: (XCUIApplication) -> XCUIElement = {
-        $0.buttons["Next Month"]
+        $0.buttons["Next Month"].firstMatch
     }
 
     private let monthLabelGetter: (XCUIApplication) -> XCUIElement = {
-        $0.buttons["Month"]
+        $0.buttons["Month"].firstMatch
     }
 
     private let firstCalendarDayButtonGetter: (XCUIApplication) -> XCUIElement = {
         $0.buttons.containing(.staticText, identifier: "1").element
     }
 
-    private let closeButtonGetter: (XCUIApplication) -> XCUIElement = {
-        $0.navigationBars.buttons["close"]
+    private let saveButtonGetter: (XCUIApplication) -> XCUIElement = {
+        $0.navigationBars.buttons["post_settings_save_button"].firstMatch
     }
 
     private let backButtonGetter: (XCUIApplication) -> XCUIElement? = {
@@ -45,10 +45,9 @@ public class EditorPostSettings: ScreenObject {
 
     var categoriesSection: XCUIElement { categoriesSectionGetter(app) }
     var chooseFromMediaButton: XCUIElement { app.buttons["Choose from Media"].firstMatch }
-    var closeButton: XCUIElement { closeButtonGetter(app) }
+    var saveButton: XCUIElement { saveButtonGetter(app) }
     var backButton: XCUIElement? { backButtonGetter(app) }
-    var featuredImageCell: XCUIElement { app.cells["post_settings_featured_image_cell"].firstMatch }
-    var selectedFeaturedImage: XCUIElement { app.otherElements["featured_image_current_image"].firstMatch }
+    var selectedFeaturedImage: XCUIElement { app.images["featured_image_current_image_menu"].firstMatch }
     var firstCalendarDayButton: XCUIElement { firstCalendarDayButtonGetter(app) }
     var monthLabel: XCUIElement { monthLabelGetter(app) }
     var nextMonthButton: XCUIElement { nextMonthButtonGetter(app) }
@@ -88,13 +87,13 @@ public class EditorPostSettings: ScreenObject {
     }
 
     public func removeFeatureImage() throws -> EditorPostSettings {
-        featuredImageCell.tap()
+        app.buttons["post_settings_featured_image_cell"].firstMatch.tap()
         app.buttons["featured_image_button_remove"].firstMatch.tap()
         return try EditorPostSettings()
     }
 
     public func setFeaturedImage() throws -> EditorPostSettings {
-        featuredImageCell.tap()
+        app.buttons["post_settings_featured_image_cell"].firstMatch.tap()
         chooseFromMediaButton.tap()
         try MediaPickerAlbumScreen()
             .selectImage(atIndex: 0) // Select latest uploaded image
@@ -118,10 +117,13 @@ public class EditorPostSettings: ScreenObject {
         return try EditorPostSettings()
     }
 
-    @discardableResult
-    public func closePostSettings() throws -> BlockEditorScreen {
-        closeButton.tap()
+    public func closePostSettings() {
+        app.buttons["post_settings_cancel_button"].firstMatch.tap()
+    }
 
+    @discardableResult
+    public func savePostSettings() throws -> BlockEditorScreen {
+        saveButton.tap()
         return try BlockEditorScreen()
     }
 

Modules/Sources/WordPressUI/Extensions/SwiftUI+Extensions.swift

@@ -4,22 +4,3 @@ import SwiftUI
 public extension EdgeInsets {
     static let zero = EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0)
 }
-
-private struct PresentingViewControllerKey: EnvironmentKey {
-    static let defaultValue = WeakEnvironmentValueWrapper<UIViewController>()
-}
-
-extension EnvironmentValues {
-    public var presentingViewController: UIViewController? {
-        get {
-            self[PresentingViewControllerKey.self].value ?? UIViewController.topViewController
-        }
-        set {
-            self[PresentingViewControllerKey.self].value = newValue
-        }
-    }
-}
-
-private final class WeakEnvironmentValueWrapper<T: AnyObject> {
-    weak var value: T?
-}

Modules/Sources/WordPressUI/Views/SectionHeader.swift

@@ -0,0 +1,16 @@
+import SwiftUI
+import DesignSystem
+
+public struct SectionHeader: View {
+    let title: String
+
+    public init(_ title: String) {
+        self.title = title
+    }
+
+    public var body: some View {
+        Text(title.uppercased())
+            .font(.caption2).fontWeight(.medium)
+            .foregroundStyle(Color.secondary)
+    }
+}

RELEASE-NOTES.txt

@@ -6,6 +6,7 @@
 -----
 * [**] Add new “Subscribers” screen that shows both your email and Reader subscribers [#24513]
 * [*] Improve search in TimeZone Picker for more accurate results [#24612]
+* [*] Add new "Author Picker" for "Post Settings" with search and better design [#24621]
 * [*] Fix an issue with “Stats / Subscribers” sometimes not showing the latest email subscribers [#24513]
 * [*] Fix an issue with "Stats" / "Subscribers" / "Emails" showing html encoded characters [#24513]
 * [*] Add search to “Jetpack Activity List” and display actors and dates [#24597]

Sources/Keystone/WordPress.h

@@ -26,9 +26,7 @@ FOUNDATION_EXPORT const unsigned char WordPressVersionString[];
 
 #import <WordPress/NSObject+Helpers.h>
 
-#import <WordPress/PageSettingsViewController.h>
 #import <WordPress/PostCategoryService.h>
-#import <WordPress/PostSettingsViewController.h>
 #import <WordPress/PostTagService.h>
 
 #import <WordPress/ReaderPostService.h>

Sources/WordPressData/Blog+Extensions.swift

@@ -0,0 +1,75 @@
+import Foundation
+import CoreData
+import WordPressShared
+
+extension Blog {
+
+    // MARK: - Post Formats
+
+    /// Returns an array of post format keys sorted with "standard" first, then alphabetically
+    @objc public var sortedPostFormats: [String] {
+        guard let postFormats = postFormats as? [String: String], !postFormats.isEmpty else {
+            return []
+        }
+
+        var sortedFormats: [String] = []
+
+        // Add standard format first if it exists
+        if postFormats[PostFormatStandard] != nil {
+            sortedFormats.append(PostFormatStandard)
+        }
+
+        // Add remaining formats sorted by their display names
+        let nonStandardFormats = postFormats
+            .filter { $0.key != PostFormatStandard }
+            .sorted { $0.value.localizedCaseInsensitiveCompare($1.value) == .orderedAscending }
+            .map { $0.key }
+
+        sortedFormats.append(contentsOf: nonStandardFormats)
+
+        return sortedFormats
+    }
+
+    /// Returns an array of post format display names sorted with "Standard" first, then alphabetically
+    @objc public var sortedPostFormatNames: [String] {
+        guard let postFormats = postFormats as? [String: String] else {
+            return []
+        }
+        return sortedPostFormats.compactMap { postFormats[$0] }
+    }
+
+    /// Returns the default post format display text
+    @objc public var defaultPostFormatText: String? {
+        postFormatText(fromSlug: settings?.defaultPostFormat)
+    }
+
+    // MARK: - Connections
+
+    /// Returns an array of PublicizeConnection objects sorted by service name, then by external name
+    @objc public var sortedConnections: [PublicizeConnection] {
+        guard let connections = Array(connections ?? []) as? [PublicizeConnection] else {
+            return []
+        }
+        return connections.sorted { lhs, rhs in
+            // First sort by service name (case insensitive, localized)
+            let serviceComparison = lhs.service.localizedCaseInsensitiveCompare(rhs.service)
+            if serviceComparison != .orderedSame {
+                return serviceComparison == .orderedAscending
+            }
+            // Then sort by external name (case insensitive)
+            return lhs.externalName.caseInsensitiveCompare(rhs.externalName) == .orderedAscending
+        }
+    }
+
+    // MARK: - Roles
+
+    /// Returns an array of roles sorted by order.
+    public var sortedRoles: [Role] {
+        guard let roles = Array(roles ?? []) as? [Role] else {
+            return []
+        }
+        return roles.sorted { lhs, rhs in
+            (lhs.order?.intValue ?? 0) < (rhs.order?.intValue ?? 0)
+        }
+    }
+}

Sources/WordPressData/Objective-C/AbstractPost.m

@@ -320,11 +320,6 @@ - (BOOL)isPrivateAtWPCom
     return self.blog.isPrivateAtWPCom;
 }
 
-- (BOOL)isMultiAuthorBlog
-{
-    return self.blog.isMultiAuthor;
-}
-
 - (BOOL)isUploading
 {
     return self.remoteStatus == AbstractPostRemoteStatusPushing;

Sources/WordPressData/Objective-C/BasePost.m

@@ -76,14 +76,6 @@ - (NSDate *)dateForDisplay
     return [self dateCreated];
 }
 
-- (NSString *)slugForDisplay
-{
-    if (self.wp_slug.length > 0) {
-        return self.wp_slug;
-    }
-    return self.suggested_slug;
-}
-
 - (BOOL)hasContent
 {
     BOOL titleIsEmpty = self.postTitle ? self.postTitle.isEmpty : YES;

Sources/WordPressData/Objective-C/Blog.m

@@ -281,56 +281,6 @@ - (NSArray *)sortedCategories
     return [[self.categories allObjects] sortedArrayUsingDescriptors:sortDescriptors];
 }
 
-- (NSArray *)sortedPostFormats
-{
-    if ([self.postFormats count] == 0) {
-        return @[];
-    }
-
-    NSMutableArray *sortedFormats = [NSMutableArray arrayWithCapacity:[self.postFormats count]];
-
-    if (self.postFormats[PostFormatStandard]) {
-        [sortedFormats addObject:PostFormatStandard];
-    }
-
-    NSArray *sortedNonStandardFormats = [[self.postFormats keysSortedByValueUsingSelector:@selector(localizedCaseInsensitiveCompare:)] wp_filter:^BOOL(id obj) {
-        return ![obj isEqual:PostFormatStandard];
-    }];
-
-    [sortedFormats addObjectsFromArray:sortedNonStandardFormats];
-
-    return [NSArray arrayWithArray:sortedFormats];
-}
-
-- (NSArray *)sortedPostFormatNames
-{
-    return [[self sortedPostFormats] wp_map:^id(NSString *key) {
-        return self.postFormats[key];
-    }];
-}
-
-- (NSArray *)sortedConnections
-{
-    NSSortDescriptor *sortServiceDescriptor = [[NSSortDescriptor alloc] initWithKey:@"service"
-                                                                          ascending:YES
-                                                                           selector:@selector(localizedCaseInsensitiveCompare:)];
-    NSSortDescriptor *sortExternalNameDescriptor = [[NSSortDescriptor alloc] initWithKey:@"externalName"
-                                                                               ascending:YES
-                                                                                selector:@selector(caseInsensitiveCompare:)];
-    NSArray *sortDescriptors = @[sortServiceDescriptor, sortExternalNameDescriptor];
-    return [[self.connections allObjects] sortedArrayUsingDescriptors:sortDescriptors];
-}
-
-- (NSArray<Role *> *)sortedRoles
-{
-    return [self.roles sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"order" ascending:YES]]];
-}
-
-- (NSString *)defaultPostFormatText
-{
-    return [self postFormatTextFromSlug:self.settings.defaultPostFormat];
-}
-
 - (BOOL)hasMappedDomain {
     if (![self isHostedAtWPcom]) {
         return NO;

Sources/WordPressData/Objective-C/include/AbstractPost.h

@@ -86,7 +86,6 @@ typedef NS_ENUM(NSUInteger, AbstractPostRemoteStatus) {
 - (NSString *)authorNameForDisplay;
 - (NSString *)blavatarForDisplay;
 - (NSString *)dateStringForDisplay;
-- (BOOL)isMultiAuthorBlog;
 - (BOOL)isPrivateAtWPCom;
 
 

Sources/WordPressData/Objective-C/include/Blog.h

@@ -16,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 @class PageTemplateCategory;
 @class PublicizeInfo;
 @class BlobEntity;
+@class PostCategory;
+@class PublicizeConnection;
 
 extern NSString * const BlogEntityName;
 extern NSString * const PostFormatStandard;
@@ -132,10 +134,10 @@ typedef NS_ENUM(NSInteger, SiteVisibility) {
 @property (nonatomic, strong, readwrite, nullable) NSNumber *hasOlderPosts;
 @property (nonatomic, strong, readwrite, nullable) NSNumber *hasOlderPages;
 @property (nonatomic, strong, readwrite, nullable) NSSet<AbstractPost *> *posts;
-@property (nonatomic, strong, readwrite, nullable) NSSet *categories;
+@property (nonatomic, strong, readwrite, nullable) NSSet<PostCategory *> *categories;
 @property (nonatomic, strong, readwrite, nullable) NSSet *tags;
 @property (nonatomic, strong, readwrite, nullable) NSSet *comments;
-@property (nonatomic, strong, readwrite, nullable) NSSet *connections;
+@property (nonatomic, strong, readwrite, nullable) NSSet<PublicizeConnection *> *connections;
 @property (nonatomic, strong, readwrite, nullable) NSSet *inviteLinks;
 @property (nonatomic, strong, readwrite, nullable) NSSet *domains;
 @property (nonatomic, strong, readwrite, nullable) NSSet *themes;
@@ -202,10 +204,6 @@ typedef NS_ENUM(NSInteger, SiteVisibility) {
 
 
 // Readonly Properties
-@property (nonatomic, weak, readonly, nullable) NSArray *sortedPostFormatNames;
-@property (nonatomic, weak, readonly, nullable) NSArray *sortedPostFormats;
-@property (nonatomic, weak, readonly, nullable) NSArray *sortedConnections;
-@property (nonatomic, readonly, nullable) NSArray<Role *> *sortedRoles;
 @property (nonatomic, strong, readonly, nullable) WordPressOrgXMLRPCApi *xmlrpcApi;
 @property (nonatomic, strong, readonly, nullable) WordPressOrgRestApi *selfHostedSiteRestApi;
 @property (nonatomic, weak, readonly, nullable) NSString *version;

Sources/WordPressData/Objective-C/include/PostContentProvider.h

@@ -12,6 +12,5 @@
 - (NSString *)blogNameForDisplay;
 - (NSURL *)featuredImageURLForDisplay;
 - (NSURL *)authorURL;
-- (NSString *)slugForDisplay;
 - (NSArray <NSString *> *)tagsForDisplay;
 @end

Sources/WordPressData/Swift/AbstractPost.swift

@@ -28,6 +28,15 @@ public extension AbstractPost {
 
     private static let deprecatedStatuses: Set<AbstractPostRemoteStatus> = [.pushing, .failed, .local, .sync, .pushingMedia, .autoSaved]
 
+    /// Creates an array of tags by parsing a comma-separate list of tags.
+    static func makeTags(from tags: String) -> [String] {
+        tags
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+            .components(separatedBy: ",")
+            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+            .filter { !$0.isEmpty }
+    }
+
     // MARK: - Status
 
     /// Returns `true` is the post has one of the given statuses.
@@ -92,13 +101,6 @@ public extension AbstractPost {
         }
     }
 
-    // MARK: - Misc
-
-    /// A title describing the status. Ie.: "Public" or "Private" or "Password protected"
-    @objc var titleForVisibility: String {
-        PostVisibility(post: self).localizedTitle
-    }
-
     /// Represent the supported properties used to sort posts.
     ///
     enum SortField {