swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix interactive dismissal of our QLPreviewController on iOS 18. (#3274)

Browse Source
This commit is contained in:
Doug 2024-09-12 12:22:18 +01:00 committed by GitHub
parent a1c47ad209
commit 47a093eb4e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ElementX/Sources/Screens/FilePreviewScreen/InteractiveQuickLook.swift
View File

@ -60,6 +60,7 @@ private struct MediaPreviewViewController: UIViewControllerRepresentable {
let previewItem: MediaPreviewItem
let allowEditing: Bool
let onDismiss: () -> Void
let sourceView = UIView()
private var dismissalObserver: AnyCancellable?
@ -93,10 +94,23 @@ private struct MediaPreviewViewController: UIViewControllerRepresentable {
override func viewDidLoad() {
view.backgroundColor = .clear
view.addSubview(sourceView)
sourceView.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
sourceView.centerXAnchor.constraint(equalTo: view.centerXAnchor),
sourceView.centerYAnchor.constraint(equalTo: view.bottomAnchor),
sourceView.widthAnchor.constraint(equalToConstant: 200),
sourceView.heightAnchor.constraint(equalToConstant: 200)
])
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
// Don't use viewWillAppear due to the following warning:
// Presenting view controller <QLPreviewController> from detached view controller <HostingController> is not supported,
// and may result in incorrect safe area insets and a corrupt root presentation. Make sure <HostingController> is in
// the view controller hierarchy before presenting from it. Will become a hard exception in a future release.
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
guard self.previewController == nil else { return }
@ -124,6 +138,10 @@ private struct MediaPreviewViewController: UIViewControllerRepresentable {
allowEditing ? .createCopy : .disabled
}
func previewController(_ controller: QLPreviewController, transitionViewFor item: any QLPreviewItem) -> UIView? {
sourceView
}
func previewControllerDidDismiss(_ controller: QLPreviewController) {
onDismiss()
}