Skip to content

Present the camera and photo pickers over sheets on iOS #17

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
simonhamp merged 1 commit into from
Oct 22, 2026
Merged

Present the camera and photo pickers over sheets on iOS #17

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
19 changes: 16 additions & 3 deletions resources/ios/CameraFunctions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@ import Photos
import CoreLocation
import ImageIO

/// The view controller to present a picker from: the topmost one, since the root
/// view controller can't present while it's already presenting something, such
/// as a sheet the app is showing. Presenting from it there does nothing at all.
private func topViewController(from root: UIViewController) -> UIViewController {
var top = root

while let presented = top.presentedViewController, !presented.isBeingDismissed {
top = presented
}

return top
}

// MARK: - Camera Function Namespace

/// Functions related to camera operations
Expand Down Expand Up @@ -115,7 +128,7 @@ enum CameraFunctions {
picker.cameraCaptureMode = .photo

picker.delegate = CameraPhotoDelegate.shared
rootVC.present(picker, animated: true)
topViewController(from: rootVC).present(picker, animated: true)
}
}
}
Expand Down Expand Up @@ -273,7 +286,7 @@ enum CameraFunctions {
}

picker.delegate = CameraVideoDelegate.shared
rootVC.present(picker, animated: true)
topViewController(from: rootVC).present(picker, animated: true)
}
}
}
Expand Down Expand Up @@ -852,7 +865,7 @@ final class CameraGalleryManager: NSObject {
let picker = PHPickerViewController(configuration: configuration)
picker.delegate = self

rootVC.present(picker, animated: true)
topViewController(from: rootVC).present(picker, animated: true)
}
}

Expand Down
Loading