Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/task/fix_pan_modal_presentable' …
Browse files Browse the repository at this point in the history
…into master
  • Loading branch information
firedragon873 committed Aug 2, 2022
2 parents 6863ca0 + 5608f9f commit 16e3415
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion PanModal/Controller/PanModalNavigationController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ open class PanModalNavController: UINavigationController, PanModalPresentable {

open var longFormHeight: PanModalHeight {
guard let panScrollable = self.presentViewController as? PanModalKeyboardPresentable else {
return .contentHeight(.zero)
return self.presentViewController.longFormHeight
}

let height = panScrollable.contentWithKeyboardHeight
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ public extension PanModalPresentable where Self: UIViewController {
parentVC?.presentPanModal(navController)
}

func panModalPush(parentVC: UIViewController?) {
func panModalPush(parentVC: UIViewController?, animated: Bool = false) {
let navController = parentVC?.navigationController as? PanModalNavController

DispatchQueue.main.async {
navController?.pushViewController(self, animated: false)
navController?.pushViewController(self, animated: animated)
}
}

Expand Down

0 comments on commit 16e3415

Please sign in to comment.