Textfield of the homepage is empty and unfocused right after switchin…

…g to the homepage (#400)
duckduckgo · Jan 20, 2022 · 7f6ca5e · 7f6ca5e
1 parent 9868df9
commit 7f6ca5e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/DuckDuckGo/Homepage/View/HomepageHeaderView.swift b/DuckDuckGo/Homepage/View/HomepageHeaderView.swift
@@ -168,7 +168,11 @@ final class HomepageHeaderView: NSView {
     }
 
     private func updateSearchView() {
-        if window?.firstResponder != field.currentEditor() {
+        guard let firstResponder = window?.firstResponder else {
+            return
+        }
+
+        if firstResponder != field.currentEditor() {
            showSearchInactive()
         } else if field.isSuggestionWindowVisible {
             showSearchHasResults()

diff --git a/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift b/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
@@ -131,6 +131,11 @@ final class AddressBarTextField: NSTextField {
     }
 
     private func updateValue() {
+        guard !isHomepageAddressBar else {
+            value = .text("")
+            return
+        }
+
         guard let selectedTabViewModel = tabCollectionViewModel.selectedTabViewModel else {
             return
         }