Bugfix FXIOS-12679 ⁃ Bookmarks, Downloads and Passwords all open history panel (backport #27689) (#27692)

Bugfix FXIOS-12679 ⁃ [Menu Redesign] Bookmarks, Downloads and Passwords all open history panel (#27689)

FXIOS-12679 #27625 ⁃ Bookmarks, Downloads and Passwords all open history panel

(cherry picked from commit 0d1e453)

Co-authored-by: dicarobinho <[email protected]>

Author: mergify[bot]

BrowserKit/Sources/MenuKit/MenuRedesign/MenuRedesignTableView.swift

@@ -163,9 +163,13 @@ final class MenuRedesignTableView: UIView,
         didSelectRowAt indexPath: IndexPath
     ) {
         tableView.deselectRow(at: indexPath, animated: false)
+        let section = menuData[indexPath.section]
 
-        if let action = menuData[indexPath.section].options[indexPath.row].action {
-            action()
+        // We handle the actions for horizontalTabs, in MenuSquaresViewContentCell
+        if !section.isHorizontalTabsSection {
+            if let action = section.options[indexPath.row].action {
+                action()
+            }
         }
     }
 

BrowserKit/Sources/MenuKit/MenuRedesign/MenuSquareCell.swift

@@ -40,11 +40,14 @@ final class MenuSquareView: UIView, ThemeApplicable {
 
     // MARK: - Properties
     var model: MenuElement?
+    var cellTapCallback: (() -> Void)?
 
     // MARK: - Initializers
     override init(frame: CGRect) {
         super.init(frame: frame)
         setupView()
+        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleTap))
+        self.addGestureRecognizer(tapGesture)
     }
 
     required init?(coder aDecoder: NSCoder) {
@@ -103,6 +106,11 @@ final class MenuSquareView: UIView, ThemeApplicable {
         ])
     }
 
+    @objc
+    private func handleTap() {
+        cellTapCallback?()
+    }
+
     // MARK: - Theme Applicable
     func applyTheme(theme: Theme) {
         backgroundColor = .clear

BrowserKit/Sources/MenuKit/MenuRedesign/MenuSquaresViewContentCell.swift

@@ -27,12 +27,26 @@ final class MenuSquaresViewContentCell: UITableViewCell, ReusableCell, ThemeAppl
         menuData = []
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         setupUI()
+        selectionStyle = .none
     }
 
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
+    // We override this method, for handling taps on MenuSquareView views
+    // This may be a temporary fix
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        guard self.bounds.contains(point) else { return nil }
+        for subview in contentStackView.arrangedSubviews {
+            let convertedPoint = self.convert(point, to: subview)
+            if let hitView = subview.hitTest(convertedPoint, with: event) {
+                return hitView
+            }
+        }
+        return super.hitTest(point, with: event)
+    }
+
     private func setupUI() {
         self.addSubview(contentStackView)
 
@@ -46,13 +60,20 @@ final class MenuSquaresViewContentCell: UITableViewCell, ReusableCell, ThemeAppl
 
     func reloadData(with data: [MenuSection]) {
         menuData = data
+        setupHorizontalTabs()
+    }
+
+    private func setupHorizontalTabs() {
         contentStackView.removeAllArrangedViews()
         guard let horizontalTabsSection else { return }
         for option in horizontalTabsSection.options {
             let squareView: MenuSquareView = .build { [weak self] view in
                 guard let self else { return }
                 view.configureCellWith(model: option)
                 if let theme { view.applyTheme(theme: theme) }
+                view.cellTapCallback = {
+                    option.action?()
+                }
             }
             contentStackView.addArrangedSubview(squareView)
         }