BUG#AC-1285: Buttons with duplicate labels fixed on Product landing page, add/edit product, add/edit page, add/edit block

Author: glo80326

app/code/Magento/Backend/Block/Widget/Button/SplitButton.php

@@ -164,8 +164,12 @@ public function getToggleAttributesHtml()
         if ($disabled) {
             $classes[] = $disabled;
         }
-
-        $attributes = ['title' => $title, 'class' => join(' ', $classes), 'disabled' => $disabled];
+        $attributes = [
+            'title' => $title,
+            'class' => join(' ', $classes),
+            'disabled' => $disabled,
+            'aria-label' => $this->getData('dropDownAriaLabel') ?: '',
+        ];
         $this->_getDataAttributes(['mage-init' => '{"dropdown": {}}', 'toggle' => 'dropdown'], $attributes);
 
         $html = $this->_getAttributesString($attributes);

app/code/Magento/Catalog/Block/Adminhtml/Product.php

@@ -59,6 +59,7 @@ protected function _prepareLayout()
             'button_class' => '',
             'class_name' => \Magento\Backend\Block\Widget\Button\SplitButton::class,
             'options' => $this->_getAddProductButtonOptions(),
+            'dropDownAriaLabel' => 'Add product of type'
         ];
         $this->buttonList->add('add_new', $addButtonProps);
 

app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveButton.php

@@ -8,13 +8,11 @@
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 use Magento\Ui\Component\Control\Container;
 
-/**
- * Class SaveButton
- * @package Magento\Customer\Block\Adminhtml\Edit
- */
 class SaveButton extends GenericButton implements ButtonProviderInterface
 {
     /**
+     * Get button data
+     *
      * @return array
      */
     public function getButtonData()
@@ -42,6 +40,7 @@ public function getButtonData()
             ],
             'class_name' => Container::SPLIT_BUTTON,
             'options' => $this->getOptions(),
+            'dropDownAriaLabel' => 'Save options',
         ];
     }
 

app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveButton.php

@@ -8,13 +8,11 @@
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 use Magento\Ui\Component\Control\Container;
 
-/**
- * Class SaveButton
- * @package Magento\Customer\Block\Adminhtml\Edit
- */
 class SaveButton extends GenericButton implements ButtonProviderInterface
 {
     /**
+     * Get button data
+     *
      * @return array
      */
     public function getButtonData()
@@ -40,6 +38,7 @@ public function getButtonData()
             'class_name' => Container::SPLIT_BUTTON,
             'options' => $this->getOptions(),
             'sort_order' => 90,
+            'dropDownAriaLabel' => 'Save options',
         ];
     }
 

app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php

@@ -9,9 +9,6 @@
 use Magento\Catalog\Block\Adminhtml\Product\Edit\Button\Generic;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
 
-/**
- * Class Save
- */
 class Save extends Generic
 {
     /**
@@ -43,6 +40,7 @@ public function getButtonData()
             ],
             'class_name' => Container::SPLIT_BUTTON,
             'options' => $this->getOptions(),
+            'dropDownAriaLabel' => 'Save options',
         ];
     }
 

app/code/Magento/Ui/Component/Control/SplitButton.php

@@ -161,7 +161,12 @@ public function getToggleAttributesHtml()
             $classes[] = $disabled;
         }
 
-        $attributes = ['title' => $title, 'class' => join(' ', $classes), 'disabled' => $disabled];
+        $attributes = [
+            'title' => $title,
+            'class' => join(' ', $classes),
+            'disabled' => $disabled,
+            'aria-label' => $this->getData('dropDownAriaLabel') ?: '',
+        ];
         $this->getDataAttributes(['mage-init' => '{"dropdown": {}}', 'toggle' => 'dropdown'], $attributes);
 
         $html = $this->attributesToHtml($attributes);