Skip to content

fix: Update key window retrieval for compatibility across iOS versions #3

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
duan-guide wants to merge 1 commit into
base: kcsta/v6.1.5
Choose a base branch
from
Open

fix: Update key window retrieval for compatibility across iOS versions #3

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
4 changes: 2 additions & 2 deletions flutter_inappwebview_ios/ios/Classes/HeadlessInAppWebView/HeadlessInAppWebView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ public class HeadlessInAppWebView: Disposable {
} else {
view.frame = CGRect(x: 0.0, y: 0.0, width: UIScreen.main.bounds.width, height: UIScreen.main.bounds.height)
}
if let keyWindow = UIApplication.shared.keyWindow {
// Use the shared extension for getting key window
if let keyWindow = UIApplication.shared.keyWindowCompat {
/// Note: The WKWebView behaves very unreliable when rendering offscreen
/// on a device. This is especially true with JavaScript, which simply
/// won't be executed sometimes.
Expand All @@ -48,7 +49,6 @@ public class HeadlessInAppWebView: Disposable {
}
}
}

public func setSize(size: Size2D) {
if let view = flutterWebView?.view() {
let width = size.width == -1.0 ? UIScreen.main.bounds.width : CGFloat(size.width)
Expand Down
23 changes: 22 additions & 1 deletion flutter_inappwebview_ios/ios/Classes/UIApplication/VisibleViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,30 @@
import UIKit

extension UIApplication {

/// Get the key window across all iOS versions
var keyWindowCompat: UIWindow? {
if #available(iOS 13.0, *) {
let windowScene = connectedScenes
.compactMap { $0 as? UIWindowScene }
.first(where: { $0.activationState == .foregroundActive })

if #available(iOS 15.0, *) {
if let keyWindow = windowScene?.keyWindow {
return keyWindow
}
}

return windowScene?.windows.first(where: { $0.isKeyWindow })
?? windowScene?.windows.first
} else {
return windows.first(where: { $0.isKeyWindow })
?? windows.first
}
}

var visibleViewController: UIViewController? {
guard let rootViewController = keyWindow?.rootViewController else {
guard let rootViewController = keyWindowCompat?.rootViewController else {
return nil
}
return getVisibleViewController(rootViewController)
Expand Down