Move bridge delegate initialization to TurboWebViewController .

hotwired · Sep 15, 2023 · eb88747 · eb88747
1 parent 8b559f7
commit eb88747
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/Demo/Navigation/TurboNavigationController.swift b/Demo/Navigation/TurboNavigationController.swift
@@ -100,14 +100,6 @@ extension TurboNavigationController {
 
     private func visit(viewController: UIViewController, with options: VisitOptions, modal: Bool = false) {
         guard let visitable = viewController as? Visitable else { return }
-
-        if let bridgeDestination = viewController as? TurboWebViewController & BridgeDestination {
-            let bridgeDelegate = BridgeDelegate(location: visitable.visitableURL.absoluteString,
-                                                destination: bridgeDestination,
-                                                componentTypes: BridgeComponent.allTypes)
-            bridgeDestination.bridgeDelegate = bridgeDelegate
-        }
-
         // Each Session corresponds to a single web view. A good rule of thumb
         // is to use a session per navigation stack. Here we're using a different session
         // when presenting a modal. We keep that around for any modal presentations so

diff --git a/Demo/TurboWebViewController.swift b/Demo/TurboWebViewController.swift
@@ -4,52 +4,57 @@ import Strada
 import WebKit
 
 final class TurboWebViewController: VisitableViewController,
-                            ErrorPresenter,
-                            BridgeDestination {
-    var bridgeDelegate: BridgeDelegate?
+                                    ErrorPresenter,
+                                    BridgeDestination {
+
+    private lazy var bridgeDelegate: BridgeDelegate = {
+        BridgeDelegate(location: visitableURL.absoluteString,
+                       destination: self,
+                       componentTypes: BridgeComponent.allTypes)
+    }()
 
     // MARK: View lifecycle
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
+        
         navigationItem.backButtonDisplayMode = .minimal
         view.backgroundColor = .systemBackground
 
         if presentingViewController != nil {
             navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(dismissModal))
         }
-        bridgeDelegate?.onViewDidLoad()
+        bridgeDelegate.onViewDidLoad()
     }
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        bridgeDelegate?.onViewWillAppear()
+        bridgeDelegate.onViewWillAppear()
     }
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        bridgeDelegate?.onViewDidAppear()
+        bridgeDelegate.onViewDidAppear()
     }
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
-        bridgeDelegate?.onViewWillDisappear()
+        bridgeDelegate.onViewWillDisappear()
     }
 
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
-        bridgeDelegate?.onViewDidDisappear()
+        bridgeDelegate.onViewDidDisappear()
     }
 
     // MARK: Visitable
 
     override func visitableDidActivateWebView(_ webView: WKWebView) {
-        bridgeDelegate?.webViewDidBecomeActive(webView)
+        bridgeDelegate.webViewDidBecomeActive(webView)
     }
 
     override func visitableDidDeactivateWebView() {
-        bridgeDelegate?.webViewDidBecomeDeactivated()
+        bridgeDelegate.webViewDidBecomeDeactivated()
     }
 
     // MARK: Actions