Support modal presentation on top of the drawer. #56
Conversation
| @@ -22,6 +22,10 @@ class PresentedViewController: UIViewController { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| @IBAction func unwindFromModal(with segue: UIStoryboardSegue) { | |||
| print("Unwound from the modal.") | |||
There was a problem hiding this comment.
Is this going to be removed at some point?
There was a problem hiding this comment.
No. It is the Storyboard unwind point for dismissing the modal in the demo.
There was a problem hiding this comment.
I meant the print statement.
| containerViewHeight: containerViewHeight, | ||
| configuration: configuration, | ||
| clampToNearest: true) | ||
| break |
There was a problem hiding this comment.
I don't understand why you're no longer setting lastDrawerState here.
There was a problem hiding this comment.
It is not necessary to update it during the course of the pan.
There was a problem hiding this comment.
lastDrawerState is not really consumed by anything until this PR, by the way.
There was a problem hiding this comment.
I think it might be, for the benefit of along-side animations performed by the presenting and/or presented view controllers.
There was a problem hiding this comment.
After looking into this, changed is actually updating the targetDrawerState (renamed from lastDrawerState).
| drawerPartialHeight: drawerPartialHeight, | ||
| containerViewHeight: containerViewHeight, | ||
| configuration: configuration, | ||
| clampToNearest: true) | ||
| currentDrawerY += panGesture.translation(in: view).y |
| @@ -48,9 +40,6 @@ extension PresentationController { | |||
| configuration: configuration) | |||
| animateTransition(to: endingState) | |||
|
|
|||
| case .cancelled: | |||
| animateTransition(to: lastDrawerState) | |||
There was a problem hiding this comment.
And, likewise, I don't understand the reason for removing this.
There was a problem hiding this comment.
cancelled is treated as completed now, and picks the next state based on current drawer state plus velocity.
There was a problem hiding this comment.
So, if the user starts dragging the drawer up then changes his mind, the drawer continues up anyway? That doesn't sound right to me.
Support modal presentation over the drawer.
The presented view controller must however use
overFullscreenfor the drawer content to be placed correctly. This is due to the defaultfullScreenpresentation style not asking DrawerKit for the correct frame before the dismissal animation begins. This causes the drawer being visible in the incorrect position until the dismissal animation completes.Update the demo app to showcase the support.