From 4333dd0ac926d12280a24cd7fa247904a0ed293e Mon Sep 17 00:00:00 2001
From: Chi-teck <Chi-teck@users.noreply.github.com>
Date: Wed, 19 Aug 2020 17:04:29 +0000
Subject: [PATCH] Toolbar toggler accessibility

---
 .../Resources/views/Profiler/base_js.html.twig       | 12 ++++++++++--
 .../Resources/views/Profiler/toolbar.css.twig        | 11 ++++++++---
 .../Resources/views/Profiler/toolbar.html.twig       |  8 ++++----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
index db3791abda..5f623a406b 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -473,7 +473,11 @@
                                 }
                             };
                         }
-                        addEventListener(document.getElementById('sfToolbarHideButton-' + newToken), 'click', function (event) {
+                        var hideButton = document.getElementById('sfToolbarHideButton-' + newToken);
+                        var hideButtonSvg = hideButton.querySelector('svg');
+                        hideButtonSvg.setAttribute('aria-hidden', 'true');
+                        hideButtonSvg.setAttribute('focusable', 'false');
+                        addEventListener(hideButton, 'click', function (event) {
                             event.preventDefault();
 
                             var p = this.parentNode;
@@ -482,7 +486,11 @@
                             document.getElementById('sfMiniToolbar-' + newToken).style.display = 'block';
                             setPreference('toolbar/displayState', 'none');
                         });
-                        addEventListener(document.getElementById('sfToolbarMiniToggler-' + newToken), 'click', function (event) {
+                        var showButton = document.getElementById('sfToolbarMiniToggler-' + newToken);
+                        var showButtonSvg = showButton.querySelector('svg');
+                        showButtonSvg.setAttribute('aria-hidden', 'true');
+                        showButtonSvg.setAttribute('focusable', 'false');
+                        addEventListener(showButton, 'click', function (event) {
                             event.preventDefault();
 
                             var elem = this.parentNode;
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
index 6669cd721f..be545da0e2 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -14,8 +14,10 @@
     z-index: 99999;
 }
 
-.sf-minitoolbar a {
-    display: block;
+.sf-minitoolbar button {
+    background-color: transparent;
+    padding: 0;
+    border: none;
 }
 .sf-minitoolbar svg,
 .sf-minitoolbar img {
@@ -81,10 +83,13 @@
     height: 36px;
     cursor: pointer;
     text-align: center;
+    border: none;
+    margin: 0;
+    padding: 0;
 }
 .sf-toolbarreset .hide-button svg {
     max-height: 18px;
-    margin-top: 10px;
+    margin-top: 1px;
 }
 
 .sf-toolbar-block {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
index a211617d72..efc89db286 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
@@ -1,8 +1,8 @@
 <!-- START of Symfony Web Debug Toolbar -->
 <div id="sfMiniToolbar-{{ token }}" class="sf-minitoolbar" data-no-turbolink>
-    <a href="#" title="Show Symfony toolbar" tabindex="-1" id="sfToolbarMiniToggler-{{ token }}" accesskey="D">
+    <button type="button" title="Show Symfony toolbar" id="sfToolbarMiniToggler-{{ token }}" accesskey="D" aria-expanded="false" aria-controls="sfToolbarMainContent-{{ token }}">
         {{ include('@WebProfiler/Icon/symfony.svg') }}
-    </a>
+    </button>
 </div>
 <div id="sfToolbarClearer-{{ token }}" class="sf-toolbar-clearer"></div>
 
@@ -23,8 +23,8 @@
         {% endif %}
     {% endfor %}
 
-    <a class="hide-button" id="sfToolbarHideButton-{{ token }}" title="Close Toolbar" tabindex="-1" accesskey="D">
+    <button class="hide-button" type="button" id="sfToolbarHideButton-{{ token }}" title="Close Toolbar" accesskey="D" aria-expanded="true" aria-controls="sfToolbarMainContent-{{ token }}">
         {{ include('@WebProfiler/Icon/close.svg') }}
-    </a>
+    </button>
 </div>
 <!-- END of Symfony Web Debug Toolbar -->