From 60f8df9a04225e43bc5ede6bd160d8de8bc65055 Mon Sep 17 00:00:00 2001
From: Thomas Ricouard <ricouard77@gmail.com>
Date: Thu, 2 Feb 2023 07:04:51 +0100
Subject: [PATCH] Fix laggy Safari presenter

---
 IceCubesApp/App/SafariRouter.swift | 59 ++++++++----------------------
 1 file changed, 15 insertions(+), 44 deletions(-)

diff --git a/IceCubesApp/App/SafariRouter.swift b/IceCubesApp/App/SafariRouter.swift
index 342a5e8f..b6e23ecb 100644
--- a/IceCubesApp/App/SafariRouter.swift
+++ b/IceCubesApp/App/SafariRouter.swift
@@ -14,7 +14,7 @@ private struct SafariRouter: ViewModifier {
   @EnvironmentObject private var preferences: UserPreferences
   @EnvironmentObject private var routerPath: RouterPath
 
-  @State private var safari: SFSafariViewController?
+  @State private var presentedURL: URL?
 
   func body(content: Content) -> some View {
     content
@@ -46,57 +46,28 @@ private struct SafariRouter: ViewModifier {
             return .systemAction
           }
 
-          let safari = SFSafariViewController(url: url)
-          safari.preferredBarTintColor = UIColor(theme.primaryBackgroundColor)
-          safari.preferredControlTintColor = UIColor(theme.tintColor)
 
-          self.safari = safari
+
+          presentedURL = url
           return .handled
         }
       }
-      .background {
-        SafariPresenter(safari: safari)
-      }
+      .sheet(item: $presentedURL, content: { url in
+        SafariView(url: url)
+          .edgesIgnoringSafeArea(.all)
+      })
   }
 
-  struct SafariPresenter: UIViewRepresentable {
-    var safari: SFSafariViewController?
+  struct SafariView: UIViewControllerRepresentable {
+    let url: URL
 
-    func makeUIView(context _: Context) -> UIView {
-      let view = UIView(frame: .zero)
-      view.isHidden = true
-      view.isUserInteractionEnabled = false
-      return view
+    func makeUIViewController(context _: UIViewControllerRepresentableContext<SafariView>) -> SFSafariViewController {
+      let safari = SFSafariViewController(url: url)
+      safari.preferredBarTintColor = UIColor(Theme.shared.primaryBackgroundColor)
+      safari.preferredControlTintColor = UIColor(Theme.shared.tintColor)
+      return safari
     }
 
-    func updateUIView(_ uiView: UIView, context _: Context) {
-      guard let safari = safari, let viewController = uiView.findTopViewController() else { return }
-      viewController.present(safari, animated: true)
-    }
-  }
-}
-
-private extension UIView {
-  func findTopViewController() -> UIViewController? {
-    if let nextResponder = next as? UIViewController {
-      return nextResponder.topViewController()
-    } else if let nextResponder = next as? UIView {
-      return nextResponder.findTopViewController()
-    } else {
-      return nil
-    }
-  }
-}
-
-private extension UIViewController {
-  func topViewController() -> UIViewController? {
-    if let nvc = self as? UINavigationController {
-      return nvc.visibleViewController?.topViewController()
-    } else if let tbc = self as? UITabBarController, let selected = tbc.selectedViewController {
-      return selected.topViewController()
-    } else if let presented = presentedViewController {
-      return presented.topViewController()
-    }
-    return self
+    func updateUIViewController(_: SFSafariViewController, context _: UIViewControllerRepresentableContext<SafariView>) {}
   }
 }