Fix: Ensure menu is compatible with clickable headings in core (#127)

adaptlearning · Oct 11, 2022 · 49177af · 49177af
1 parent 4c5e984
commit 49177af
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "adapt-contrib-boxMenu",
   "version": "6.0.1",
-  "framework": ">=5.19.1",
+  "framework": ">=5.22.6",
   "homepage": "https://github.com/adaptlearning/adapt-contrib-boxMenu",
   "bugs": "https://github.com/adaptlearning/adapt-contrib-boxMenu/issues",
   "menu": "boxMenu",

diff --git a/templates/boxMenu.hbs b/templates/boxMenu.hbs
@@ -8,15 +8,7 @@
 
       {{#if displayTitle}}
       <div class="menu__title boxmenu__title">
-
-        {{#unless _disableAccessibleState}}
-        <div class="js-heading"></div>
-        {{/unless}}
-
-        <div class="menu__title-inner boxmenu__title-inner" {{#unless _disableAccessibleState}}aria-hidden="true"{{/unless}}>
-          {{{compile displayTitle}}}
-        </div>
-
+        <div class="menu__title-inner boxmenu__title-inner js-heading"></div>
       </div>
       {{/if}}
 

diff --git a/templates/boxMenuGroup.hbs b/templates/boxMenuGroup.hbs
@@ -7,11 +7,7 @@
 
       {{#if displayTitle}}
       <div class="menu-group__title boxmenu-group__title">
-        <div class="js-heading" data-a11y-heading-type="menuGroup"></div>
-
-        <div class="menu-group__title-inner boxmenu-group__title-inner accessible-text-block" aria-hidden="true">
-          {{{compile displayTitle}}}
-        </div>
+        <div class="menu-group__title-inner boxmenu-group__title-inner accessible-text-block js-heading" data-a11y-heading-type="menuGroup"></div>
       </div>
       {{/if}}
 

diff --git a/templates/boxMenuItem.hbs b/templates/boxMenuItem.hbs
@@ -13,11 +13,7 @@
 
       {{#if displayTitle}}
       <div class="menu-item__title boxmenu-item__title">
-        <div class="js-heading" data-a11y-heading-type="menuItem"></div>
-
-        <div class="menu-item__title-inner boxmenu-item__title-inner" aria-hidden="true">
-          {{{compile displayTitle}}}
-        </div>
+        <div class="menu-item__title-inner boxmenu-item__title-inner js-heading" data-a11y-heading-type="menuItem"></div>
       </div>
       {{/if}}