Add allowTapToDismiss to PanModalPresentable (slackhq#58)

e-sung · Oct 9, 2019 · 5c1d8c4 · 5c1d8c4
1 parent af264eb
commit 5c1d8c4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/PanModal/Controller/PanModalPresentationController.swift b/PanModal/Controller/PanModalPresentationController.swift
@@ -111,7 +111,9 @@ public class PanModalPresentationController: UIPresentationController {
  view = DimmedView()
  }
  view.didTap = { [weak self] _ in
- self?.dismissPresentedViewController()
+ if self?.presentable?.allowsTapToDismiss == true {
+ self?.dismissPresentedViewController()
+ }
  }
  return view
  }()

diff --git a/PanModal/Presentable/PanModalPresentable+Defaults.swift b/PanModal/Presentable/PanModalPresentable+Defaults.swift
@@ -72,6 +72,10 @@ public extension PanModalPresentable where Self: UIViewController {
  return true
  }
 
+ var allowsTapToDismiss: Bool {
+ return true
+ }
+
  var isUserInteractionEnabled: Bool {
  return true
  }

diff --git a/PanModal/Presentable/PanModalPresentable.swift b/PanModal/Presentable/PanModalPresentable.swift
@@ -127,6 +127,13 @@ public protocol PanModalPresentable: AnyObject {
  */
  var allowsDragToDismiss: Bool { get }
 
+ /**
+ A flag to determine if dismissal should be initiated when tapping on the dimmed background view.
+
+ Default value is true.
+ */
+ var allowsTapToDismiss: Bool { get }
+
  /**
  A flag to toggle user interactions on the container view.
 

diff --git a/Tests/PanModalTests.swift b/Tests/PanModalTests.swift
@@ -53,6 +53,7 @@ class PanModalTests: XCTestCase {
  XCTAssertEqual(vc.anchorModalToLongForm, true)
  XCTAssertEqual(vc.allowsExtendedPanScrolling, false)
  XCTAssertEqual(vc.allowsDragToDismiss, true)
+ XCTAssertEqual(vc.allowsTapToDismiss, true)
  XCTAssertEqual(vc.isUserInteractionEnabled, true)
  XCTAssertEqual(vc.isHapticFeedbackEnabled, true)
  XCTAssertEqual(vc.shouldRoundTopCorners, false)