fix: make getTopWindow more robust

kirillzyusko · Oct 8, 2024 · d141c25 · d141c25
1 parent 0553cd8
commit d141c25
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/ios/extensions/UIWindow.swift b/ios/extensions/UIWindow.swift
@@ -38,7 +38,17 @@ public extension UIWindow {
 
     func getTopWindow() -> UIWindow? {
       // Return the keyboard window if it's available, otherwise return the last window
-      return keyboardWindow ?? UIApplication.shared.windows.last
+      if let keyboardWindow = keyboardWindow {
+        return keyboardWindow
+      }
+
+      if #available(iOS 13.0, *) {
+        let scenes = UIApplication.shared.connectedScenes
+        let windowScene = scenes.first as? UIWindowScene
+        return windowScene?.windows.last { $0.isKeyWindow }
+      } else {
+        return UIApplication.shared.windows.last { $0.isKeyWindow }
+      }
     }
   }