From d2aeaf39e585018bd13b9efce430216af97796a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= <eepi1994@hotmail.com>
Date: Tue, 23 May 2023 10:01:18 +0300
Subject: [PATCH] TMS-931: Navigation accessibility fixes

---
 CHANGELOG.MD                                     | 2 ++
 partials/ui/menu/menu-item-dropdown-content.dust | 8 +++++---
 partials/ui/menu/menu-item-single.dust           | 2 +-
 partials/ui/menu/menu-item.dust                  | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index e3ad585..9914cc0 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- TMS-931: Navigation accessibility fixes
+
 ## [1.12.0] – 2023-04-11
 
 - PIEN-8157: PHP 8.1
diff --git a/partials/ui/menu/menu-item-dropdown-content.dust b/partials/ui/menu/menu-item-dropdown-content.dust
index fc3e3bb..1236131 100644
--- a/partials/ui/menu/menu-item-dropdown-content.dust
+++ b/partials/ui/menu/menu-item-dropdown-content.dust
@@ -8,11 +8,13 @@
                 </a>
 
                 <div class="navbar-dropdown-items">
-                    <div class="navbar-grid">
+                    <ul class="navbar-grid">
                         {#sub_menu}
-                            {>"ui/menu/menu-item-simple" icon="chevron-right" /}
+                            <li>
+                                {>"ui/menu/menu-item-simple" icon="chevron-right" /}
+                            </li>
                         {/sub_menu}
-                    </div>
+                    </ul>
                 </div>
             </div>
         </div>
diff --git a/partials/ui/menu/menu-item-single.dust b/partials/ui/menu/menu-item-single.dust
index fb1013b..90ef1c7 100644
--- a/partials/ui/menu/menu-item-single.dust
+++ b/partials/ui/menu/menu-item-single.dust
@@ -1,5 +1,5 @@
 <li class="navbar-item navbar-item__single is-uppercase {#classes}{.}{@sep} {/sep}{/classes}">
-    <a href="{url}" class="is-arrowless pr-0 pl-0">
+    <a href="{url}" class="is-arrowless pr-0 pl-0" {?classes.is_current}aria-page='current'{/classes.is_current}>
         {title|s}
     </a>
 </li>
diff --git a/partials/ui/menu/menu-item.dust b/partials/ui/menu/menu-item.dust
index a14a4f9..23321ec 100644
--- a/partials/ui/menu/menu-item.dust
+++ b/partials/ui/menu/menu-item.dust
@@ -5,7 +5,7 @@
 {?sub_menu}
     <li class="navbar-item has-dropdown {#classes}{.}{@sep} {/sep}{/classes}">
         <div class="navbar-dropdown-control">
-            <a class="navbar-link is-arrowless is-uppercase" href="{url}">
+            <a class="navbar-link is-arrowless is-uppercase" href="{url}" {?classes.is_current}aria-page="current"{/classes.is_current}>
                 {title|s}
             </a>