Merge remote-tracking branch 'origin/BUG#AC-1285' into gl_pr_accessibility_release244_nov23_2021

Author: rimple-saini

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('dropdown_button_aria_label') ?: '',
+        ];
         $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(),
+            'dropdown_button_aria_label' => __('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(),
+            'dropdown_button_aria_label' => __('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,
+            'dropdown_button_aria_label' => __('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(),
+            'dropdown_button_aria_label' => __('Save options'),
         ];
     }
 

app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php

@@ -63,5 +63,6 @@ public function testGetButtonData()
 
         $this->assertArrayHasKey('data_attribute', $result);
         $this->assertArrayHasKey('options', $result);
+        $this->assertArrayHasKey('dropdown_button_aria_label', $result);
     }
 }

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('dropdown_button_aria_label') ?: '',
+        ];
         $this->getDataAttributes(['mage-init' => '{"dropdown": {}}', 'toggle' => 'dropdown'], $attributes);
 
         $html = $this->attributesToHtml($attributes);

dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php

@@ -74,7 +74,8 @@ public function testToHtml(): void
                         'onclick' => $onclick = 'console.log("option")',
                         'style' => 'width: 100px'
                     ]
-                ]
+                ],
+                'dropdown_button_aria_label' => 'Split button options',
             ]
         );
 
@@ -83,8 +84,12 @@ public function testToHtml(): void
         $this->assertStringContainsString('<span>A button</span>', $html);
         $this->assertStringNotContainsString('onclick=', $html);
         $this->assertStringNotContainsString('style=', $html);
-        $this->assertMatchesRegularExpression('/\<script.*?\>.*?' . preg_quote($onclick) . '.*?\<\/script\>/ims', $html);
+        $this->assertMatchesRegularExpression(
+            '/\<script.*?\>.*?' . preg_quote($onclick) . '.*?\<\/script\>/ims',
+            $html
+        );
         $this->assertStringContainsString('width', $html);
         $this->assertStringContainsString('100px', $html);
+        $this->assertStringContainsString('aria-label="Split button options"', $html);
     }
 }

dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php

@@ -76,7 +76,8 @@ public function testToHtml(): void
                         'onclick' => $onclick = 'console.log("option")',
                         'style' => 'width: 100px'
                     ]
-                ]
+                ],
+                'dropdown_button_aria_label' => 'Split button options',
             ]
         );
 
@@ -85,8 +86,12 @@ public function testToHtml(): void
         $this->assertStringContainsString('<span>Split button control</span>', $html);
         $this->assertStringNotContainsString('onclick=', $html);
         $this->assertStringNotContainsString('style=', $html);
-        $this->assertMatchesRegularExpression('/\<script.*?\>.*?' . preg_quote($onclick) . '.*?\<\/script\>/ims', $html);
+        $this->assertMatchesRegularExpression(
+            '/\<script.*?\>.*?' . preg_quote($onclick) . '.*?\<\/script\>/ims',
+            $html
+        );
         $this->assertStringContainsString('width', $html);
         $this->assertStringContainsString('100px', $html);
+        $this->assertStringContainsString('aria-label="Split button options"', $html);
     }
 }