From 951dd742d85e3dbee2763d977c2d7b17bfa81234 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 14 Feb 2024 12:12:08 +0100
Subject: [PATCH] add accessibility to open and close buttons (#311)

refactor the way to focus apps when the menu is opened (#301)
---
 css/sideMenu.css                |  6 ++++++
 src/CloserButton.vue            |  9 ++++++++-
 src/OpenerButton.vue            |  6 ++++--
 src/l10n/fixtures/tpl/base.yaml |  2 +-
 src/lib/createElement.js        |  8 +++++++-
 templates/js/script.php         | 36 +++++++++++----------------------
 6 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/css/sideMenu.css b/css/sideMenu.css
index b66e53a..8a63202 100644
--- a/css/sideMenu.css
+++ b/css/sideMenu.css
@@ -83,6 +83,12 @@
   padding-left: 12px !important;
   margin-left: 5px !important;
   margin-left: 3px !important;
+  overflow: hidden;
+}
+
+.side-menu-opener span {
+  position: relative;
+  left: 50px;
 }
 
 .side-menu-opener:active, .side-menu-opener:focus {
diff --git a/src/CloserButton.vue b/src/CloserButton.vue
index 99779f8..80ed747 100644
--- a/src/CloserButton.vue
+++ b/src/CloserButton.vue
@@ -15,11 +15,18 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
-  <button class="side-menu-opener side-menu-closer"></button>
+  <button class="side-menu-opener side-menu-closer" :arial-label="label">
+    <span v-text="label"></span>
+  </button>
 </template>
 
 <script>
 export default {
   name: 'CloserButton',
+  data() {
+    return {
+      label: t('side_menu', 'Close the menu'),
+    }
+  }
 }
 </script>
diff --git a/src/OpenerButton.vue b/src/OpenerButton.vue
index 58298ae..538291c 100644
--- a/src/OpenerButton.vue
+++ b/src/OpenerButton.vue
@@ -15,7 +15,9 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
-  <button class="side-menu-opener" :arial-label="label"></button>
+  <button class="side-menu-opener" :arial-label="label">
+    <span v-text="label"></span>
+  </button>
 </template>
 
 <script>
@@ -23,7 +25,7 @@ export default {
   name: 'OpenerButton',
   data() {
     return {
-      label: t('side_menu', 'Toggle menu'),
+      label: t('side_menu', 'Toggle the menu'),
     }
   }
 }
diff --git a/src/l10n/fixtures/tpl/base.yaml b/src/l10n/fixtures/tpl/base.yaml
index f957f2c..3456785 100644
--- a/src/l10n/fixtures/tpl/base.yaml
+++ b/src/l10n/fixtures/tpl/base.yaml
@@ -95,4 +95,4 @@
 "Hide labels on mouse over": ""
 "Except the hovered app": ""
 "Search": ""
-"Toggle menu": ""
+"Toggle the menu": ""
diff --git a/src/lib/createElement.js b/src/lib/createElement.js
index 19c8207..9be7ff4 100644
--- a/src/lib/createElement.js
+++ b/src/lib/createElement.js
@@ -3,7 +3,13 @@ module.exports = (tagName, attributes) => {
 
   if (typeof attributes === 'object') {
     for (let i in attributes) {
-      element.setAttribute(i, attributes[i])
+      if (i === 'text') {
+        element.textContent = attributes[i]
+      } else if (i === 'html') {
+        element.innerHTML = attributes[i]
+      } else {
+        element.setAttribute(i, attributes[i])
+      }
     }
   }
 
diff --git a/templates/js/script.php b/templates/js/script.php
index 7607a49..b67c9b2 100644
--- a/templates/js/script.php
+++ b/templates/js/script.php
@@ -16,7 +16,8 @@ if ($_['always-displayed']) {
   const sideMenuContainer = SMcreateElement('div', {id: 'side-menu-container'})
   const sideMenuOpener = SMcreateElement('button', {
     'class': 'side-menu-opener',
-    'arial-label': t('side_menu', 'Toggle menu')
+    'arial-label': t('side_menu', 'Toggle the menu'),
+    'html': `<span>${t('side_menu', 'Toggle the menu')}</span>`
   })
   const sideMenu = SMcreateElement('div', {id: 'side-menu'})
 
@@ -38,6 +39,15 @@ if ($_['always-displayed']) {
     sideMenu.setAttribute('data-sidewithcategories', '1')
   <?php endif; ?>
 
+  const sideMenuFocus = () => {
+    let a = document.querySelector('#side-menu .side-menu-app.active a')
+      || document.querySelector('#side-menu .side-menu-app a')
+
+    if (a) {
+      a.focus()
+    }
+  }
+
   document.querySelector('body').addEventListener('side-menu.apps', (e) => {
     const apps = e.detail.apps;
 
@@ -80,22 +90,6 @@ if ($_['always-displayed']) {
       return
     }
 
-    sideMenuFocus = () => {
-      let a = document.querySelector('.side-menu-app.active a', sideMenu)
-
-      if (!a) {
-        return
-      }
-
-      if (a.length === 0) {
-        a = sideMenu.querySelector('.side-menu-app:first-child a')
-      }
-
-      if (a.length > 0) {
-        a.focus()
-      }
-    }
-
     <?php if ($_['opener-hover']): ?>
       const sideMenuMouseLeave = () => {
         sideMenu.classList.remove('open')
@@ -127,14 +121,8 @@ if ($_['always-displayed']) {
 
     headerMenuOpener.addEventListener('click', () => {
       sideMenu.classList.add('open')
-
-      const a = sideMenu.querySelector('.side-menu-app.active a')
-
-      if (a !== null) {
-        a.focus()
-      }
-
       headerMenuOpener.blur()
+      sideMenuFocus()
     })
 
     for (let opener of sideMenuOpener) {