Skip to content

Added the ability to prevent pan to close within the drawer. #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added the ability to prevent pan to close within the drawer. #87

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ac0a2d
Add panToCloseInsideDrawerEnabled property
colincameron Feb 28, 2017
b8074e3
Added Bool type annotation
colincameron Feb 28, 2017
7d2ca26
Merge pull request #1 from ykyouhei/master
colincameron Feb 23, 2018
2636a4e
Expose necessary properties to Objective C
colincameron Feb 23, 2018
b37b5d3
Merge pull request #2 from ykyouhei/master
colincameron Jun 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions KYDrawerController/Classes/KYDrawerController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
/// if the first parameter is `false`. Returns `nil` if appearance transition is not in progress.
private var _isAppearing: Bool?

public var screenEdgePanGestureEnabled = true
@objc public var screenEdgePanGestureEnabled = true

@IBInspectable public var panToCloseInsideDrawerEnabled: Bool = true

public private(set) lazy var screenEdgePanGesture: UIScreenEdgePanGestureRecognizer = {
let gesture = UIScreenEdgePanGestureRecognizer(
Expand Down Expand Up @@ -122,7 +124,7 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
}
}

public var drawerState: DrawerState {
@objc public var drawerState: DrawerState {
get { return _containerView.isHidden ? .closed : .opened }
set { setDrawerState(newValue, animated: false) }
}
Expand All @@ -140,7 +142,7 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
}
}

public var mainViewController: UIViewController! {
@objc public var mainViewController: UIViewController! {
didSet {
let isVisible = (drawerState == .closed)

Expand Down Expand Up @@ -192,7 +194,7 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
}
}

public var drawerViewController : UIViewController? {
@objc public var drawerViewController : UIViewController? {
didSet {
let isVisible = (drawerState == .opened)

Expand Down Expand Up @@ -361,7 +363,7 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
// MARK: - Public Method
/**************************************************************************/

public func setDrawerState(_ state: DrawerState, animated: Bool) {
@objc public func setDrawerState(_ state: DrawerState, animated: Bool) {
delegate?.drawerController?(self, willChangeState: state)

_containerView.isHidden = false
Expand Down Expand Up @@ -481,7 +483,18 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
switch gestureRecognizer {
case panGesture:
return drawerState == .opened
if self.panToCloseInsideDrawerEnabled {
return drawerState == .opened
} else {
if drawerState != .opened {
return false
}
guard let drawerViewController = self.drawerViewController else {
return true
}
let touchLocation = touch.location(in: drawerViewController.view)
return !drawerViewController.view.frame.contains(touchLocation)
}
case screenEdgePanGesture:
return screenEdgePanGestureEnabled ? drawerState == .closed : false
default:
Expand Down