Improved actionsheet's APIs about popover

sgr-ksmt · May 6, 2017 · 93beae7 · 93beae7
1 parent 251e459
commit 93beae7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/Demo/Demo/ViewController.swift b/Demo/Demo/ViewController.swift
@@ -39,7 +39,7 @@ class ViewController: UIViewController {
         case .login:
             showLoginAlert()
         case .actionsheet:
-            showActionSheet(source: self.view, frame: button.frame)
+            showActionSheet(anchorView: button)
         }
     }
 
@@ -101,9 +101,8 @@ class ViewController: UIViewController {
             })
             .show()
     }
-    private func showActionSheet(source: UIView, frame: CGRect) {
-        Alertift.actionSheet(message: "Which food do you like?")
-            .popover(sourceView: source, sourceRect: frame)
+    private func showActionSheet(anchorView: UIView) {
+        Alertift.actionSheet(message: "Which food do you like?", anchorView: anchorView)
             .action(.default("🍣"))
             .action(.default("🍎"))
             .action(.default("🍖"))

diff --git a/Sources/ActionSheet.swift b/Sources/ActionSheet.swift
@@ -50,6 +50,13 @@ extension Alertift {
             _alertController.popoverPresentationController?.sourceRect = rect
             return self
         }
+
+        public func popover(anchorView: UIView) -> Self {
+            _alertController.popoverPresentationController?.sourceView = anchorView.superview
+            _alertController.popoverPresentationController?.sourceRect = anchorView.frame
+            return self
+        }
+
 
         /// Add barButtonItem to **popoverPresentationController**.
         ///

diff --git a/Sources/AlertType.swift b/Sources/AlertType.swift
@@ -128,6 +128,11 @@ extension AlertType {
     ///   - viewController: The view controller to display over the current view controller’s content. Default is **UIApplication.shared.keyWindow?.rootViewController**
     ///   - completion: The block to execute after the presentation finishes. This block has no return value and takes no parameters. You may specify nil for this parameter.
     final public func show(on viewController: UIViewController? = UIApplication.shared.keyWindow?.rootViewController, completion: (() -> Void)? = nil) {
+        if _alertController.preferredStyle == .actionSheet && UIScreen.main.traitCollection.userInterfaceIdiom == .pad {
+            if _alertController.popoverPresentationController?.sourceView == nil {
+                _alertController.popoverPresentationController?.sourceView = viewController?.view
+            }
+        }
         viewController?.present(_alertController, animated: true, completion: completion)
     }
 }
diff --git a/Sources/Alertift.swift b/Sources/Alertift.swift
@@ -34,6 +34,10 @@ public final class Alertift {
     public static func actionSheet(title: String? = nil, message: String? = nil) -> ActionSheet {
         return ActionSheet(title: title, message: message)
     }
+
+    public static func actionSheet(title: String? = nil, message: String? = nil, anchorView: UIView) -> ActionSheet {
+        return ActionSheet(title: title, message: message).popover(anchorView: anchorView)
+    }
 }
 
 extension Alertift {