ソースを参照

Merge pull request #19823 from overleaf/rd-navbar-pug-a11y

[web] Announce buttons as menu items in the navigation bar and allow tabbing within the menu

GitOrigin-RevId: 138fef3369bf5c89487e673ab42c06b7c13bcf48
Rebeka Dekany 2 年 前
コミット
57b3871c1c

+ 1 - 1
services/web/app/views/_mixins/navbar.pug

@@ -16,7 +16,7 @@ mixin dropdown-menu-item
 
 
 mixin dropdown-menu-link-item
 mixin dropdown-menu-link-item
 	+dropdown-menu-item
 	+dropdown-menu-item
-		a(role="menuitem", tabindex="-1").dropdown-item&attributes(attributes)
+		a(role="menuitem").dropdown-item&attributes(attributes)
 			block
 			block
 		
 		
 mixin dropdown-menu-divider
 mixin dropdown-menu-divider

+ 3 - 0
services/web/app/views/layout/navbar-marketing-bootstrap-5.pug

@@ -45,6 +45,7 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg
 								aria-haspopup="true",
 								aria-haspopup="true",
 								aria-expanded="false",
 								aria-expanded="false",
 								data-bs-toggle="dropdown"
 								data-bs-toggle="dropdown"
+								role="menuitem"
 							)
 							)
 								| Admin
 								| Admin
 								span.caret
 								span.caret
@@ -80,6 +81,7 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg
 										aria-haspopup="true",
 										aria-haspopup="true",
 										aria-expanded="false",
 										aria-expanded="false",
 										data-bs-toggle="dropdown"
 										data-bs-toggle="dropdown"
+										role="menuitem"
 									)
 									)
 										| !{translate(item.text)}
 										| !{translate(item.text)}
 										span.caret
 										span.caret
@@ -150,6 +152,7 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg
 								aria-haspopup="true",
 								aria-haspopup="true",
 								aria-expanded="false",
 								aria-expanded="false",
 								data-bs-toggle="dropdown"
 								data-bs-toggle="dropdown"
+								role="menuitem"
 							)
 							)
 								| #{translate('Account')}
 								| #{translate('Account')}
 								span.caret
 								span.caret