Merge branch 'feature/issue_72'

gaetanzanella · gaetanzanella · commit 28f38f444617 · 2020-08-22T15:41:50.000+02:00
diff --git a/Example/OverlayContainer_Example/Present Overlay/ActivityControllerPresentationLikeViewController.swift b/Example/OverlayContainer_Example/Present Overlay/ActivityControllerPresentationLikeViewController.swift
@@ -34,11 +34,9 @@ class ActivityControllerPresentationLikeViewController: UIViewController,
         container.viewControllers = [ColoredViewController()]
         container.delegate = self
         container.moveOverlay(toNotchAt: Notch.medium.rawValue, animated: false)
-        let root = UIViewController()
-        root.addChild(container, in: root.view)
-        root.transitioningDelegate = self
-        root.modalPresentationStyle = .custom
-        present(root, animated: true, completion: nil)
+        container.transitioningDelegate = self
+        container.modalPresentationStyle = .custom
+        present(container, animated: true, completion: nil)
     }
 
     // MARK: - UIViewControllerTransitioningDelegate
@@ -67,6 +65,10 @@ class ActivityControllerPresentationLikeViewController: UIViewController,
         return policy
     }
 
+    func overlayContainerSheetPresentationControllerShouldDismissOnTap(_ presentationController: OverlayContainerSheetPresentationController) -> Bool {
+        return false
+    }
+
     // MARK: - OverlayTransitioningDelegate
 
     func overlayTargetNotchPolicy(for overlayViewController: UIViewController) -> OverlayTranslationTargetNotchPolicy? {
diff --git a/Source/Classes/Internal/Extensions/UIViewController+Children.swift b/Source/Classes/Internal/Extensions/UIViewController+Children.swift
@@ -29,4 +29,12 @@ extension UIViewController {
         }
         return parent?.oc_findPresentationController(Controller.self)
     }
+
+    func oc_findChildren<Controller: UIViewController>(_ type: Controller.Type) -> [Controller] {
+        if let controller = self as? Controller {
+            return [controller]
+        } else {
+            return children.map { $0.oc_findChildren(type) }.flatMap { $0 }
+        }
+    }
 }
