fix blank title and escape key when editing (#28)

Author: brindy

DuckDuckGo/BrowserTab/ViewModel/WebViewStateObserver.swift

@@ -86,15 +86,27 @@ class WebViewStateObserver: NSObject {
         }
 
         switch keyPath {
-        case #keyPath(WKWebView.url): tabViewModel.tab.url = webView.url
+        case #keyPath(WKWebView.url):
+            tabViewModel.tab.url = webView.url
+            updateTitle() // The title might not change if webView doesn't think anything is different so update title here as well
+
         case #keyPath(WKWebView.canGoBack): tabViewModel.canGoBack = webView.canGoBack
         case #keyPath(WKWebView.canGoForward): tabViewModel.canGoForward = webView.canGoForward
         case #keyPath(WKWebView.isLoading): tabViewModel.isLoading = webView.isLoading
-        case #keyPath(WKWebView.title): tabViewModel.tab.title = webView.title
+        case #keyPath(WKWebView.title): updateTitle()
         default:
             os_log("%s: keyPath %s not handled", type: .error, className, keyPath)
             super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
         }
     }
 
+    private func updateTitle() {
+        if webView?.title?.trimmingWhitespaces().isEmpty ?? true {
+            tabViewModel?.tab.title = webView?.url?.host?.drop(prefix: "www.")
+            return
+        }
+
+        tabViewModel?.tab.title = webView?.title
+    }
+
 }

DuckDuckGo/FindInPage/FindInPageViewController.swift

@@ -128,8 +128,7 @@ class FindInPageViewController: NSViewController {
 extension FindInPageViewController {
 
     @objc func textFieldFirstReponderNotification(_ notification: Notification) {
-        // NSTextField passes its first responder status down to a child view of NSTextView class
-        if let textView = notification.object as? NSTextView, textView.superview?.superview === textField {
+        if view.window?.firstResponder == textField.currentEditor() {
             updateView(firstResponder: true)
         } else {
             updateView(firstResponder: false)

DuckDuckGo/Main/MainViewController.swift

@@ -208,10 +208,24 @@ extension MainViewController {
 
         if Int(event.keyCode) == kVK_Escape {
             findInPageViewController?.findInPageDone(self)
+            checkForEndAddressBarEditing()
             return true
         }
 
         return false
     }
 
+    private func checkForEndAddressBarEditing() {
+        let addressBarTextField = navigationBarViewController?.addressBarViewController?.addressBarTextField
+        guard view.window?.firstResponder == addressBarTextField?.currentEditor() else { return }
+
+        // If the webview doesn't have content it doesn't handle becoming the first responder properly
+        if tabCollectionViewModel.selectedTabViewModel?.tab.webView.url != nil {
+            tabCollectionViewModel.selectedTabViewModel?.tab.webView.makeMeFirstResponder()
+        } else {
+            navigationBarContainerView.makeMeFirstResponder()
+        }
+
+    }
+
 }

DuckDuckGo/Main/View/MainWindow.swift

@@ -32,7 +32,11 @@ class MainWindow: NSWindow {
 
     override func makeFirstResponder(_ responder: NSResponder?) -> Bool {
         // The only reliable way to detect NSTextField is the first responder
-        postFirstResponderNotification(with: responder)
+        defer {
+            // Send it after the first responder has been set on the super class so that window.firstResponder matches correctly
+            postFirstResponderNotification(with: responder)
+        }
+        
         return super.makeFirstResponder(responder)
     }
 

DuckDuckGo/Menus/MainMenuActions.swift

@@ -54,7 +54,7 @@ extension MainViewController {
             os_log("MainViewController: Cannot reference address bar text field", type: .error)
             return
         }
-        view.window?.makeFirstResponder(addressBarTextField)
+        addressBarTextField.makeMeFirstResponder()
     }
 
     @IBAction func closeTab(_ sender: Any?) {

DuckDuckGo/NavigationBar/View/AddressBarViewController.swift

@@ -207,8 +207,7 @@ class AddressBarViewController: NSViewController {
 extension AddressBarViewController {
 
     @objc func textFieldFirstReponderNotification(_ notification: Notification) {
-        // NSTextField passes its first responder status down to a child view of NSTextView class
-        if let textView = notification.object as? NSTextView, textView.superview?.superview === addressBarTextField {
+        if view.window?.firstResponder == addressBarTextField.currentEditor() {
             updateView(firstResponder: true)
         } else {
             if mode != .browsing {