Fix pinned button requiring double click

duckduckgo · Mar 8, 2024 · 1632d80 · 1632d80
1 parent d88e0bf
commit 1632d80
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift b/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
@@ -109,7 +109,7 @@ final class NavigationBarPopovers: PopoverPresenter {
     }
 
     func passwordManagementButtonPressed(usingView view: NSView, withDelegate delegate: NSPopoverDelegate) {
-        if passwordPopoverPresenter.popoverIsDisplayed == true {
+        if passwordPopoverPresenter.popoverIsDisplayed == true && passwordPopoverPresenter.popoverIsInCurrentWindow  {
             passwordPopoverPresenter.dismiss()
         } else {
             showPasswordManagementPopover(selectedCategory: nil, usingView: view, withDelegate: delegate)

diff --git a/DuckDuckGo/SecureVault/View/PasswordPopoverPresenter.swift b/DuckDuckGo/SecureVault/View/PasswordPopoverPresenter.swift
@@ -24,6 +24,7 @@ protocol PasswordPopoverPresenter {
     var passwordDomain: String? { get set }
     var popoverIsDirty: Bool { get }
     var popoverIsDisplayed: Bool { get }
+    var popoverIsInCurrentWindow: Bool { get }
     func show(under view: NSView, withDomain domain: String?, selectedCategory category: SecureVaultSorting.Category?)
     func show(under view: NSView, withSelectedAccount: SecureVaultModels.WebsiteAccount)
     func dismiss()
@@ -49,6 +50,10 @@ final class DefaultPasswordPopoverPresenter: PasswordPopoverPresenter, PopoverPr
         popover?.isShown ?? false
     }
 
+    var popoverIsInCurrentWindow: Bool {
+        popover?.mainWindow == NSApplication.shared.keyWindow
+    }
+
     /// Note: Dismisses any previously displayed popover before showing a new one
     func show(under view: NSView, withDomain domain: String?, selectedCategory category: SecureVaultSorting.Category?) {
         show(under: view, withDomain: domain).select(category: category)

diff --git a/UnitTests/NavigationBar/Mocks/MockPasswordPopoverPresenter.swift b/UnitTests/NavigationBar/Mocks/MockPasswordPopoverPresenter.swift
@@ -36,6 +36,10 @@ final class MockPasswordPopoverPresenter: PasswordPopoverPresenter {
         isDisplayed
     }
 
+    var popoverIsInCurrentWindow: Bool {
+        false
+    }
+
     func show(under view: NSView, withDomain domain: String?, selectedCategory category: DuckDuckGo_Privacy_Browser.SecureVaultSorting.Category?) {
         didShowWithCategory = true
     }