Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 73be895065 | |||
| 00003f098f | |||
| f4b74330c0 | |||
| fb25017bc7 | |||
| 1841827ef9 | |||
| a5852d8fd0 |
@@ -10,7 +10,7 @@ import UIKit
|
||||
class PresentedViewController: UIViewController {
|
||||
|
||||
@IBAction private func close() {
|
||||
self.dismiss(animated: true, completion: nil)
|
||||
dismiss(animated: true, completion: nil)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -200,7 +200,6 @@ open class SideMenuNavigationController: UINavigationController {
|
||||
|
||||
// We had presented a view before, so lets dismiss ourselves as already acted upon
|
||||
if view.isHidden {
|
||||
transitionController?.transition(presenting: false, animated: false)
|
||||
dismiss(animated: false, completion: { [weak self] in
|
||||
self?.view.isHidden = false
|
||||
})
|
||||
@@ -325,7 +324,8 @@ open class SideMenuNavigationController: UINavigationController {
|
||||
|
||||
override open var transitioningDelegate: UIViewControllerTransitioningDelegate? {
|
||||
get {
|
||||
transitionController = transitionController ?? SideMenuTransitionController(leftSide: leftSide, config: settings)
|
||||
guard transitionController == nil else { return transitionController }
|
||||
transitionController = SideMenuTransitionController(leftSide: leftSide, config: settings)
|
||||
transitionController?.delegate = self
|
||||
transitionController?.interactive = transitionInteractive
|
||||
transitionInteractive = false
|
||||
@@ -484,7 +484,7 @@ internal extension SideMenuNavigationController {
|
||||
if !presenting {
|
||||
dismissMenu(interactively: true)
|
||||
}
|
||||
transitionController?.handle(state: .update(progress: progress))
|
||||
fallthrough
|
||||
case .changed:
|
||||
transitionController?.handle(state: .update(progress: progress))
|
||||
case .ended:
|
||||
@@ -502,7 +502,7 @@ internal extension SideMenuNavigationController {
|
||||
|
||||
func dismissMenu(animated flag: Bool = true, interactively: Bool = false, completion: (() -> Void)? = nil) {
|
||||
guard !isHidden else { return }
|
||||
transitionInteractive = interactively
|
||||
transitionController?.interactive = interactively
|
||||
dismiss(animated: flag, completion: completion)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "SideMenu"
|
||||
s.version = "6.4.5"
|
||||
s.version = "6.4.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.
|
||||
|
||||
Reference in New Issue
Block a user