Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add onDidDismiss #152

Merged
merged 1 commit into from May 31, 2023
Merged

add onDidDismiss #152

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 11 additions & 8 deletions Sources/FluidInterfaceKitRideauSupport/FluidRideauViewController.swift
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@ open class FluidRideauViewController: FluidTransitionViewController {
// MARK: - Properties

public var onWillDismiss: () -> Void = {}
public var onDidDismiss: () -> Void = {}

public let rideauView: RideauView

Expand Down Expand Up @@ -153,39 +154,41 @@ open class FluidRideauViewController: FluidTransitionViewController {
}

self.onWillDismiss()


let onDidDismiss = self.onDidDismiss
if Self.supportsModalPresentation {

if self.isInFluidStackController {
self.fluidStackContext?.removeSelf(transition: .disabled)
self.fluidStackContext?.removeSelf(transition: .disabled, completion: { _ in onDidDismiss() })
} else {
self.dismiss(animated: true, completion: nil)
self.dismiss(animated: true, completion: onDidDismiss)
}

} else {
self.fluidStackContext?.removeSelf(transition: .disabled)
self.fluidStackContext?.removeSelf(transition: .disabled, completion: { _ in onDidDismiss() })
}

}

}

@objc private dynamic func didTapBackdropView(gesture: UITapGestureRecognizer) {


let onDidDismiss = self.onDidDismiss
if Self.supportsModalPresentation {

if self.isInFluidStackController {
assert(fluidStackContext != nil)
onWillDismiss()
fluidPop(transition: nil, completion: nil)
fluidPop(transition: nil, completion: { _ in onDidDismiss() })
} else {
self.dismiss(animated: true, completion: nil)
self.dismiss(animated: true, completion: onDidDismiss)
}

} else {
assert(fluidStackContext != nil)
onWillDismiss()
fluidPop(transition: nil, completion: nil)
fluidPop(transition: nil, completion: { _ in onDidDismiss() })
}


Expand Down