Fix close button in CollapsableHeaderViewCon

Author: kean

WordPress/Classes/Services/PageCoordinator.swift

@@ -14,7 +14,12 @@ class PageCoordinator {
 
     private static func showLayoutPicker(from controller: UIViewController, forBlog blog: Blog, _ completion: @escaping TemplateSelectionCompletion) {
         let rootViewController = GutenbergLayoutPickerViewController(blog: blog, completion: completion)
-        let navigationController = GutenbergLightNavigationController(rootViewController: rootViewController)
+        let navigationController: UINavigationController
+        if #available(iOS 26, *) {
+            navigationController = UINavigationController(rootViewController: rootViewController)
+        } else {
+            navigationController = GutenbergLightNavigationController(rootViewController: rootViewController)
+        }
         navigationController.modalPresentationStyle = .pageSheet
 
         controller.present(navigationController, animated: true, completion: nil)

WordPress/Classes/ViewRelated/Gutenberg/Collapsable Header/CollapsableHeaderViewController.swift

@@ -166,23 +166,9 @@ class CollapsableHeaderViewController: UIViewController, NoResultsViewHost {
 
     // MARK: - Static Helpers
     public static func closeButton(target: Any?, action: Selector) -> UIBarButtonItem {
-        let closeButton = UIButton(frame: CGRect(x: 0, y: 0, width: 30, height: 30))
-        closeButton.layer.cornerRadius = 15
-        closeButton.accessibilityLabel = NSLocalizedString("Close", comment: "Dismisses the current screen")
+        let closeButton = UIBarButtonItem(barButtonSystemItem: .close, target: target, action: action)
         closeButton.accessibilityIdentifier = "close-button"
-        closeButton.setImage(UIImage.gridicon(.crossSmall), for: .normal)
-        closeButton.addTarget(target, action: action, for: .touchUpInside)
-
-        closeButton.tintColor = .secondaryLabel
-        closeButton.backgroundColor = UIColor { (traitCollection: UITraitCollection) -> UIColor in
-            if traitCollection.userInterfaceStyle == .dark {
-                return UIColor.systemFill
-            } else {
-                return UIColor.quaternarySystemFill
-            }
-        }
-
-        return UIBarButtonItem(customView: closeButton)
+        return closeButton
     }
 
     // MARK: - Initializers

WordPress/Classes/ViewRelated/Site Creation/Design Selection/SiteDesignContentCollectionViewController.swift

@@ -340,7 +340,12 @@ extension SiteDesignContentCollectionViewController: CategorySectionTableViewCel
             completion: completion
         )
 
-        let navController = GutenbergLightNavigationController(rootViewController: previewVC)
+        let navigationController: UINavigationController
+        if #available(iOS 26, *) {
+            navigationController = UINavigationController(rootViewController: previewVC)
+        } else {
+            navigationController = GutenbergLightNavigationController(rootViewController: previewVC)
+        }
         navController.modalPresentationStyle = .pageSheet
         navigationController?.present(navController, animated: true) {
             // deselect so no border is shown on dismissal of the preview