diff --git a/Source/Classes/Internal/OverlayTranslationGestureRecognizer.swift b/Source/Classes/Internal/OverlayTranslationGestureRecognizer.swift
@@ -11,8 +11,6 @@ class OverlayTranslationGestureRecognizer: UIPanGestureRecognizer {
 
     weak var drivingScrollView: UIScrollView?
 
-    var translationOffset: CGFloat = 0
-
     private(set) var startingLocation: CGPoint = .zero
 
     // MARK: - Public
diff --git a/Source/Classes/Internal/PanGestureOverlayTranslationDriver.swift b/Source/Classes/Internal/PanGestureOverlayTranslationDriver.swift
@@ -7,7 +7,9 @@
 
 import UIKit
 
-class PanGestureOverlayTranslationDriver: NSObject, OverlayTranslationDriver {
+class PanGestureOverlayTranslationDriver: NSObject,
+                                          OverlayTranslationDriver,
+                                          UIGestureRecognizerDelegate {
 
     private weak var translationController: OverlayTranslationController?
     private let panGestureRecognizer: OverlayTranslationGestureRecognizer
@@ -19,6 +21,7 @@ class PanGestureOverlayTranslationDriver: NSObject, OverlayTranslationDriver {
         self.translationController = translationController
         self.panGestureRecognizer = panGestureRecognizer
         super.init()
+        panGestureRecognizer.delegate = self
         panGestureRecognizer.addTarget(self, action: #selector(overlayPanGestureAction(_:)))
     }
 
@@ -28,6 +31,16 @@ class PanGestureOverlayTranslationDriver: NSObject, OverlayTranslationDriver {
         // no-op
     }
 
+    // MARK: - UIGestureRecognizerDelegate
+
+    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+        guard let view = gestureRecognizer.view,
+              let gesture = gestureRecognizer as? OverlayTranslationGestureRecognizer else {
+            return false
+        }
+        return translationController?.isDraggable(at: gesture.startingLocation, in: view) ?? false
+    }
+
     // MARK: - Action
 
     @objc private func overlayPanGestureAction(_ sender: OverlayTranslationGestureRecognizer) {
diff --git a/Source/Classes/OverlayContainerPresentationController.swift b/Source/Classes/OverlayContainerPresentationController.swift
@@ -16,6 +16,20 @@ import UIKit
 /// the `OverlayContainerSheetPresentationController` class to see if it can be adapted to your presentation behavior.
 open class OverlayContainerPresentationController: UIPresentationController {
 
+    // MARK: - Internal
+
+    open override func presentationTransitionWillBegin() {
+        super.presentationTransitionWillBegin()
+        findPresentedContainers().forEach { $0.overlayContainerPresentationTransitionWillBegin() }
+    }
+
+    open override func dismissalTransitionDidEnd(_ completed: Bool) {
+        super.dismissalTransitionDidEnd(completed)
+        findPresentedContainers().forEach { $0.overlayContainerDismissalTransitionDidEnd() }
+    }
+
+    // MARK: - Public
+
     /// Tells the presentation controller when the user is about to start dragging the overlay view controller.
     ///
     /// - parameter containerViewController: The container requesting this information.
@@ -65,4 +79,10 @@ open class OverlayContainerPresentationController: UIPresentationController {
     open func overlayContainerViewController(_ containerViewController: OverlayContainerViewController,
                                              willTranslateOverlay overlayViewController: UIViewController,
                                              transitionCoordinator: OverlayContainerTransitionCoordinator) {}
+
+    // MARK: - Private
+
+    private func findPresentedContainers() -> [OverlayContainerViewController] {
+        presentedViewController.oc_findChildren(OverlayContainerViewController.self)
+    }
 }
diff --git a/Source/Classes/OverlayContainerSheetPresentationController.swift b/Source/Classes/OverlayContainerSheetPresentationController.swift
@@ -85,6 +85,7 @@ open class OverlayContainerSheetPresentationController: OverlayContainerPresenta
     }
 
     open override func presentationTransitionDidEnd(_ completed: Bool) {
+        super.presentationTransitionDidEnd(completed)
         guard !completed else { return }
         dimmingView?.removeFromSuperview()
         tapGestureRecognizerView.removeFromSuperview()
diff --git a/Source/Classes/OverlayContainerTransitionCoordinator.swift b/Source/Classes/OverlayContainerTransitionCoordinator.swift
@@ -9,7 +9,7 @@ import UIKit
 
 /// A protocol that provides information about the current overlay translation.
 public protocol OverlayContainerTransitionContext {
-    /// A Boolean value that indicates whether the user is current dragging the overlay.
+    /// A Boolean value that indicates whether the user is currently dragging the overlay.
     var isDragging: Bool { get }
     /// The overlay velocity.
     var velocity: CGPoint { get }
@@ -54,7 +54,7 @@ public protocol OverlayContainerTransitionCoordinatorContext: OverlayContainerTr
     var targetTranslationHeight: CGFloat { get }
 }
 
-/// A protocol that provides support for animations associated with a overlay translation.
+/// A protocol that provides support for animations associated with an overlay translation.
 ///
 /// Do not adopt this procotol in your own classes. Use the one provided by the `OverlayContainerDelegate` to
 /// add any extra animations alongside the translation animations.
diff --git a/Source/Classes/OverlayContainerViewController.swift b/Source/Classes/OverlayContainerViewController.swift
@@ -20,10 +20,10 @@ open class OverlayContainerViewController: UIViewController {
     /// `OverlayStyle` defines how the overlay view controller will be constrained in the container.
     public enum OverlayStyle {
         /// The overlay view controller will not be height-constrained. It will grow and shrink
-        /// as the user drags them up and down.
+        /// as the user drags it up and down.
         case flexibleHeight
         /// The overlay view controller will be constrained with a height equal to the highest notch.
-        /// It will be fully visible only when the user has drag them up to this notch.
+        /// It will be fully visible only when the user has drag it up to this notch.
         case rigid
         /// The overlay view controller will be constrained with a height greater or equal to the highest notch.
         /// Its height will be expanded if the overlay goes beyond the highest notch.
@@ -96,6 +96,10 @@ open class OverlayContainerViewController: UIViewController {
     private var translationController: HeightConstraintOverlayTranslationController?
     private var translationDrivers: [OverlayTranslationDriver] = []
 
+    // (gz) 2020-08-11 Uses to determine whether we can safely call `presentationController` or not.
+    // See issue #72
+    private var isPresentedInsideAnOverlayContainerPresentationController = false
+
     // MARK: - Life Cycle
 
     /// Creates an instance with the specified `style`.
@@ -153,6 +157,16 @@ open class OverlayContainerViewController: UIViewController {
         performDeferredTranslations()
     }
 
+    // MARK: - Internal
+
+    func overlayContainerPresentationTransitionWillBegin() {
+        isPresentedInsideAnOverlayContainerPresentationController = true
+    }
+
+    func overlayContainerDismissalTransitionDidEnd() {
+        isPresentedInsideAnOverlayContainerPresentationController = false
+    }
+
     // MARK: - Public
 
     /// Moves the overlay view controller to the specified notch.
@@ -311,7 +325,8 @@ open class OverlayContainerViewController: UIViewController {
 extension OverlayContainerViewController: HeightConstraintOverlayTranslationControllerDelegate {
 
     private var overlayPresentationController: OverlayContainerPresentationController? {
-        oc_findPresentationController(OverlayContainerPresentationController.self)
+        guard isPresentedInsideAnOverlayContainerPresentationController else { return nil }
+        return oc_findPresentationController(OverlayContainerPresentationController.self)
     }
 
     // MARK: - HeightOverlayTranslationControllerDelegate

Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,12 @@ extension UIViewController {`
`29`	`29`	`}`
`30`	`30`	`return parent?.oc_findPresentationController(Controller.self)`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ func oc_findChildren<Controller: UIViewController>(_ type: Controller.Type) -> [Controller] {`
	`34`	`+ if let controller = self as? Controller {`
	`35`	`+ return [controller]`
	`36`	`+ } else {`
	`37`	`+ return children.map { $0.oc_findChildren(type) }.flatMap { $0 }`
	`38`	`+ }`
	`39`	`+ }`
`32`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ open class OverlayContainerSheetPresentationController: OverlayContainerPresenta`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`open override func presentationTransitionDidEnd(_ completed: Bool) {`
	`88`	`+ super.presentationTransitionDidEnd(completed)`
`88`	`89`	`guard !completed else { return }`
`89`	`90`	`dimmingView?.removeFromSuperview()`
`90`	`91`	`tapGestureRecognizerView.removeFromSuperview()`