Refactor of logic for menuEnableSwipeGestures so it won’t conflict with swipe based controls (UISlider) in menu.

SideMenu/SideMenuManager.swift

@@ -81,9 +81,6 @@ open class SideMenuManager : NSObject {
     /// The right menu swipe to dismiss gesture.
     open static weak var menuRightSwipeToDismissGesture: UIPanGestureRecognizer?
     
-    /// Enable or disable gestures that would swipe to present or dismiss the menu. Default is true.
-    open static var menuEnableSwipeGestures: Bool = true
-    
     /// Enable or disable interaction with the presenting view controller while the menu is displayed. Enabling may make it difficult to dismiss the menu or cause exceptions if the user tries to present and already presented menu. Default is false.
     open static var menuPresentingViewControllerUserInteractionEnabled: Bool = false
     
@@ -96,6 +93,9 @@ open class SideMenuManager : NSObject {
     /// When true, pushViewController called within the menu it will push the new view controller inside of the menu. Otherwise, it is pushed on the menu's presentingViewController. Default is false.
     open static var menuAllowSubmenus: Bool = false
     
+    /// When true, pushViewController will replace the last view controller in the navigation controller's viewController stack instead of appending to it. This makes menus similar to tab bar controller behavior.
+    open static var menuReplaceOnPush: Bool = false
+    
     /// -Warning: Deprecated. Use `menuAnimationTransformScaleFactor` instead.
     @available(*, deprecated, renamed: "menuAnimationTransformScaleFactor")
     open static var menuAnimationShrinkStrength: CGFloat {
@@ -162,20 +162,32 @@ open class SideMenuManager : NSObject {
             return
         }
         
-        let exitPanGesture = UIPanGestureRecognizer()
-        exitPanGesture.addTarget(SideMenuTransition.self, action:#selector(SideMenuTransition.handleHideMenuPan(_:)))
-        forMenu.view.addGestureRecognizer(exitPanGesture)
+        if menuEnableSwipeGestures {
+            let exitPanGesture = UIPanGestureRecognizer()
+            exitPanGesture.addTarget(SideMenuTransition.self, action:#selector(SideMenuTransition.handleHideMenuPan(_:)))
+            forMenu.view.addGestureRecognizer(exitPanGesture)
+            if leftSide {
+                menuLeftSwipeToDismissGesture = exitPanGesture
+            } else {
+                menuRightSwipeToDismissGesture = exitPanGesture
+            }
+        }
         forMenu.transitioningDelegate = SideMenuTransition.singleton
         forMenu.modalPresentationStyle = .overFullScreen
         forMenu.leftSide = leftSide
-        if leftSide {
-            menuLeftSwipeToDismissGesture = exitPanGesture
-        } else {
-            menuRightSwipeToDismissGesture = exitPanGesture
-        }
         updateMenuBlurIfNecessary()
     }
     
+    /// Enable or disable gestures that would swipe to present or dismiss the menu. Default is true.
+    open static var menuEnableSwipeGestures: Bool = true {
+        didSet {
+            menuLeftSwipeToDismissGesture?.view?.removeGestureRecognizer(menuLeftSwipeToDismissGesture!)
+            menuRightSwipeToDismissGesture?.view?.removeGestureRecognizer(menuRightSwipeToDismissGesture!)
+            setupNavigationController(menuLeftNavigationController, leftSide: true)
+            setupNavigationController(menuRightNavigationController, leftSide: false)
+        }
+    }
+    
     fileprivate class func updateMenuBlurIfNecessary() {
         let menuBlurBlock = { (forMenu: UISideMenuNavigationController?) in
             if let forMenu = forMenu {
@@ -194,7 +206,7 @@ open class SideMenuManager : NSObject {
             let menuBlurEffectStyle = menuBlurEffectStyle,
             let view = forMenu.visibleViewController?.view
             , !UIAccessibilityIsReduceTransparencyEnabled() else {
-            return
+                return
         }
         
         if forMenu.originalMenuBackgroundColor == nil {
@@ -219,7 +231,7 @@ open class SideMenuManager : NSObject {
         guard let forMenu = forMenu,
             let originalMenuBackgroundColor = forMenu.originalMenuBackgroundColor,
             let view = forMenu.visibleViewController?.view else {
-            return
+                return
         }
         
         view.backgroundColor = originalMenuBackgroundColor

SideMenu/SideMenuTransition.swift

@@ -58,10 +58,6 @@ open class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewContr
     }
     
     internal class func handlePresentMenuPan(_ pan: UIPanGestureRecognizer) {
-        guard SideMenuManager.menuEnableSwipeGestures else {
-            return
-        }
-        
         // how much distance have we panned in reference to the parent view?
         guard let view = viewControllerForPresentedMenu != nil ? viewControllerForPresentedMenu?.view : pan.view else {
             return
@@ -125,10 +121,6 @@ open class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewContr
     }
     
     internal class func handleHideMenuPan(_ pan: UIPanGestureRecognizer) {
-        if !SideMenuManager.menuEnableSwipeGestures {
-            return
-        }
-        
         let translation = pan.translation(in: pan.view!)
         let direction:CGFloat = SideMenuTransition.presentDirection == .left ? -1 : 1
         let distance = translation.x / SideMenuManager.menuWidth * direction
@@ -373,48 +365,48 @@ open class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewContr
                 SideMenuTransition.hideMenuStart()
             }
             menuView?.isUserInteractionEnabled = false
-            }) { (finished) -> Void in
-                // tell our transitionContext object that we've finished animating
-                if transitionContext.transitionWasCancelled {
-                    let viewControllerForPresentedMenu = SideMenuTransition.viewControllerForPresentedMenu
-                    
-                    if self.presenting {
-                        SideMenuTransition.hideMenuComplete()
-                    } else {
-                        SideMenuTransition.presentMenuComplete()
-                    }
-                    menuView?.isUserInteractionEnabled = true
-                    
-                    transitionContext.completeTransition(false)
-                    
-                    if SideMenuTransition.switchMenus {
-                        SideMenuTransition.switchMenus = false
-                        viewControllerForPresentedMenu?.present(SideMenuTransition.presentDirection == .left ? SideMenuManager.menuLeftNavigationController! : SideMenuManager.menuRightNavigationController!, animated: true, completion: nil)
-                    }
-                    
-                    return
-                }
+        }) { (finished) -> Void in
+            // tell our transitionContext object that we've finished animating
+            if transitionContext.transitionWasCancelled {
+                let viewControllerForPresentedMenu = SideMenuTransition.viewControllerForPresentedMenu
                 
                 if self.presenting {
+                    SideMenuTransition.hideMenuComplete()
+                } else {
                     SideMenuTransition.presentMenuComplete()
-                    menuView?.isUserInteractionEnabled = true
-                    transitionContext.completeTransition(true)
-                    switch SideMenuManager.menuPresentMode {
-                    case .viewSlideOut, .viewSlideInOut:
-                        container.addSubview(topView!)
-                    case .menuSlideIn, .menuDissolveIn:
-                        container.insertSubview(topView!, at: 0)
-                    }
-                    if let statusBarView = SideMenuTransition.statusBarView {
-                        container.bringSubview(toFront: statusBarView)
-                    }
-                    
-                    return
+                }
+                menuView?.isUserInteractionEnabled = true
+                
+                transitionContext.completeTransition(false)
+                
+                if SideMenuTransition.switchMenus {
+                    SideMenuTransition.switchMenus = false
+                    viewControllerForPresentedMenu?.present(SideMenuTransition.presentDirection == .left ? SideMenuManager.menuLeftNavigationController! : SideMenuManager.menuRightNavigationController!, animated: true, completion: nil)
                 }
                 
-                SideMenuTransition.hideMenuComplete()
+                return
+            }
+            
+            if self.presenting {
+                SideMenuTransition.presentMenuComplete()
+                menuView?.isUserInteractionEnabled = true
                 transitionContext.completeTransition(true)
-                menuView?.removeFromSuperview()
+                switch SideMenuManager.menuPresentMode {
+                case .viewSlideOut, .viewSlideInOut:
+                    container.addSubview(topView!)
+                case .menuSlideIn, .menuDissolveIn:
+                    container.insertSubview(topView!, at: 0)
+                }
+                if let statusBarView = SideMenuTransition.statusBarView {
+                    container.bringSubview(toFront: statusBarView)
+                }
+                
+                return
+            }
+            
+            SideMenuTransition.hideMenuComplete()
+            transitionContext.completeTransition(true)
+            menuView?.removeFromSuperview()
         }
     }
     
@@ -450,7 +442,8 @@ open class SideMenuTransition: UIPercentDrivenInteractiveTransition, UIViewContr
     }
     
     internal func applicationDidEnterBackgroundNotification() {
-        if let menuViewController: UINavigationController = SideMenuTransition.presentDirection == .left ? SideMenuManager.menuLeftNavigationController : SideMenuManager.menuRightNavigationController {
+        if let menuViewController: UINavigationController = SideMenuTransition.presentDirection == .left ? SideMenuManager.menuLeftNavigationController : SideMenuManager.menuRightNavigationController,
+            menuViewController.presentedViewController == nil {
             SideMenuTransition.hideMenuStart()
             SideMenuTransition.hideMenuComplete()
             menuViewController.dismiss(animated: false, completion: nil)