- added menuWillShow delegate method

- ignore navigation bar height if it hidden
teambition · Apr 16, 2017 · 958d4c0 · 958d4c0
1 parent eeecad1
commit 958d4c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/DropdownMenu/DropUpMenu.swift b/DropdownMenu/DropUpMenu.swift
@@ -21,6 +21,7 @@ public protocol DropUpMenuDelegate: class {
     func dropUpMenu(_ dropUpMenu: DropUpMenu, didSelectRowAt indexPath: IndexPath)
     func dropUpMenuCancel(_ dropUpMenu: DropUpMenu)
     func dropUpMenuWillDismiss(_ dropUpMenu: DropUpMenu)
+    func dropUpMenuWillShow(_ dropUpMenu: DropUpMenu)
 }
 
 public extension DropUpMenuDelegate {
@@ -33,6 +34,8 @@ public extension DropUpMenuDelegate {
     func dropUpMenuCancel(_ dropUpMenu: DropUpMenu) { }
 
     func dropUpMenuWillDismiss(_ dropUpMenu: DropUpMenu) { }
+
+    func dropUpMenuWillShow(_ dropUpMenu: DropUpMenu) { }
 }
 
 private let screenRect = UIScreen.main.bounds
@@ -149,6 +152,7 @@ open class DropUpMenu: UIView {
     }
 
     open func showMenu() {
+        delegate?.dropUpMenuWillShow(self)
         if isShow {
             hideMenu()
             return

diff --git a/DropdownMenu/DropdownMenu.swift b/DropdownMenu/DropdownMenu.swift
@@ -13,13 +13,15 @@ public protocol DropdownMenuDelegate: class {
     func dropdownMenu(_ dropdownMenu: DropdownMenu, didSelectRowAt indexPath: IndexPath)
     func dropdownMenuCancel(_ dropdownMenu: DropdownMenu)
     func dropdownMenuWillDismiss(_ dropdownMenu: DropdownMenu)
+    func dropdownMenuWillShow(_ dropdownMenu: DropdownMenu)
 }
 
 public extension DropdownMenuDelegate {
     func dropdownMenu(_ dropdownMenu: DropdownMenu, cellForRowAt indexPath: IndexPath) -> UITableViewCell? { return nil }
     func dropdownMenu(_ dropdownMenu: DropdownMenu, didSelectRowAt indexPath: IndexPath) { }
     func dropdownMenuCancel(_ dropdownMenu: DropdownMenu) { }
     func dropdownMenuWillDismiss(_ dropdownMenu: DropdownMenu) { }
+    func dropdownMenuWillShow(_ dropdownMenu: DropdownMenu) { }
 }
 
 open class DropdownMenu: UIView {
@@ -36,7 +38,11 @@ open class DropdownMenu: UIView {
     fileprivate let portraitTopOffset: CGFloat = 64.0
     fileprivate let landscapeTopOffset: CGFloat = 32.0
     fileprivate var topLayoutConstraintConstant: CGFloat {
-        return navigationController.navigationBar.frame.height + navigationController.navigationBar.frame.origin.y + topOffsetY
+        var offset: CGFloat = 0
+        if !navigationController.isNavigationBarHidden {
+          offset = navigationController.navigationBar.frame.height + navigationController.navigationBar.frame.origin.y
+        }
+        return offset + topOffsetY
     }
 
     open weak var delegate: DropdownMenuDelegate?
@@ -197,6 +203,7 @@ open class DropdownMenu: UIView {
     }
 
     open func showMenu(isOnNavigaitionView: Bool = false) {
+        delegate?.dropdownMenuWillShow(self)
         if isShow {
             hideMenu()
             return