Merge pull request #15 from Wzxhaha/master

Open isShow & Update maxHeight when don't display section header
teambition · Apr 19, 2018 · 6cbb1b8 · 6cbb1b8
2 parents eb9df47 + 4a5a5be
commit 6cbb1b8
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 1,248 deletions.
diff --git a/Carthage/Build/iOS/0072A021-A0C8-3E42-8785-053FF6530D9A.bcsymbolmap b/Carthage/Build/iOS/0072A021-A0C8-3E42-8785-053FF6530D9A.bcsymbolmap
diff --git a/Carthage/Build/iOS/8EF0BB32-843B-378C-8330-3325067C0497.bcsymbolmap b/Carthage/Build/iOS/8EF0BB32-843B-378C-8330-3325067C0497.bcsymbolmap
diff --git a/Carthage/Build/iOS/DropdownMenu.framework.dSYM/Contents/Info.plist b/Carthage/Build/iOS/DropdownMenu.framework.dSYM/Contents/Info.plist
diff --git a/Carthage/Build/iOS/DropdownMenu.framework.dSYM/Contents/Resources/DWARF/DropdownMenu b/Carthage/Build/iOS/DropdownMenu.framework.dSYM/Contents/Resources/DWARF/DropdownMenu
diff --git a/Carthage/Build/iOS/DropdownMenu.framework/DropdownMenu b/Carthage/Build/iOS/DropdownMenu.framework/DropdownMenu
diff --git a/Carthage/Build/iOS/DropdownMenu.framework/Headers/DropdownMenu-Swift.h b/Carthage/Build/iOS/DropdownMenu.framework/Headers/DropdownMenu-Swift.h
diff --git a/Carthage/Build/iOS/DropdownMenu.framework/Headers/DropdownMenu.h b/Carthage/Build/iOS/DropdownMenu.framework/Headers/DropdownMenu.h
diff --git a/Carthage/Build/iOS/DropdownMenu.framework/Info.plist b/Carthage/Build/iOS/DropdownMenu.framework/Info.plist
diff --git a/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/arm.swiftdoc
diff --git a/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/arm.swiftmodule
diff --git a/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/arm64.swiftdoc
diff --git a/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/arm64.swiftmodule
diff --git a/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/i386.swiftdoc
diff --git a/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/i386.swiftmodule
diff --git a/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/x86_64.swiftdoc
diff --git a/...hage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/x86_64.swiftmodule b/...hage/Build/iOS/DropdownMenu.framework/Modules/DropdownMenu.swiftmodule/x86_64.swiftmodule
diff --git a/Carthage/Build/iOS/DropdownMenu.framework/Modules/module.modulemap b/Carthage/Build/iOS/DropdownMenu.framework/Modules/module.modulemap
diff --git a/DropdownMenu/DropdownMenu.swift b/DropdownMenu/DropdownMenu.swift
@@ -36,7 +36,7 @@ open class DropdownMenu: UIView {
 
     open var tableView: UITableView!
     fileprivate var barCoverView: UIView?
-    fileprivate var isShow = false
+    open var isShow = false
     fileprivate var addedWindow: UIWindow?
     fileprivate var windowRootView: UIView?
     fileprivate var topConstraint: NSLayoutConstraint?
@@ -72,9 +72,7 @@ open class DropdownMenu: UIView {
     }
     open var separatorStyle: UITableViewCellSeparatorStyle = .singleLine {
         didSet {
-            if let tableView = tableView {
-                tableView.separatorStyle = separatorStyle
-            }
+            tableView.separatorStyle = separatorStyle
         }
     }
     open var tableViewSeperatorColor = UIColor(red: 217.0/255.0, green: 217.0/255.0, blue: 217.0/255.0, alpha: 1.0) {
@@ -173,8 +171,8 @@ open class DropdownMenu: UIView {
     fileprivate func initTableView() {
         tableView = UITableView(frame: CGRect.zero, style: .grouped)
         tableView.separatorStyle = separatorStyle
-        tableView?.delegate = self
-        tableView?.dataSource = self
+        tableView.delegate = self
+        tableView.dataSource = self
         tableView.estimatedSectionFooterHeight = 0
         tableView.estimatedSectionHeaderHeight = 0
         addSubview(tableView)
@@ -184,9 +182,15 @@ open class DropdownMenu: UIView {
         tableView.translatesAutoresizingMaskIntoConstraints = false
 
         tableViewHeight = tableviewHeight()
+
         let maxHeight = navigationController.view.frame.height - topLayoutConstraintConstant - defaultBottonMargin
+
         if tableViewHeight > maxHeight {
-            tableViewHeight = maxHeight
+            if displaySectionHeader {
+                tableViewHeight = maxHeight
+            } else {
+                tableViewHeight = round(maxHeight / rowHeight) * rowHeight
+            }
         }
 
         NSLayoutConstraint.activate([NSLayoutConstraint.init(item: tableView, attribute: .top, relatedBy: .equal, toItem: self, attribute: .top, multiplier: 1.0, constant:0)])