Skip to content

Fix view controller which’s being dismissed #28

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

Merged
mikhailmaslo merged 1 commit into from
Jul 28, 2023
Merged

Fix view controller which’s being dismissed #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/BottomSheet/Core/Extensions/UIViewController+Convenience.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public final class DefaultBottomSheetModalDismissalHandler: BottomSheetModalDism
}

public func performDismissal(animated: Bool) {
if let presentedViewController = presentingViewController {
if let presentedViewController = presentingViewController?.presentedViewController {
presentedViewController.dismiss(animated: animated, completion: dismissCompletion)
} else {
// User dismissed view controller by swipe-gesture, dismiss handler wasn't invoked
Expand Down
2 changes: 1 addition & 1 deletion Sources/BottomSheet/Core/Presentation/BottomSheetPresentationController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public final class BottomSheetPresentationController: UIPresentationController {
private func startInteractiveTransition() {
interactionController = UIPercentDrivenInteractiveTransition()

presentingViewController.dismiss(animated: true) { [weak self] in
presentedViewController.dismiss(animated: true) { [weak self] in
guard let self = self else { return }

if self.presentingViewController.presentedViewController !== self.presentedViewController {
Expand Down