Skip to content

Use windows from UISceneDelegate lifecycle #1051

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

Open
opiotr wants to merge 2 commits into
base: main
Choose a base branch
from
+21 −2
Open

Use windows from UISceneDelegate lifecycle #1051

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bcfb62
Use windows from UISceneDelegate lifecycle
opiotr Feb 3, 2026
3994d22
Adjust code to api availability
opiotr Feb 3, 2026
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
23 changes: 21 additions & 2 deletions Sources/SnapshotTesting/Common/View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,14 @@

private func getKeyWindow() -> UIWindow? {
var window: UIWindow?
if #available(iOS 13.0, *) {
if #available(iOS 13.0, *),
let keyWindow = UIApplication.sharedIfAvailable?.connectedScenes
.compactMap({ $0 as? UIWindowScene })
.flatMap({ $0.windows })
.first(where: { $0.isKeyWindow })
{
window = keyWindow
} else if #available(iOS 13.0, *) {
window = UIApplication.sharedIfAvailable?.windows.first { $0.isKeyWindow }
} else {
window = UIApplication.sharedIfAvailable?.keyWindow
Expand All @@ -1090,7 +1097,19 @@
init(config: ViewImageConfig, viewController: UIViewController) {
let size = config.size ?? viewController.view.bounds.size
self.config = config
super.init(frame: .init(origin: .zero, size: size))

// Attach to current window scene to ensure consistent safe area behavior
if #available(iOS 13.0, *),
let scene = UIApplication.sharedIfAvailable?.connectedScenes.first(where: {
$0.activationState == .foregroundActive || $0.activationState == .foregroundInactive
}),
let windowScene = scene as? UIWindowScene
{
super.init(windowScene: windowScene)
self.frame = .init(origin: .zero, size: size)
} else {
super.init(frame: .init(origin: .zero, size: size))
}

// NB: Safe area renders inaccurately for UI{Navigation,TabBar}Controller.
// Fixes welcome!
Expand Down