Dev tools visibility fix (#457)

Task/Issue URL: https://app.asana.com/0/1199178362774117/1201903875992992/f Fix of dev tools visibility after switching between tabs
duckduckgo · Mar 11, 2022 · eb170ad · eb170ad
1 parent 78473e2
commit eb170ad
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/DuckDuckGo/BrowserTab/Model/Tab.swift b/DuckDuckGo/BrowserTab/Model/Tab.swift
@@ -592,7 +592,7 @@ extension Tab: UserContentControllerDelegate {
 
 }
 
-extension Tab: ChildAutofillUserScriptDelegate {
+extension Tab: BrowserTabViewControllerClickDelegate {
     func browserTabViewController(_ browserTabViewController: BrowserTabViewController, didClickAtPoint: NSPoint) {
         guard let autofillScript = autofillScript else { return }
         autofillScript.clickPoint = didClickAtPoint

diff --git a/DuckDuckGo/BrowserTab/View/BrowserTabViewController.swift b/DuckDuckGo/BrowserTab/View/BrowserTabViewController.swift
@@ -23,12 +23,12 @@ import Combine
 import SwiftUI
 import BrowserServicesKit
 
-protocol ChildAutofillUserScriptDelegate: AnyObject {
+protocol BrowserTabViewControllerClickDelegate: AnyObject {
     func browserTabViewController(_ browserTabViewController: BrowserTabViewController, didClickAtPoint: CGPoint)
 }
 
-// swiftlint:disable type_body_length
 // swiftlint:disable file_length
+// swiftlint:disable type_body_length
 
 final class BrowserTabViewController: NSViewController {
 

diff --git a/DuckDuckGo/BrowserTab/View/WebView.swift b/DuckDuckGo/BrowserTab/View/WebView.swift
@@ -42,6 +42,12 @@ final class WebView: WKWebView {
         "WKMenuItemIdentifierDownloadLinkedFile": UserText.downloadLinkedFileAs,
         "WKMenuItemIdentifierSearchWeb": UserText.searchWithDuckDuckGo
     ]
+
+    deinit {
+        self.configuration.userContentController.removeAllUserScripts()
+    }
+
+    // MARK: - Zoom
 
     static private let maxZoomLevel: CGFloat = 3.0
     static private let minZoomLevel: CGFloat = 0.5
@@ -85,10 +91,6 @@ final class WebView: WKWebView {
         self.zoomLevel = max(self.zoomLevel - Self.zoomLevelStep, Self.minZoomLevel)
     }
 
-    deinit {
-        self.configuration.userContentController.removeAllUserScripts()
-    }
-
     // MARK: - Back/Forward Navigation
 
     var frozenCanGoBack: Bool?
@@ -142,6 +144,13 @@ final class WebView: WKWebView {
 
     // MARK: - Developer Tools
 
+    override func viewDidMoveToWindow() {
+        super.viewDidMoveToWindow()
+        if self.isInspectorShown {
+            self.openDeveloperTools()
+        }
+    }
+
     @nonobjc var mainFrame: AnyObject? {
         guard self.responds(to: NSSelectorFromString("_mainFrame")) else {
             assertionFailure("WKWebView does not respond to _mainFrame")
@@ -186,6 +195,8 @@ final class WebView: WKWebView {
         inspectorPerform("showResources")
     }
 
+    // MARK: - Fullscreen
+
     var fullscreenWindowController: NSWindowController? {
         guard let fullscreenWindowController = self.window?.windowController,
               fullscreenWindowController.className.contains("FullScreen")