Merge branch 'master' into 6.1.2

* master:
  Update README.md

Example/MainViewController.swift

@@ -22,6 +22,7 @@ class MainViewController: UIViewController {
         super.viewDidLoad()
         setupSideMenu()
         updateUI(settings: SideMenuSettings())
+        updateMenus()
     }
 
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
@@ -43,7 +44,7 @@ class MainViewController: UIViewController {
     private func updateUI(settings: SideMenuSettings) {
         let styles:[UIBlurEffect.Style] = [.dark, .light, .extraLight]
         if let menuBlurEffectStyle = settings.blurEffectStyle {
-            blurSegmentControl.selectedSegmentIndex = styles.firstIndex(of: menuBlurEffectStyle) ?? 0
+            blurSegmentControl.selectedSegmentIndex = (styles.firstIndex(of: menuBlurEffectStyle) ?? 0) + 1
         } else {
             blurSegmentControl.selectedSegmentIndex = 0
         }
@@ -53,7 +54,7 @@ class MainViewController: UIViewController {
         menuScaleFactorSlider.value = Float(settings.presentationStyle.menuScaleFactor)
         presentingAlphaSlider.value = Float(settings.presentationStyle.presentingEndAlpha)
         presentingScaleFactorSlider.value = Float(settings.presentationStyle.presentingScaleFactor)
-        screenWidthSlider.value = Float(settings.menuWidth / view.frame.width)
+        screenWidthSlider.value = Float(settings.menuWidth / min(view.frame.width, view.frame.height))
         shadowOpacitySlider.value = Float(settings.presentationStyle.onTopShadowOpacity)
     }
 
@@ -88,7 +89,7 @@ class MainViewController: UIViewController {
 
         var settings = SideMenuSettings()
         settings.presentationStyle = presentationStyle
-        settings.menuWidth = view.frame.width * CGFloat(screenWidthSlider.value)
+        settings.menuWidth = min(view.frame.width, view.frame.height) * CGFloat(screenWidthSlider.value)
         let styles:[UIBlurEffect.Style?] = [nil, .dark, .light, .extraLight]
         settings.blurEffectStyle = styles[blurSegmentControl.selectedSegmentIndex]
         settings.statusBarEndAlpha = blackOutStatusBar.isOn ? 1 : 0

Pod/Classes/Deprecations.swift

@@ -27,7 +27,7 @@ extension SideMenuManager {
     }
 
     @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.")
-    public var menuPushStyle: MenuPushStyle {
+    public var menuPushStyle: SideMenuPushStyle {
         get { return .default }
         set {}
     }
@@ -62,37 +62,37 @@ extension SideMenuManager {
         set {}
     }
 
-    @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.")
+    @available(*, deprecated, message: "This property has been moved to the SideMenuPresentationStyle class.")
     public var menuAnimationFadeStrength: CGFloat {
         get { return 0 }
         set {}
     }
 
-    @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.")
+    @available(*, deprecated, message: "This property has been moved to the SideMenuPresentationStyle class.")
     public var menuAnimationTransformScaleFactor: CGFloat {
         get { return 1 }
         set {}
     }
 
-    @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.")
+    @available(*, deprecated, message: "This property has been moved to the SideMenuPresentationStyle class.")
     public var menuAnimationBackgroundColor: UIColor? {
         get { return nil }
         set {}
     }
 
-    @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.")
+    @available(*, deprecated, message: "This property has been moved to the SideMenuPresentationStyle class.")
     public var menuShadowOpacity: Float {
         get { return 0.5 }
         set {}
     }
 
-    @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.")
+    @available(*, deprecated, message: "This property has been moved to the SideMenuPresentationStyle class.")
     public var menuShadowColor: UIColor {
         get { return .black }
         set {}
     }
 
-    @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.")
+    @available(*, deprecated, message: "This property has been moved to the SideMenuPresentationStyle class.")
     public var menuShadowRadius: CGFloat {
         get { return 5 }
         set {}
@@ -104,7 +104,7 @@ extension SideMenuManager {
         set {}
     }
 
-    @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.")
+    @available(*, deprecated, message: "This property has been moved to the SideMenuPresentationStyle class.")
     public var menuParallaxStrength: Int {
         get { return 0 }
         set {}
@@ -182,7 +182,13 @@ extension SideMenuManager {
         set {}
     }
 
-    @available(*, deprecated, renamed: "SideMenuPresentStyle")
+    @available(*, deprecated, renamed: "enableSwipeToDismissGesture")
+    public var enableSwipeGestures: Bool {
+        get { return true }
+        set {}
+    }
+
+    @available(*, deprecated, renamed: "SideMenuPresentationStyle")
     public typealias MenuPresentMode = SideMenuPresentationStyle
 
     @available(*, deprecated, renamed: "addScreenEdgePanGesturesToPresent")

Pod/Classes/Extensions.swift

@@ -52,6 +52,20 @@ internal extension UIViewController {
     }
 }
 
+internal extension UIGestureRecognizer {
+
+    convenience init(addTo view: UIView, target: Any, action: Selector) {
+        self.init()
+        addTarget(target, action: action)
+        view.addGestureRecognizer(self)
+    }
+
+    convenience init?(addTo view: UIView?, target: Any, action: Selector) {
+        guard let view = view else { return nil }
+        self.init(addTo: view, target: target, action: action)
+    }
+}
+
 internal extension UIPanGestureRecognizer {
 
     var canSwitch: Bool {

Pod/Classes/Models.swift

@@ -28,8 +28,10 @@ internal protocol MenuModel: TransitionModel {
     var dismissOnRotation: Bool { get }
     /// Automatically dismisses the menu when app goes to the background.
     var dismissWhenBackgrounded: Bool { get }
-    /// Enable or disable gestures that would swipe to dismiss the menu. Default is true.
-    var enableSwipeGestures: Bool { get }
+    /// Enable or disable a swipe gesture that dismisses the menu. Will not be triggered when `presentingViewControllerUserInteractionEnabled` is set to true. Default is true.
+    var enableSwipeToDismissGesture: Bool { get }
+    /// Enable or disable a tap gesture that dismisses the menu. Will not be triggered when `presentingViewControllerUserInteractionEnabled` is set to true. Default is true.
+    var enableTapToDismissGesture: Bool { get }
     /**
      The push style of the menu.
 
@@ -41,7 +43,7 @@ internal protocol MenuModel: TransitionModel {
      - replace: Any existing view controllers are released from the stack and replaced with the pushed view controller. Back buttons are automatically hidden. This behavior is ideal if view controllers require a lot of memory or their state doesn't need to be preserved..
      - subMenu: Unlike all other behaviors that push using the menu's presentingViewController, this behavior pushes view controllers within the menu.  Use this behavior if you want to display a sub menu.
      */
-    var pushStyle: MenuPushStyle { get }
+    var pushStyle: SideMenuPushStyle { get }
 }
 
 internal protocol TransitionModel: PresentationModel {

Pod/Classes/Print.swift

@@ -13,22 +13,30 @@ internal enum Print: String { case
     menuAlreadyAssigned = "%@ was already assigned to the %@ of %@. When using multiple SideMenuManagers you may want to use new instances of UISideMenuNavigationController instead of existing instances to avoid crashes if the menu is presented more than once.",
     menuInUse = "%@ cannot be modified while it's presented.",
     panGestureAdded = "%@ was called before %@ or %@ was set. Gestures will not work without a menu.",
-    property = "a menu's %@ property can only be changed when it is hidden.",
+    property = "A menu's %@ property can only be changed when it is hidden.",
     screenGestureAdded = "%@ was called before %@ was set. The gesture will not work without a menu. Use %@ to add gestures for only one menu.",
     transitioningDelegate = "SideMenu requires use of the transitioningDelegate. It cannot be modified."
 
-    internal static func warning(_ print: Print, arguments: CVarArg..., required: Bool = false) {
-        warning(String(format: print.rawValue, arguments), required: required)
+    enum PropertyName: String { case
+        leftSide
     }
 
-    internal static func warning(_ print: Print, required: Bool = false) {
+    static func warning(_ print: Print, arguments: CVarArg..., required: Bool = false) {
+        warning(String(format: print.rawValue, arguments: arguments), required: required)
+    }
+
+    static func warning(_ print: Print, arguments: PropertyName..., required: Bool = false) {
+        warning(String(format: print.rawValue, arguments: arguments.map { $0.rawValue }), required: required)
+    }
+
+    static func warning(_ print: Print, required: Bool = false) {
         warning(print.rawValue, required: required)
     }
 }
 
 private extension Print {
 
-    private static func warning(_ message: String, required: Bool = false) {
+    static func warning(_ message: String, required: Bool = false) {
         let message = "SideMenu Warning: \(message)"
 
         if required {

Pod/Classes/Protected.swift

@@ -9,32 +9,18 @@ import Foundation
 
 internal final class Protected<T: Equatable> {
 
-    typealias ConditionBlock = (T) -> Bool
-    typealias Block = (T) -> Void
+    typealias ConditionBlock = (_ oldValue: T, T) -> T
 
     private var _value: T
-    private var conditionBlock: ConditionBlock
-    private var thenBlock: Block?
-    private var elseBlock: Block?
+    private var condition: ConditionBlock
 
     public var value: T {
-        get {
-            return _value
-        }
-        set {
-            guard conditionBlock(_value) else {
-                elseBlock?(_value)
-                return
-            }
-            _value = newValue
-            thenBlock?(_value)
-        }
+        get { return _value }
+        set { _value = condition(_value, newValue) }
     }
 
-    init(_ value: T, if conditionBlock: @escaping ConditionBlock, then thenBlock: Block? = nil, else elseBlock: Block? = nil) {
+    init(_ value: T, when condition: @escaping ConditionBlock) {
         self._value = value
-        self.conditionBlock = conditionBlock
-        self.thenBlock = thenBlock
-        self.elseBlock = elseBlock
+        self.condition = condition
     }
 }

Pod/Classes/SideMenuManager.swift

@@ -30,21 +30,14 @@ public class SideMenuManager: NSObject {
 
         var name: String {
             switch self {
-            case .left: return "menuLeftNavigationController"
-            case .right: return "menuRightNavigationController"
+            case .left: return "leftMenuNavigationController"
+            case .right: return "rightMenuNavigationController"
             }
         }
     }
 
-    private var _leftMenu: Protected<Menu?> =
-        Protected(nil,
-                  if: { $0?.isHidden != false },
-                  else: { _ in Print.warning(.menuInUse, arguments: PresentDirection.left.name, required: true) } )
-
-    private var _rightMenu: Protected<Menu?> =
-        Protected(nil,
-                  if: { $0?.isHidden != false },
-                  else: { _ in Print.warning(.menuInUse, arguments: PresentDirection.right.name, required: true) } )
+    private var _leftMenu: Protected<Menu?> = Protected(nil) { SideMenuManager.setMenu(fromMenu: $0, toMenu: $1) }
+    private var _rightMenu: Protected<Menu?> = Protected(nil) { SideMenuManager.setMenu(fromMenu: $0, toMenu: $1) }
 
     private var switching: Bool = false
 
@@ -58,13 +51,23 @@ public class SideMenuManager: NSObject {
 
     /// The left menu.
     open var leftMenuNavigationController: UISideMenuNavigationController? {
-        get { return _leftMenu.value }
+        get {
+            if _leftMenu.value?.isHidden == true {
+                _leftMenu.value?.leftSide = true
+            }
+            return _leftMenu.value
+        }
         set(menu) { _leftMenu.value = menu }
     }
     
     /// The right menu.
     open var rightMenuNavigationController: UISideMenuNavigationController? {
-        get { return _rightMenu.value }
+        get {
+            if _rightMenu.value?.isHidden == true {
+                _rightMenu.value?.leftSide = false
+            }
+            return _rightMenu.value
+        }
         set(menu) { _rightMenu.value = menu }
     }
 
@@ -123,6 +126,14 @@ internal extension SideMenuManager {
         case false: rightMenuNavigationController = menu
         }
     }
+
+    private class func setMenu(fromMenu: Menu?, toMenu: Menu?) -> Menu? {
+        if fromMenu?.isHidden == false {
+            Print.warning(.menuInUse, arguments: PresentDirection.left.name, required: true)
+            return fromMenu
+        }
+        return toMenu
+    }
 }
 
 private extension SideMenuManager {
@@ -193,10 +204,8 @@ private extension SideMenuManager {
             screenEdgeGestureRecognizer.edges == edge {
             view.removeGestureRecognizer(screenEdgeGestureRecognizer)
         }
-        return SideMenuScreenEdgeGestureRecognizer {
+        return SideMenuScreenEdgeGestureRecognizer(addTo: view, target: self, action: #selector(handlePresentMenuScreenEdge(_:))).with {
             $0.edges = edge
-            $0.addTarget(self, action: #selector(handlePresentMenuScreenEdge(_:)))
-            view.addGestureRecognizer($0)
         }
     }
 
@@ -204,13 +213,10 @@ private extension SideMenuManager {
         if let panGestureRecognizer = view.gestureRecognizers?.first(where: { $0 is SideMenuPanGestureRecognizer }) as? SideMenuPanGestureRecognizer {
             return panGestureRecognizer
         }
-        return SideMenuPanGestureRecognizer {
-            $0.addTarget(self, action: #selector(handlePresentMenuPan(_:)))
-            view.addGestureRecognizer($0)
-        }
+        return SideMenuPanGestureRecognizer(addTo: view, target: self, action: #selector(handlePresentMenuPan(_:)))
     }
 
-    private var activeViewController: UIViewController? {
+    var activeViewController: UIViewController? {
         return UIApplication.shared.keyWindow?.rootViewController?.activeViewController
     }
 }

Pod/Classes/SideMenuPresentationController.swift

@@ -211,11 +211,9 @@ private extension SideMenuPresentationController {
         if config.presentationStyle.menuOnTop {
             addShadow(to: presentedViewController.view)
             presentedViewController.view.layer.zPosition = 1
-            presentingViewController.view.layer.zPosition = 0
         } else {
             addShadow(to: presentingViewController.view)
-            presentingViewController.view.layer.zPosition = 1
-            presentedViewController.view.layer.zPosition = 0
+            presentedViewController.view.layer.zPosition = -1
         }
     }
 

Pod/Classes/SideMenuPresentationStyle.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 @objcMembers
-public class SideMenuPresentationStyle {
+open class SideMenuPresentationStyle {
     /// Background color behind the views and status bar color
     public var backgroundColor: UIColor = .black
     /// The starting alpha value of the menu before it appears

Pod/Classes/UISideMenuNavigationController.swift

@@ -7,7 +7,7 @@
 
 import UIKit
 
-@objc public enum MenuPushStyle: Int { case
+@objc public enum SideMenuPushStyle: Int { case
     `default`,
     popWhenPossible,
     preserve,
@@ -39,7 +39,8 @@ public struct SideMenuSettings: MenuModel {
     public var dismissOnPush: Bool = true
     public var dismissOnRotation: Bool = true
     public var dismissWhenBackgrounded: Bool = true
-    public var enableSwipeGestures: Bool = true
+    public var enableSwipeToDismissGesture: Bool = true
+    public var enableTapToDismissGesture: Bool = true
     public var initialSpringVelocity: CGFloat = 1
     public var menuWidth: CGFloat = {
         let appScreenRect = UIApplication.shared.keyWindow?.bounds ?? UIWindow().bounds
@@ -50,7 +51,7 @@ public struct SideMenuSettings: MenuModel {
     public var presentingViewControllerUseSnapshot: Bool = false
     public var presentDuration: Double = 0.35
     public var presentationStyle: SideMenuPresentationStyle = .viewSlideOut
-    public var pushStyle: MenuPushStyle = .default
+    public var pushStyle: SideMenuPushStyle = .default
     public var statusBarEndAlpha: CGFloat = 1
     public var usingSpringWithDamping: CGFloat = 1
 
@@ -67,16 +68,16 @@ internal typealias Menu = UISideMenuNavigationController
 @objcMembers
 open class UISideMenuNavigationController: UINavigationController {
 
-    private enum PropertyName: String { case
-        leftSide
+    private lazy var _leftSide = Protected(false) { [weak self] oldValue, newValue in
+        guard self?.isHidden != false else {
+            Print.warning(.property, arguments: .leftSide, required: true)
+            return oldValue
+        }
+        return newValue
     }
 
-    private lazy var _leftSide = Protected(false,
-                                           if: { [weak self] _ in self?.isHidden != false },
-                                           else: { _ in Menu.elseCondition(.leftSide) } )
-
     private weak var _sideMenuManager: SideMenuManager?
-    private weak var foundDelegate: UISideMenuNavigationControllerDelegate?
+    private weak var foundViewController: UIViewController?
     private weak var interactionController: SideMenuInteractionController?
     private var interactive: Bool = false
     private var originalBackgroundColor: UIColor?
@@ -87,7 +88,9 @@ open class UISideMenuNavigationController: UINavigationController {
     internal weak var sideMenuDelegate: UISideMenuNavigationControllerDelegate?
 
     /// The swipe to dismiss gesture.
-    private(set) weak var swipeToDismissGesture: UIPanGestureRecognizer? = nil
+    open private(set) weak var swipeToDismissGesture: UIPanGestureRecognizer? = nil
+    /// The tap to dismiss gesture.
+    open private(set) weak var tapToDismissGesture: UITapGestureRecognizer? = nil
 
     open var sideMenuManager: SideMenuManager {
         get { return _sideMenuManager ?? SideMenuManager.default }
@@ -106,31 +109,24 @@ open class UISideMenuNavigationController: UINavigationController {
     open var settings = SideMenuSettings() {
         didSet {
             setupBlur()
-            setupSwipeGestures()
+            if !enableSwipeToDismissGesture {
+                removeSwipeGesture()
+            }
+            if !enableTapToDismissGesture {
+                removeTapGesture()
+            }
         }
     }
 
-    #if !STFU_SIDEMENU
-    // This override prevents newbie developers from creating black/blank menus and opening newbie issues.
-    // If you would like to remove this override, define STFU_SIDEMENU in the Active Compilation Conditions of your .plist file.
-    // Sorry for the inconvenience experienced developers :(
-    @available(*, unavailable, renamed: "init(rootViewController:)")
-    init() {
-        fatalError("init is not available")
+    public override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+        setup()
     }
 
-    #else
-
-    public init(_ block: (UISideMenuNavigationController) -> Void) {
-        self.init()
-        block(self)
-    }
-
-    #endif
-
-    public init(rootViewController: UIViewController, settings: SideMenuSettings) {
+    public init(rootViewController: UIViewController, settings: SideMenuSettings = SideMenuSettings()) {
         super.init(rootViewController: rootViewController)
         self.settings = settings
+        setup()
     }
 
     required public init?(coder aDecoder: NSCoder) {
@@ -153,7 +149,7 @@ open class UISideMenuNavigationController: UINavigationController {
         // Dismiss keyboard to prevent weird keyboard animations from occurring during transition
         presentingViewController?.view.endEditing(true)
 
-        foundDelegate = nil
+        foundViewController = nil
         activeDelegate?.sideMenuWillAppear?(menu: self, animated: animated)
     }
     
@@ -174,24 +170,28 @@ open class UISideMenuNavigationController: UINavigationController {
     override open func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
 
+        defer {
+            activeDelegate?.sideMenuWillDisappear?(menu: self, animated: animated)
+        }
+
+        guard !isBeingDismissed else { return }
+
         // When presenting a view controller from the menu, the menu view gets moved into another transition view above our transition container
         // which can break the visual layout we had before. So, we move the menu view back to its original transition view to preserve it.
-        if dismissOnPresent && !isBeingDismissed {
-            // We're presenting a view controller from the menu, so we need to hide the menu so it isn't showing when the presented view is dismissed.
-            if let presentingView = presentingViewController?.view, let containerView = presentingView.superview {
-                containerView.addSubview(view)
-            }
+        if let presentingView = presentingViewController?.view, let containerView = presentingView.superview {
+            containerView.addSubview(view)
+        }
 
+        if dismissOnPresent {
+            // We're presenting a view controller from the menu, so we need to hide the menu so it isn't showing when the presented view is dismissed.
             transitionController?.transition(presenting: false, animated: animated, alongsideTransition: { [weak self] in
                 guard let self = self else { return }
                 self.activeDelegate?.sideMenuWillDisappear?(menu: self, animated: animated)
-            }, complete: false, completion: { [weak self] _ in
-                guard let self = self else { return }
-                self.activeDelegate?.sideMenuDidDisappear?(menu: self, animated: animated)
-                self.view.isHidden = true
+                }, complete: false, completion: { [weak self] _ in
+                    guard let self = self else { return }
+                    self.activeDelegate?.sideMenuDidDisappear?(menu: self, animated: animated)
+                    self.view.isHidden = true
             })
-        } else {
-            activeDelegate?.sideMenuWillDisappear?(menu: self, animated: animated)
         }
     }
 
@@ -202,7 +202,7 @@ open class UISideMenuNavigationController: UINavigationController {
         // the view hierarchy leaving the screen black/empty. This is because the transition moves views within a container
         // view, but dismissing without animation removes the container view before the original hierarchy is restored.
         // This check corrects that.
-        if presentedViewController == nil && view.window == nil {
+        if let foundViewController = self.visibleViewController(from: presentingViewController), foundViewController.view.window == nil {
             transitionController?.transition(presenting: false, animated: false)
         }
 
@@ -216,10 +216,10 @@ open class UISideMenuNavigationController: UINavigationController {
 
         activeDelegate?.sideMenuDidDisappear?(menu: self, animated: animated)
 
-        if dismissOnPresent && !isBeingDismissed {
-            view.isHidden = true
-        } else {
+        if isBeingDismissed {
             transitionController = nil
+        } else if dismissOnPresent {
+            view.isHidden = true
         }
     }
     
@@ -246,10 +246,15 @@ open class UISideMenuNavigationController: UINavigationController {
             self.rotating = false
         }
     }
+
+    open override func viewWillLayoutSubviews() {
+        super.viewWillLayoutSubviews()
+        transitionController?.layout()
+    }
     
     override open func pushViewController(_ viewController: UIViewController, animated: Bool) {
         let push = shouldPushViewController(viewController: viewController, animated: animated) { [weak self] _ in
-            self?.foundDelegate = nil
+            self?.foundViewController = nil
         }
         
         if push {
@@ -321,9 +326,14 @@ extension UISideMenuNavigationController: MenuModel {
         set { settings.dismissWhenBackgrounded = newValue }
     }
 
-    @IBInspectable open var enableSwipeGestures: Bool {
-        get { return settings.enableSwipeGestures }
-        set { settings.enableSwipeGestures = newValue }
+    @IBInspectable open var enableSwipeToDismissGesture: Bool {
+        get { return settings.enableSwipeToDismissGesture }
+        set { settings.enableSwipeToDismissGesture = newValue }
+    }
+
+    @IBInspectable open var enableTapToDismissGesture: Bool {
+        get { return settings.enableTapToDismissGesture }
+        set { settings.enableTapToDismissGesture = newValue }
     }
 
     @IBInspectable open var initialSpringVelocity: CGFloat {
@@ -362,7 +372,7 @@ extension UISideMenuNavigationController: MenuModel {
         set { settings.presentationStyle = newValue }
     }
 
-    @IBInspectable open var pushStyle: MenuPushStyle {
+    @IBInspectable open var pushStyle: SideMenuPushStyle {
         get { return settings.pushStyle }
         set { settings.pushStyle = newValue }
     }
@@ -401,7 +411,7 @@ extension UISideMenuNavigationController: UIViewControllerTransitioningDelegate
         return interactionController(using: animator)
     }
 
-    open func interactionController(using animator: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
+    private func interactionController(using animator: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
         guard interactive else { return nil }
         let interactionController = SideMenuInteractionController(cancelWhenBackgrounded: dismissWhenBackgrounded, completionCurve: completionCurve)
         self.interactionController = interactionController
@@ -412,21 +422,15 @@ extension UISideMenuNavigationController: UIViewControllerTransitioningDelegate
 extension UISideMenuNavigationController: SideMenuTransitionControllerDelegate {
 
     internal func sideMenuTransitionController(_ transitionController: SideMenuTransitionController, didDismiss viewController: UIViewController) {
+        interactive = false
         sideMenuManager.sideMenuTransitionDidDismiss(menu: self)
     }
 
     internal func sideMenuTransitionController(_ transitionController: SideMenuTransitionController, didPresent viewController: UIViewController) {
-        guard !presentingViewControllerUserInteractionEnabled else { return }
-
-        let panGesture = UIPanGestureRecognizer()
-        panGesture.cancelsTouchesInView = false
-        panGesture.addTarget(self, action: #selector(handleDismissMenuPan(_:)))
-        view.superview?.addGestureRecognizer(panGesture)
-
-        let tapGestureRecognizer = UITapGestureRecognizer()
-        tapGestureRecognizer.addTarget(self, action: #selector(handleDismissMenuTap(_:)))
-        tapGestureRecognizer.cancelsTouchesInView = false
-        view.superview?.addGestureRecognizer(tapGestureRecognizer)
+        interactive = false
+        removeSwipeGesture()
+        swipeToDismissGesture = addSwipeToDismissGesture(to: view.superview)
+        tapToDismissGesture = addTapToDismissGesture(to: view.superview)
     }
 }
 
@@ -556,35 +560,36 @@ private extension UISideMenuNavigationController {
         }
     }
 
-    private class func elseCondition(_ propertyName: PropertyName) {
-        Print.warning(.property, arguments: propertyName.rawValue, required: true)
-    }
-
     weak var activeDelegate: UISideMenuNavigationControllerDelegate? {
         guard !view.isHidden else { return nil }
-        return sideMenuDelegate ?? foundDelegate ?? findDelegate(forViewController: presentingViewController)
+        if let sideMenuDelegate = sideMenuDelegate {
+            return sideMenuDelegate
+        }
+        return visibleViewController(from: presentingViewController) as? UISideMenuNavigationControllerDelegate
     }
 
-    func findDelegate(forViewController: UIViewController?) -> UISideMenuNavigationControllerDelegate? {
-        if let navigationController = forViewController as? UINavigationController {
-            return findDelegate(forViewController: navigationController.topViewController)
+    func visibleViewController(from: UIViewController?) -> UIViewController? {
+        if let foundDelegate = foundViewController {
+            return foundDelegate
         }
-        if let tabBarController = forViewController as? UITabBarController {
-            return findDelegate(forViewController: tabBarController.selectedViewController)
+        if let navigationController = from as? UINavigationController {
+            return visibleViewController(from: navigationController.topViewController)
         }
-        if let splitViewController = forViewController as? UISplitViewController {
-            return findDelegate(forViewController: splitViewController.viewControllers.last)
+        if let tabBarController = from as? UITabBarController {
+            return visibleViewController(from: tabBarController.selectedViewController)
+        }
+        if let splitViewController = from as? UISplitViewController {
+            return visibleViewController(from: splitViewController.viewControllers.last)
         }
 
-        foundDelegate = forViewController as? UISideMenuNavigationControllerDelegate
-        return foundDelegate
+        foundViewController = from
+        return from
     }
 
     func setup() {
         modalPresentationStyle = .overFullScreen
 
         setupBlur()
-        setupSwipeGestures()
         registerForNotifications()
     }
 
@@ -631,12 +636,15 @@ private extension UISideMenuNavigationController {
         }
     }
 
-    func setupSwipeGestures() {
+    func removeSwipeGesture() {
         if let swipeToDismissGesture = swipeToDismissGesture {
             swipeToDismissGesture.view?.removeGestureRecognizer(swipeToDismissGesture)
         }
-        if enableSwipeGestures {
-            swipeToDismissGesture = addDismissPanGesture(to: view)
+    }
+
+    func removeTapGesture() {
+        if let tapToDismissGesture = tapToDismissGesture {
+            tapToDismissGesture.view?.removeGestureRecognizer(tapToDismissGesture)
         }
     }
 
@@ -666,16 +674,23 @@ private extension UISideMenuNavigationController {
         }
     }
 
-    @discardableResult func addDismissPanGesture(to view: UIView) -> UIPanGestureRecognizer {
-        return UIPanGestureRecognizer {
+    @discardableResult func addSwipeToDismissGesture(to view: UIView?) -> UIPanGestureRecognizer? {
+        guard enableSwipeToDismissGesture else { return nil }
+        return UIPanGestureRecognizer(addTo: view, target: self, action: #selector(handleDismissMenuPan(_:)))?.with {
+            $0.cancelsTouchesInView = false
+        }
+    }
+
+    @discardableResult func addTapToDismissGesture(to view: UIView?) -> UITapGestureRecognizer? {
+        guard enableTapToDismissGesture else { return nil }
+        return UITapGestureRecognizer(addTo: view, target: self, action: #selector(handleDismissMenuTap(_:)))?.with {
             $0.cancelsTouchesInView = false
-            $0.addTarget(self, action: #selector(handleDismissMenuPan(_:)))
-            view.addGestureRecognizer($0)
         }
     }
 
     @objc func handleDismissMenuTap(_ tap: UITapGestureRecognizer) {
-        guard view.window?.hitTest(tap.location(in: nil), with: nil) == view.superview else { return }
+        let hitTest = view.window?.hitTest(tap.location(in: view.superview), with: nil)
+        guard hitTest == view.superview else { return }
         dismissMenu()
     }
 

Pods/Pods.xcodeproj/project.pbxproj

@@ -17,6 +17,7 @@
 		5B0A5C9933D0FCD08E12CFFB56145333 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3212113385A8FBBDB272BD23C409FF61 /* Foundation.framework */; };
 		614FC39555CB129D97FC24B2D953A427 /* SideMenuPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61AFB3209BCB97295281AC6437FB346B /* SideMenuPresentationController.swift */; };
 		6E6E17C0E8351D23CB4B20332C70BE61 /* Print.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CB39D726F07EA27650309A1A3213412 /* Print.swift */; };
+		8428210422E0540800C6F2D8 /* Deprecations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428210022E0448700C6F2D8 /* Deprecations.swift */; };
 		89B2CFA98A07964FBD2D7775FF5FB98D /* Pods-Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D6D7C498FA339E02BD53ECB8916CEA8E /* Pods-Example-dummy.m */; };
 		A2ACFE2D997BC8F1DA4EE3064A4270DD /* SideMenuInteractionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB64592703EA9A196B5C0F07BA1A918A /* SideMenuInteractionController.swift */; };
 		BD5C0C12B6BB0BF6DA294E095B35E38D /* Initializable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00F847D27577EF5335081BFA43A0BFA3 /* Initializable.swift */; };
@@ -39,16 +40,16 @@
 
 /* Begin PBXFileReference section */
 		00F847D27577EF5335081BFA43A0BFA3 /* Initializable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Initializable.swift; path = Pod/Classes/Initializable.swift; sourceTree = "<group>"; };
-		0FD529BD299167F85338CB5BB3463BED /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = "<group>"; };
-		105D784922AF9F627D902729C7D0E3CA /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = "<group>"; };
+		0FD529BD299167F85338CB5BB3463BED /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
+		105D784922AF9F627D902729C7D0E3CA /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		13846826E721392191757B9033D6F63F /* Protected.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Protected.swift; path = Pod/Classes/Protected.swift; sourceTree = "<group>"; };
 		1D01FD908F7943A6131CA6F66DD0CA68 /* SideMenu-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "SideMenu-Info.plist"; sourceTree = "<group>"; };
-		1F667CC0E19EAF34E5A4119E2121F585 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Example.framework; path = "Pods-Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
+		1F667CC0E19EAF34E5A4119E2121F585 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		1FE7B8C8447DD35D435B2AF4A23E221C /* SideMenuManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SideMenuManager.swift; path = Pod/Classes/SideMenuManager.swift; sourceTree = "<group>"; };
 		243410B9535472556EA4BB6DBC133A0D /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
 		2CB39D726F07EA27650309A1A3213412 /* Print.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Print.swift; path = Pod/Classes/Print.swift; sourceTree = "<group>"; };
 		30C3188EE68841BE36716860BE079AF8 /* SideMenuTransitionController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SideMenuTransitionController.swift; path = Pod/Classes/SideMenuTransitionController.swift; sourceTree = "<group>"; };
-		319D06AA0D1D0BA345459C039040A1ED /* SideMenu.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SideMenu.framework; path = SideMenu.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		319D06AA0D1D0BA345459C039040A1ED /* SideMenu.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SideMenu.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		31C1D37707DFAA5E6A164BCC07834264 /* Pods-Example-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Example-Info.plist"; sourceTree = "<group>"; };
 		3212113385A8FBBDB272BD23C409FF61 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		35C305D3797C284E6F5BAA1D3E6F9BF8 /* Pods-Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-Example.modulemap"; sourceTree = "<group>"; };
@@ -57,16 +58,17 @@
 		441854E35F81731E63E53DC7E4EEAD9D /* Pods-Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Example-acknowledgements.markdown"; sourceTree = "<group>"; };
 		61AFB3209BCB97295281AC6437FB346B /* SideMenuPresentationController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SideMenuPresentationController.swift; path = Pod/Classes/SideMenuPresentationController.swift; sourceTree = "<group>"; };
 		7825A90E082A1582EB16256B0E722B3F /* Pods-Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Example-umbrella.h"; sourceTree = "<group>"; };
+		8428210022E0448700C6F2D8 /* Deprecations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Deprecations.swift; path = Pod/Classes/Deprecations.swift; sourceTree = "<group>"; };
 		8F8B09C72B577EFDB20A3EFF4F0C668A /* UISideMenuNavigationController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = UISideMenuNavigationController.swift; path = Pod/Classes/UISideMenuNavigationController.swift; sourceTree = "<group>"; };
 		9CF977D7FB42D367F2810037EBA59B7D /* SideMenu-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SideMenu-dummy.m"; sourceTree = "<group>"; };
-		9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		AB64592703EA9A196B5C0F07BA1A918A /* SideMenuInteractionController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SideMenuInteractionController.swift; path = Pod/Classes/SideMenuInteractionController.swift; sourceTree = "<group>"; };
 		AFECBC24E09D0D25F822C27BD944AFD4 /* Pods-Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Example-frameworks.sh"; sourceTree = "<group>"; };
 		B45138496B85A072654D1D0F8EBBEDE5 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
 		B5F10B146FA49E99D07F0FA0E38ABE8F /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Pod/Classes/Models.swift; sourceTree = "<group>"; };
 		BB1EC6DFBB713FC2F280D596714173EC /* SideMenu.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SideMenu.xcconfig; sourceTree = "<group>"; };
 		BD4CEC04022777F53C1CA2113A43FACE /* SideMenu-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SideMenu-prefix.pch"; sourceTree = "<group>"; };
-		BE262D79CAE897127A1984945DCE9FEE /* SideMenu.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = SideMenu.podspec; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		BE262D79CAE897127A1984945DCE9FEE /* SideMenu.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; path = SideMenu.podspec; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		D154DB98A04C7BD96E4EFBBD3FE0008A /* SideMenuPresentationStyle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SideMenuPresentationStyle.swift; path = Pod/Classes/SideMenuPresentationStyle.swift; sourceTree = "<group>"; };
 		D6D7C498FA339E02BD53ECB8916CEA8E /* Pods-Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Example-dummy.m"; sourceTree = "<group>"; };
 		E656C89A7C466C66F803FC806E30B29E /* SideMenu.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = SideMenu.modulemap; sourceTree = "<group>"; };
@@ -133,6 +135,9 @@
 		B2A94553E0F1BCEBF406CC59D290924B /* SideMenu */ = {
 			isa = PBXGroup;
 			children = (
+				71A499AE33E397EBD7FA1A9D5B8440BA /* Pod */,
+				B5D061624D54AFB703E72CCF860BDB15 /* Support Files */,
+				8428210022E0448700C6F2D8 /* Deprecations.swift */,
 				F1B25193EDCA447F119795F68F75BF05 /* Extensions.swift */,
 				00F847D27577EF5335081BFA43A0BFA3 /* Initializable.swift */,
 				B5F10B146FA49E99D07F0FA0E38ABE8F /* Models.swift */,
@@ -145,8 +150,6 @@
 				30C3188EE68841BE36716860BE079AF8 /* SideMenuTransitionController.swift */,
 				8F8B09C72B577EFDB20A3EFF4F0C668A /* UISideMenuNavigationController.swift */,
 				3ACA278071ED85D04DA83677D6C60528 /* UITableViewVibrantCell.swift */,
-				71A499AE33E397EBD7FA1A9D5B8440BA /* Pod */,
-				B5D061624D54AFB703E72CCF860BDB15 /* Support Files */,
 			);
 			name = SideMenu;
 			path = ..;
@@ -276,6 +279,11 @@
 			attributes = {
 				LastSwiftUpdateCheck = 1100;
 				LastUpgradeCheck = 1100;
+				TargetAttributes = {
+					0AEE99A309977BD12A049FF48AF9BA4B = {
+						LastSwiftMigration = 1020;
+					};
+				};
 			};
 			buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -317,6 +325,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8428210422E0540800C6F2D8 /* Deprecations.swift in Sources */,
 				31E79D7BA42208D00E73C18CBAF1598E /* Extensions.swift in Sources */,
 				BD5C0C12B6BB0BF6DA294E095B35E38D /* Initializable.swift in Sources */,
 				0D2D410A6087D4E0A54642165913EF30 /* Models.swift in Sources */,
@@ -454,6 +463,7 @@
 			baseConfigurationReference = 243410B9535472556EA4BB6DBC133A0D /* Pods-Example.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_WEAK = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -477,6 +487,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -537,8 +548,7 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
 				SYMROOT = "${SRCROOT}/../build";
 			};
@@ -549,6 +559,7 @@
 			baseConfigurationReference = B45138496B85A072654D1D0F8EBBEDE5 /* Pods-Example.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_WEAK = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -572,6 +583,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";

README.md

@@ -5,7 +5,7 @@
 [![Platform](https://img.shields.io/cocoapods/p/SideMenu.svg?style=flat-square)](http://cocoapods.org/pods/SideMenu)
 
 ### If you like SideMenu, give it a ★ at the top right of this page.
-#### Using SideMenu in your app? [Send](mailto:yo@massappeal.co?subject=SideMenu%20in%20action!) me a link to your app in the app store!
+#### SideMenu needs your help! If you're a skilled iOS developer and want to help maintain this repository and answer issues asked by the community, please [send me an email](mailto:yo@massappeal.co?subject=I%20Want%20To%20Help!).
 
 > Hi, I'm Jon Kent and I am an iOS designer, developer, and mobile strategist. I love coffee and play the drums.
 > * [**Hire me**](mailto:yo@massappeal.co?subject=Let's%20build%20something%20amazing) to help you make cool stuff. *Note: If you're having a problem with SideMenu, please open an [issue](https://github.com/jonkykong/SideMenu/issues/new) and do not email me.*
@@ -72,10 +72,10 @@ use_frameworks!
 pod 'SideMenu'
 
 # For Swift 5 use:
-# pod 'SideMenu', '~> 5.0.0'
+# pod 'SideMenu', '~> 6.0'
 
-# For Swift 4 (no longer maintained) use:
-# pod 'SideMenu', '~> 4.0.0'
+# For Swift 4.2 (no longer maintained) use:
+# pod 'SideMenu', '~> 5.0'
 ```
 
 Then, run the following command:
@@ -137,11 +137,11 @@ dismiss(animated: true, completion: nil)
 To use gestures you have to use the `SideMenuManager`. In your `AppDelegate` do something like this:
 ``` swift
 // Define the menus
-let menuLeftNavigationController = UISideMenuNavigationController(rootViewController: YourViewController)
-SideMenuManager.default.menuLeftNavigationController = menuLeftNavigationController
+let leftMenuNavigationController = UISideMenuNavigationController(rootViewController: YourViewController)
+SideMenuManager.default.leftMenuNavigationController = leftMenuNavigationController
 
-let menuRightNavigationController = UISideMenuNavigationController(rootViewController: YourViewController)
-SideMenuManager.default.menuRightNavigationController = menuRightNavigationController
+let rightMenuNavigationController = UISideMenuNavigationController(rootViewController: YourViewController)
+SideMenuManager.default.rightMenuNavigationController = rightMenuNavigationController
 
 // Setup gestures: the left and/or right menus must be set up (above) for these to work.
 // Note that these continue to work on the Navigation Controller independent of the view controller it displays!
@@ -149,9 +149,9 @@ SideMenuManager.default.addPanGestureToPresent(toView: self.navigationController
 SideMenuManager.default.addScreenEdgePanGesturesToPresent(toView: self.navigationController!.view)
 
 // (Optional) Prevent status bar area from turning black when menu appears:
-menuLeftNavigationController.statusBarEndAlpha = 0
+leftMenuNavigationController.statusBarEndAlpha = 0
 // Copy all settings to the other menu
-menuRightNavigationController.settings = menuLeftNavigationController.settings
+rightMenuNavigationController.settings = leftMenuNavigationController.settings
 ```
 That's it.
 ### Customization
@@ -159,9 +159,9 @@ That's it.
 `SideMenuManager` supports the following:
 ``` swift
 /// The left menu.
-open var menuLeftNavigationController: UISideMenuNavigationController?
+open var leftMenuNavigationController: UISideMenuNavigationController?
 /// The right menu.
-public var menuRightNavigationController: UISideMenuNavigationController?
+public var rightMenuNavigationController: UISideMenuNavigationController?
 /**
  Adds screen edge gestures for both left and right sides to a view to present a menu.
 
@@ -217,8 +217,10 @@ var dismissOnPush: Bool = true
 var dismissOnRotation: Bool = true
 /// Automatically dismisses the menu when app goes to the background.
 var dismissWhenBackgrounded: Bool = true
-/// Enable or disable gestures that would swipe to dismiss the menu. Default is true.
-var enableSwipeGestures: Bool = true
+/// Enable or disable a swipe gesture that dismisses the menu. Will not be triggered when `presentingViewControllerUserInteractionEnabled` is set to true. Default is true.
+var enableSwipeToDismissGesture: Bool = true
+/// Enable or disable a tap gesture that dismisses the menu. Will not be triggered when `presentingViewControllerUserInteractionEnabled` is set to true. Default is true.
+var enableTapToDismissGesture: Bool = true
 /// The animation initial spring velocity when a menu is displayed. Ignored when displayed with a gesture.
 var initialSpringVelocity: CGFloat = 1
 /// Whether the menu appears on the right or left side of the screen. Right is the default. This property cannot be changed after the menu has loaded.
@@ -256,21 +258,21 @@ var isHidden: Bool
 There are 8 pre-defined `SideMenuPresentStyle` options:
 ``` swift
 /// Menu slides in over the existing view.
-static let menuSlideIn = SideMenuPresentStyle
+static let menuSlideIn: SideMenuPresentStyle
 /// The existing view slides out to reveal the menu underneath.
-static let viewSlideOut = SideMenuPresentStyle
+static let viewSlideOut: SideMenuPresentStyle
 /// The existing view slides out while the menu slides in.
-static let viewSlideOutMenuIn = SideMenuPresentStyle
+static let viewSlideOutMenuIn: SideMenuPresentStyle
 /// The menu dissolves in over the existing view.
-static let menuDissolveIn = SideMenuPresentStyle
+static let menuDissolveIn: SideMenuPresentStyle
 /// The existing view slides out while the menu partially slides in.
-static let viewSlideOutMenuPartialIn = SideMenuPresentStyle
+static let viewSlideOutMenuPartialIn: SideMenuPresentStyle
 /// The existing view slides out while the menu slides out from under it.
-static let viewSlideOutMenuOut = SideMenuPresentStyle
+static let viewSlideOutMenuOut: SideMenuPresentStyle
 /// The existing view slides out while the menu partially slides out from under it.
-static let viewSlideOutMenuPartialOut = SideMenuPresentStyle
+static let viewSlideOutMenuPartialOut: SideMenuPresentStyle
 /// The existing view slides out and shrinks to reveal the menu underneath.
-static let viewSlideOutMenuZoom = SideMenuPresentStyle
+static let viewSlideOutMenuZoom: SideMenuPresentStyle
 ```
 #### UISideMenuNavigationControllerDelegate
 To receive notifications when a menu is displayed from a view controller, have it adhere to the  `UISideMenuNavigationControllerDelegate` protocol:

SideMenu.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "SideMenu"
-  s.version          = "6.0.0"
+  s.version          = "6.1.2"
   s.summary          = "Simple side menu control for iOS in Swift inspired by Facebook. Right and Left sides. No coding required."
 
 # This description is used to generate tags and improve search results.

SideMenu.xcodeproj/project.pbxproj

@@ -16,6 +16,16 @@
 		7B552D5D1DCC65830010301C /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B552D5C1DCC65830010301C /* Launch Screen.storyboard */; };
 		7B5FA9B61DCB269700278DF6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B5FA9B51DCB269700278DF6 /* Main.storyboard */; };
 		84276D8A2282929A0095B7C5 /* SideMenuManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84276D892282929A0095B7C5 /* SideMenuManager.swift */; };
+		842820EF22DDD1BC00C6F2D8 /* Protected.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820EE22DDD1BC00C6F2D8 /* Protected.swift */; };
+		842820F622DDD1E800C6F2D8 /* SideMenuPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820F022DDD1E800C6F2D8 /* SideMenuPresentationController.swift */; };
+		842820F722DDD1E800C6F2D8 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820F122DDD1E800C6F2D8 /* Models.swift */; };
+		842820F822DDD1E800C6F2D8 /* SideMenuTransitionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820F222DDD1E800C6F2D8 /* SideMenuTransitionController.swift */; };
+		842820F922DDD1E800C6F2D8 /* Print.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820F322DDD1E800C6F2D8 /* Print.swift */; };
+		842820FA22DDD1E800C6F2D8 /* Initializable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820F422DDD1E800C6F2D8 /* Initializable.swift */; };
+		842820FB22DDD1E800C6F2D8 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820F522DDD1E800C6F2D8 /* Extensions.swift */; };
+		842820FD22DDD21100C6F2D8 /* SideMenuPresentationStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820FC22DDD21100C6F2D8 /* SideMenuPresentationStyle.swift */; };
+		842820FF22DDD24200C6F2D8 /* SideMenuInteractionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820FE22DDD24200C6F2D8 /* SideMenuInteractionController.swift */; };
+		8428210322E0449300C6F2D8 /* Deprecations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428210222E0449300C6F2D8 /* Deprecations.swift */; };
 		8461A2D51E145A08001DA4F8 /* UISideMenuNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8461A2D11E145A08001DA4F8 /* UISideMenuNavigationController.swift */; };
 		8461A2D61E145A08001DA4F8 /* UITableViewVibrantCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8461A2D21E145A08001DA4F8 /* UITableViewVibrantCell.swift */; };
 		84B489B51DD469B000D6CB43 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 84B489B21DD469B000D6CB43 /* LICENSE */; };
@@ -43,6 +53,16 @@
 		7B5FA9B51DCB269700278DF6 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		7B9DC9041DC6E8C1000D4007 /* SideMenu.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SideMenu.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		84276D892282929A0095B7C5 /* SideMenuManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenuManager.swift; path = Pod/Classes/SideMenuManager.swift; sourceTree = "<group>"; };
+		842820EE22DDD1BC00C6F2D8 /* Protected.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Protected.swift; path = Pod/Classes/Protected.swift; sourceTree = "<group>"; };
+		842820F022DDD1E800C6F2D8 /* SideMenuPresentationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenuPresentationController.swift; path = Pod/Classes/SideMenuPresentationController.swift; sourceTree = "<group>"; };
+		842820F122DDD1E800C6F2D8 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Pod/Classes/Models.swift; sourceTree = "<group>"; };
+		842820F222DDD1E800C6F2D8 /* SideMenuTransitionController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenuTransitionController.swift; path = Pod/Classes/SideMenuTransitionController.swift; sourceTree = "<group>"; };
+		842820F322DDD1E800C6F2D8 /* Print.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Print.swift; path = Pod/Classes/Print.swift; sourceTree = "<group>"; };
+		842820F422DDD1E800C6F2D8 /* Initializable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Initializable.swift; path = Pod/Classes/Initializable.swift; sourceTree = "<group>"; };
+		842820F522DDD1E800C6F2D8 /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = Pod/Classes/Extensions.swift; sourceTree = "<group>"; };
+		842820FC22DDD21100C6F2D8 /* SideMenuPresentationStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenuPresentationStyle.swift; path = Pod/Classes/SideMenuPresentationStyle.swift; sourceTree = "<group>"; };
+		842820FE22DDD24200C6F2D8 /* SideMenuInteractionController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenuInteractionController.swift; path = Pod/Classes/SideMenuInteractionController.swift; sourceTree = "<group>"; };
+		8428210222E0449300C6F2D8 /* Deprecations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Deprecations.swift; path = Pod/Classes/Deprecations.swift; sourceTree = "<group>"; };
 		8461A2D11E145A08001DA4F8 /* UISideMenuNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UISideMenuNavigationController.swift; path = Pod/Classes/UISideMenuNavigationController.swift; sourceTree = "<group>"; };
 		8461A2D21E145A08001DA4F8 /* UITableViewVibrantCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UITableViewVibrantCell.swift; path = Pod/Classes/UITableViewVibrantCell.swift; sourceTree = "<group>"; };
 		84B489B21DD469B000D6CB43 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
@@ -86,10 +106,20 @@
 		65FF1B3F1DE33097007B0845 /* Source */ = {
 			isa = PBXGroup;
 			children = (
+				8428210222E0449300C6F2D8 /* Deprecations.swift */,
+				842820F522DDD1E800C6F2D8 /* Extensions.swift */,
+				842820F422DDD1E800C6F2D8 /* Initializable.swift */,
+				842820F122DDD1E800C6F2D8 /* Models.swift */,
+				842820F322DDD1E800C6F2D8 /* Print.swift */,
+				842820EE22DDD1BC00C6F2D8 /* Protected.swift */,
+				65FF1B3D1DE321D8007B0845 /* SideMenu.h */,
+				842820FE22DDD24200C6F2D8 /* SideMenuInteractionController.swift */,
 				84276D892282929A0095B7C5 /* SideMenuManager.swift */,
+				842820F022DDD1E800C6F2D8 /* SideMenuPresentationController.swift */,
+				842820FC22DDD21100C6F2D8 /* SideMenuPresentationStyle.swift */,
+				842820F222DDD1E800C6F2D8 /* SideMenuTransitionController.swift */,
 				8461A2D11E145A08001DA4F8 /* UISideMenuNavigationController.swift */,
 				8461A2D21E145A08001DA4F8 /* UITableViewVibrantCell.swift */,
-				65FF1B3D1DE321D8007B0845 /* SideMenu.h */,
 			);
 			name = Source;
 			sourceTree = "<group>";
@@ -344,8 +374,18 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				842820EF22DDD1BC00C6F2D8 /* Protected.swift in Sources */,
 				8461A2D51E145A08001DA4F8 /* UISideMenuNavigationController.swift in Sources */,
+				842820FD22DDD21100C6F2D8 /* SideMenuPresentationStyle.swift in Sources */,
+				842820F822DDD1E800C6F2D8 /* SideMenuTransitionController.swift in Sources */,
+				842820FF22DDD24200C6F2D8 /* SideMenuInteractionController.swift in Sources */,
+				842820F922DDD1E800C6F2D8 /* Print.swift in Sources */,
 				84276D8A2282929A0095B7C5 /* SideMenuManager.swift in Sources */,
+				842820FB22DDD1E800C6F2D8 /* Extensions.swift in Sources */,
+				842820F722DDD1E800C6F2D8 /* Models.swift in Sources */,
+				842820F622DDD1E800C6F2D8 /* SideMenuPresentationController.swift in Sources */,
+				842820FA22DDD1E800C6F2D8 /* Initializable.swift in Sources */,
+				8428210322E0449300C6F2D8 /* Deprecations.swift in Sources */,
 				8461A2D61E145A08001DA4F8 /* UITableViewVibrantCell.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;