Make window optional in ViewPortState prevent crashes in iOS 15 (#172)

iZettle · Oct 8, 2021 · 04d3e83 · 04d3e83
1 parent ca9b0ec
commit 04d3e83
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Form/ViewPortEvent.swift b/Form/ViewPortEvent.swift
@@ -48,7 +48,7 @@ public extension UIView {
 private class ViewPortState {
     weak var window: UIWindow? // Not keeping strong reference to the window to avoid UIWindow leaks
     let bag = DisposeBag()
-    init(window: UIWindow) {
+    init(window: UIWindow?) {
         self.window = window
         bag += Form.keyboardSignal().onValue { _ in } // Make sure to setup listener so keyboardFrame will be updated
     }
@@ -73,7 +73,7 @@ private extension UIView {
         }
 
         let app = UIApplication.shared
-        let window = self.window ?? (self as? UIWindow) ?? app.keyWindow ?? app.windows.first!
+        let window = self.window ?? (self as? UIWindow) ?? app.keyWindow ?? app.windows.first
         return associatedValue(forKey: &viewPortKey, initial: ViewPortState(window: window))
     }
 }