Bugfix FXIOS-10584 - [Toolbar Redesign] 20+ new homepage tabs are opened when I try to open just one new tab (#23253)

Make self weak in the button action handler and remove code that checks for existing buttons

Author: PARAIPAN9

BrowserKit/Sources/ToolbarKit/AddressToolbar/BrowserAddressToolbar.swift

@@ -257,15 +257,9 @@ public class BrowserAddressToolbar: UIView,
     }
 
     private func updateActionStack(stackView: UIStackView, toolbarElements: [ToolbarElement]) {
-        let existingButtons = stackView.arrangedSubviews.compactMap { $0 as? ToolbarButton }
         stackView.removeAllArrangedViews()
-
         toolbarElements.forEach { toolbarElement in
-            // find existing button or create new one
-            // we do this to avoid having a new button every time we re-configure the address toolbar
-            // as this can result in button taps not resulting in correct action because the action
-            // as the reference to an old and not displayed button (e.g. the menu that is displayed from the menu button)
-            let button = newOrExistingToolbarButton(for: toolbarElement, existingButtons: existingButtons)
+            let button = toolbarElement.numberOfTabs != nil ? TabNumberButton() : ToolbarButton()
             button.configure(element: toolbarElement)
             stackView.addArrangedSubview(button)
 
@@ -285,17 +279,6 @@ public class BrowserAddressToolbar: UIView,
         }
     }
 
-    private func newOrExistingToolbarButton(for element: ToolbarElement,
-                                            existingButtons: [ToolbarButton]) -> ToolbarButton {
-        let existingButton = existingButtons.first { $0.isButtonFor(toolbarElement: element) }
-
-        guard let existingButton else {
-            return element.numberOfTabs != nil ? TabNumberButton() : ToolbarButton()
-        }
-
-        return existingButton
-    }
-
     private func updateActionSpacing() {
         // Browser action spacing
         let hasBrowserActions = !browserActionStack.arrangedSubviews.isEmpty

BrowserKit/Sources/ToolbarKit/ToolbarButton.swift

@@ -47,7 +47,8 @@ class ToolbarButton: UIButton, ThemeApplicable {
         let image = imageConfiguredForRTL(for: element)
         let action = UIAction(title: element.a11yLabel,
                               image: image,
-                              handler: { _ in
+                              handler: { [weak self] _ in
+            guard let self else { return }
             element.onSelected?(self)
             UIAccessibility.post(notification: .announcement, argument: element.a11yLabel)
         })
@@ -102,17 +103,6 @@ class ToolbarButton: UIButton, ThemeApplicable {
         configuration = updatedConfiguration
     }
 
-    public func isButtonFor(toolbarElement: ToolbarElement) -> Bool {
-        guard let config = configuration else { return false }
-
-        return isSelected == toolbarElement.isSelected &&
-            config.image == imageConfiguredForRTL(for: toolbarElement) &&
-            isEnabled == toolbarElement.isEnabled &&
-            accessibilityIdentifier == toolbarElement.a11yId &&
-            accessibilityLabel == toolbarElement.a11yLabel &&
-            accessibilityHint == toolbarElement.a11yHint
-    }
-
     private func addBadgeIcon(imageName: String) {
         badgeImageView = UIImageView(image: UIImage(named: imageName))
         guard let badgeImageView, configuration?.image != nil else { return }