iOS 26: Remove BottomSheetPresentationController (#24780)

* Use native sheet to show CreateButtonActionSheet

* Enable zoom-zoon

* Remove BottomSheetPresentationController

Author: kean

WordPress/Classes/ViewRelated/System/Action Sheet/ActionSheetViewController.swift

@@ -35,8 +35,8 @@ class ActionSheetViewController: UIViewController {
             static let height: CGFloat = 54
             static let contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 18, bottom: 0, trailing: 35)
             static let imagePadding: CGFloat = 16
-            static let imageTintColor: UIColor = UIAppColor.neutral(.shade30)
-            static let font: UIFont = .preferredFont(forTextStyle: .callout)
+            static let imageTintColor: UIColor = .label
+            static let font: UIFont = WPStyleGuide.fontForTextStyle(.headline, fontWeight: .medium)
             static let textColor: UIColor = .label
             static let badgeHorizontalPadding: CGFloat = 10
         }
@@ -203,6 +203,7 @@ class ActionSheetViewController: UIViewController {
 
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
+
         updateScrollViewHeight()
         let compressedSize = view.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
         let width = min(max(Constants.minimumWidth, compressedSize.width), Constants.maximumWidth)

WordPress/Classes/ViewRelated/System/Action Sheet/BottomSheetPresentationController.swift

@@ -10,13 +10,13 @@ final class CreateButtonCoordinator: NSObject {
     private enum Constants {
         static let padding: CGFloat = -16 // Bottom and trailing padding to position the button along the bottom right corner
         static let heightWidth: CGFloat = 56 // Height and width of the button
-        static let popoverOffset: CGFloat = -10 // The vertical offset of the iPad popover
+        static let popoverOffset: CGFloat = -4 // The vertical offset of the iPad popover
         static let skippedPromptsUDKey = "wp_skipped_blogging_prompts"
     }
 
     var button: UIButton = {
         let button: UIButton
-#if swift(>=6.2)
+#if compiler(>=6.2)
         if #available(iOS 26, *) {
             var configuration = UIButton.Configuration.prominentClearGlass()
             configuration.image = UIImage(systemName: "plus")
@@ -134,15 +134,22 @@ final class CreateButtonCoordinator: NSObject {
     }
 
     private func setupPresentation(on viewController: UIViewController, for traitCollection: UITraitCollection) {
-        if traitCollection.horizontalSizeClass == .regular && traitCollection.verticalSizeClass == .regular {
-            viewController.modalPresentationStyle = .popover
-        } else {
-            viewController.modalPresentationStyle = .custom
-        }
+        viewController.modalPresentationStyle = .popover
+        viewController.popoverPresentationController?.sourceView = button
+        viewController.popoverPresentationController?.sourceRect = button.bounds.offsetBy(dx: 0, dy: Constants.popoverOffset)
+
+        // Pre-compute `preferredContentSize`
+        viewController.view.layoutIfNeeded()
+
+        viewController.popoverPresentationController?.adaptiveSheetPresentationController.detents = [.custom { [weak viewController] context in
+            viewController?.preferredContentSize.height ?? 320
+        }]
 
-        viewController.popoverPresentationController?.sourceView = self.button
-        viewController.popoverPresentationController?.sourceRect = self.button.bounds.offsetBy(dx: 0, dy: Constants.popoverOffset)
-        viewController.transitioningDelegate = self
+        if #available(iOS 18.0, *) {
+            viewController.preferredTransition = .zoom { [weak self] _ in
+                self?.button
+            }
+        }
     }
 
     func hideCreateButton() {
@@ -171,27 +178,6 @@ final class CreateButtonCoordinator: NSObject {
     }
 }
 
-// MARK: Tranisitioning Delegate
-
-extension CreateButtonCoordinator: UIViewControllerTransitioningDelegate {
-    public func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        return BottomSheetAnimationController(transitionType: .presenting)
-    }
-
-    public func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        return BottomSheetAnimationController(transitionType: .dismissing)
-    }
-
-    public func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
-        let presentationController = BottomSheetPresentationController(presentedViewController: presented, presenting: presenting)
-        return presentationController
-    }
-
-    public func interactionControllerForDismissal(using animator: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
-        return (viewController?.presentedViewController?.presentationController as? BottomSheetPresentationController)?.interactionController
-    }
-}
-
 // MARK: - Blogging Prompts Methods
 
 private extension CreateButtonCoordinator {

WordPress/Classes/ViewRelated/System/Floating Create Button/CreateButtonCoordinator.swift

@@ -9,13 +9,14 @@ struct PostAction: ActionSheetItem {
     private let action = "create_new_post"
 
     func makeButton() -> ActionSheetButton {
-        return ActionSheetButton(title: NSLocalizedString("Blog post", comment: "Create new Blog Post button title"),
-                                 image: .gridicon(.posts),
-                                 identifier: "blogPostButton",
-                                 action: {
-                                    WPAnalytics.track(.createSheetActionTapped, properties: ["source": source, "action": action])
-                                    handler()
-                                 })
+        return ActionSheetButton(
+            title: NSLocalizedString("Blog post", comment: "Create new Blog Post button title"),
+            image: UIImage(named: "wpl-posts") ?? .init(),
+            identifier: "blogPostButton",
+            action: {
+                WPAnalytics.track(.createSheetActionTapped, properties: ["source": source, "action": action])
+                handler()
+            })
     }
 }
 
@@ -26,13 +27,14 @@ struct PostFromAudioAction: ActionSheetItem {
     private let action = "create_new_post_from_audio"
 
     func makeButton() -> ActionSheetButton {
-        return ActionSheetButton(title: NSLocalizedString("createFAB.postFromAudio", value: "Post from Audio", comment: "Create new Blog Post from Audio button title"),
-                                 image: .gridicon(.microphone),
-                                 identifier: "blogPostFromAudioButton",
-                                 action: {
-                                    WPAnalytics.track(.createSheetActionTapped, properties: ["source": source, "action": action])
-                                    handler()
-                                 })
+        return ActionSheetButton(
+            title: NSLocalizedString("createFAB.postFromAudio", value: "Post from Audio", comment: "Create new Blog Post from Audio button title"),
+            image: .gridicon(.microphone),
+            identifier: "blogPostFromAudioButton",
+            action: {
+                WPAnalytics.track(.createSheetActionTapped, properties: ["source": source, "action": action])
+                handler()
+            })
     }
 }
 
@@ -43,12 +45,13 @@ struct PageAction: ActionSheetItem {
     private let action = "create_new_page"
 
     func makeButton() -> ActionSheetButton {
-        return ActionSheetButton(title: NSLocalizedString("Site page", comment: "Create new Site Page button title"),
-                                            image: .gridicon(.pages),
-                                            identifier: "sitePageButton",
-                                            action: {
-                                                WPAnalytics.track(.createSheetActionTapped, properties: ["source": source, "action": action])
-                                                handler()
-                                            })
+        return ActionSheetButton(
+            title: NSLocalizedString("Site page", comment: "Create new Site Page button title"),
+            image: UIImage(named: "wpl-pages") ?? .init(),
+            identifier: "sitePageButton",
+            action: {
+                WPAnalytics.track(.createSheetActionTapped, properties: ["source": source, "action": action])
+                handler()
+            })
     }
 }

WordPress/Classes/ViewRelated/System/Floating Create Button/SheetActions.swift

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "pages.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

WordPress/Resources/AppImages.xcassets/_WordPressDesignLibrary/wpl-pages.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "site-menu-posts.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}