Dismiss properly a reusable panel

Fix #7
antoniocasero · Oct 28, 2018 · 8f51e80 · 8f51e80
1 parent 2e4988b
commit 8f51e80
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/Sources/PanelConfiguration.swift b/Sources/PanelConfiguration.swift
@@ -39,6 +39,15 @@ public struct PanelConfiguration {
     /// calculation when the panelSize is .fullScreen
     public var enclosedNavigationBar = true
 
+    /// This value sets defines the height constraint
+    public var heightConstant: CGFloat?
+
+    // Animation duration when the panel is presented
+    public var entryAnimationDuration: Double = 1.0
+
+    // Animation duration when the panel is dimissed
+    public var dismissAnimationDuration: Double = 0.3
+
     public init(size: PanelDimensions = .thirdQuarter,
                 margin: CGFloat = 8.0,
                 visibleArea: CGFloat = 64.0) {

diff --git a/Sources/Panels.swift b/Sources/Panels.swift
@@ -16,6 +16,7 @@ public class Panels {
     private weak var containerView: UIView?
     private weak var panelHeightConstraint: NSLayoutConstraint?
     private lazy var configuration: PanelConfiguration = PanelConfiguration()
+    private var panelHeight: CGFloat = 0.0
 
     public init(target: UIViewController) {
         self.parentViewController = target
@@ -31,6 +32,7 @@ public class Panels {
                      config: PanelConfiguration = PanelConfiguration(),
                      view: UIView? = nil) {
 
+        assert(self.panel == nil, "You are trying to push a panel without dismiss the previous one.")
         self.configuration = config
         self.containerView = view ?? parentViewController?.view
         self.panel = panel
@@ -47,7 +49,8 @@ public class Panels {
         panel.hideKeyboardAutomatically()
         registerKeyboardNotifications()
         //Prepare the view placement, saving the safeArea.
-        self.panel?.headerHeight.constant += UIApplication.safeAreaBottom()
+        panelHeight = config.heightConstant ?? panel.headerHeight.constant
+        panel.headerHeight.constant = panelHeight + UIApplication.safeAreaTop()
         setupGestures(headerView: panel.headerPanel, superview: container)
     }
 
@@ -69,10 +72,19 @@ public class Panels {
     }
 
     public func dismiss(completion: (() -> Void)? = nil) {
-        movePanel(value: 0, completion: {
+        self.panel?.headerHeight.constant = panelHeight
+        guard let panelView = self.panel?.view else {
+            return
+        }
+
+        UIView.animate(withDuration: configuration.dismissAnimationDuration, animations: {
+            panelView.frame.origin = CGPoint(x: 0, y: self.containerView!.frame.size.height)
+        }) { _ in
             self.panel?.removeContainer()
             completion?()
-        })
+        }
+        self.panel = nil
+
     }
 
     deinit {
@@ -97,7 +109,6 @@ extension Panels {
                                      visible: CGFloat,
                                      size: CGFloat) -> NSLayoutConstraint {
         childView.translatesAutoresizingMaskIntoConstraints = false
-        //Bottom
         childView.frame = CGRect(x: 0, y: container.bounds.maxY + configuration.visibleArea(), width: container.bounds.width, height: configuration.visibleArea())
         let views = ["childView": childView]
         let horizontalConstraints = NSLayoutConstraint.constraints(withVisualFormat: "H:|[childView]|",
@@ -113,7 +124,7 @@ extension Panels {
                                                            constant: visible)
         constraint.isActive = true
         if self.configuration.animateEntry {
-            childView.animateLayoutBounce(duration: 1)
+            childView.animateLayoutBounce(duration: self.configuration.entryAnimationDuration)
         } else {
             childView.layoutIfNeeded()
         }
@@ -139,8 +150,8 @@ extension Panels {
         if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
             let keyboardRectangle = keyboardFrame.cgRectValue
             let keyboardHeight = CGFloat(keyboardRectangle.height)
-            if let container = containerView {
-                let currentValue = (isExpanded) ? configuration.size(for: container) : configuration.visibleArea()
+            containerView.then {
+                let currentValue = (isExpanded) ? configuration.size(for: $0) : configuration.visibleArea()
                 movePanel(value: currentValue + keyboardHeight, keyboard: true)
             }
         }

diff --git a/Sources/Utils/UIView+Utils.swift b/Sources/Utils/UIView+Utils.swift
@@ -89,3 +89,13 @@ internal extension UIApplication {
         return bottomPadding
     }
 }
+
+extension Optional {
+    func then<T>(_ action: (Wrapped) throws -> T?) rethrows -> T? {
+        guard let unwrapped = self else { return nil }
+        return try action(unwrapped)
+    }
+    func `do`(_ some: () throws -> Void) rethrows {
+        if self != nil { try some() }
+    }
+}