Unify bookmarks context menu across different views

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -75,7 +75,7 @@
     {
       "identity" : "lottie-spm",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/airbnb/lottie-spm.git",
+      "location" : "https://github.com/airbnb/lottie-spm",
       "state" : {
         "revision" : "1d29eccc24cc8b75bff9f6804155112c0ffc9605",
         "version" : "4.4.3"

DuckDuckGo/Bookmarks/Model/BookmarkOutlineViewDataSource.swift

@@ -41,7 +41,6 @@ final class BookmarkOutlineViewDataSource: NSObject, NSOutlineViewDataSource, NS
 
     private let bookmarkManager: BookmarkManager
     private let showMenuButtonOnHover: Bool
-    private let onMenuRequestedAction: ((BookmarkOutlineCellView) -> Void)?
     private let presentFaviconsFetcherOnboarding: (() -> Void)?
 
     private var favoritesPseudoFolder = PseudoFolder.favorites
@@ -53,14 +52,12 @@ final class BookmarkOutlineViewDataSource: NSObject, NSOutlineViewDataSource, NS
         treeController: BookmarkTreeController,
         sortMode: BookmarksSortMode,
         showMenuButtonOnHover: Bool = true,
-        onMenuRequestedAction: ((BookmarkOutlineCellView) -> Void)? = nil,
         presentFaviconsFetcherOnboarding: (() -> Void)? = nil
     ) {
         self.contentMode = contentMode
         self.bookmarkManager = bookmarkManager
         self.treeController = treeController
         self.showMenuButtonOnHover = showMenuButtonOnHover
-        self.onMenuRequestedAction = onMenuRequestedAction
         self.presentFaviconsFetcherOnboarding = presentFaviconsFetcherOnboarding
 
         super.init()
@@ -365,11 +362,13 @@ final class BookmarkOutlineViewDataSource: NSObject, NSOutlineViewDataSource, NS
     }
 
 }
-
 // MARK: - BookmarkOutlineCellViewDelegate
-
 extension BookmarkOutlineViewDataSource: BookmarkOutlineCellViewDelegate {
     func outlineCellViewRequestedMenu(_ cell: BookmarkOutlineCellView) {
-        onMenuRequestedAction?(cell)
+        guard let outlineView = cell.superview?.superview as? NSOutlineView else {
+            assertionFailure("cell.superview?.superview is not NSOutlineView")
+            return
+        }
+        outlineView.menu?.popUpAtMouseLocation(in: cell)
     }
 }

DuckDuckGo/Bookmarks/Services/MenuItemSelectors.swift

@@ -19,9 +19,9 @@
 import AppKit
 
 @objc protocol BookmarksMenuItemSelectors {
-    func newFolder(_ sender: NSMenuItem)
+    func newFolder(_ sender: Any?)
     func moveToEnd(_ sender: NSMenuItem)
-    @objc optional func manageBookmarks(_ sender: NSMenuItem)
+    func manageBookmarks(_ sender: Any?)
 }
 
 @objc protocol BookmarkMenuItemSelectors: BookmarksMenuItemSelectors {

DuckDuckGo/Bookmarks/View/BookmarkListPopover.swift

@@ -0,0 +1,58 @@
+//
+//  BookmarkListPopover.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import AppKit
+import Foundation
+
+final class BookmarkListPopover: NSPopover {
+
+    override init() {
+        super.init()
+
+        self.animates = false
+        self.behavior = .transient
+
+        setupContentController()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("BookmarkListPopover: Bad initializer")
+    }
+
+    // swiftlint:disable:next force_cast
+    var viewController: BookmarkListViewController { contentViewController as! BookmarkListViewController }
+
+    private func setupContentController() {
+        let controller = BookmarkListViewController()
+        controller.delegate = self
+        contentViewController = controller
+    }
+
+}
+
+extension BookmarkListPopover: BookmarkListViewControllerDelegate {
+
+    func popoverShouldClose(_ bookmarkListViewController: BookmarkListViewController) {
+        close()
+    }
+
+    func popover(shouldPreventClosure: Bool) {
+        behavior = shouldPreventClosure ? .applicationDefined : .transient
+    }
+
+}