Podspec update

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?) {
@@ -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/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

@@ -106,7 +106,9 @@ open class UISideMenuNavigationController: UINavigationController {
     open var settings = SideMenuSettings() {
         didSet {
             setupBlur()
-            setupSwipeGestures()
+            if !enableSwipeGestures {
+                removeSwipeGesture()
+            }
         }
     }
 
@@ -164,12 +166,12 @@ open class UISideMenuNavigationController: UINavigationController {
 
         // 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 let presentingView = presentingViewController?.view, let containerView = presentingView.superview {
+            containerView.addSubview(view)
+        }
+
         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)
-            }
-
             transitionController?.transition(presenting: false, animated: animated, alongsideTransition: { [weak self] in
                 guard let self = self else { return }
                 self.activeDelegate?.sideMenuWillDisappear?(menu: self, animated: animated)
@@ -204,11 +206,11 @@ open class UISideMenuNavigationController: UINavigationController {
 
         activeDelegate?.sideMenuDidDisappear?(menu: self, animated: animated)
 
-        if dismissOnPresent && !isBeingDismissed {
-            view.isHidden = true
-        } else {
+        if isBeingDismissed {
             transitionController = nil
             interactive = false
+        } else if dismissOnPresent {
+            view.isHidden = true
         }
     }
     
@@ -235,6 +237,11 @@ 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
@@ -405,12 +412,8 @@ extension UISideMenuNavigationController: SideMenuTransitionControllerDelegate {
     }
 
     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)
+        removeSwipeGesture()
+        swipeToDismissGesture = addDismissPanGesture(to: view.superview)
 
         let tapGestureRecognizer = UITapGestureRecognizer()
         tapGestureRecognizer.addTarget(self, action: #selector(handleDismissMenuTap(_:)))
@@ -579,7 +582,6 @@ private extension UISideMenuNavigationController {
         modalPresentationStyle = .overFullScreen
 
         setupBlur()
-        setupSwipeGestures()
         registerForNotifications()
     }
 
@@ -626,13 +628,10 @@ private extension UISideMenuNavigationController {
         }
     }
 
-    func setupSwipeGestures() {
+    func removeSwipeGesture() {
         if let swipeToDismissGesture = swipeToDismissGesture {
             swipeToDismissGesture.view?.removeGestureRecognizer(swipeToDismissGesture)
         }
-        if enableSwipeGestures {
-            swipeToDismissGesture = addDismissPanGesture(to: view)
-        }
     }
 
     func registerForNotifications() {
@@ -661,7 +660,8 @@ private extension UISideMenuNavigationController {
         }
     }
 
-    @discardableResult func addDismissPanGesture(to view: UIView) -> UIPanGestureRecognizer {
+    @discardableResult func addDismissPanGesture(to view: UIView?) -> UIPanGestureRecognizer? {
+        guard enableSwipeGestures, let view = view else { return nil }
         return UIPanGestureRecognizer {
             $0.cancelsTouchesInView = false
             $0.addTarget(self, action: #selector(handleDismissMenuPan(_:)))

SideMenu.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "SideMenu"
-  s.version          = "6.0.4"
+  s.version          = "6.0.7"
   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.