<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[60040] trunk/src/wp-content/themes/twentytwenty: Bundled Themes: A11y: Dismiss submenus with `esc` in Twenty Twenty.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/60040">60040</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/60040","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-03-18 14:39:38 +0000 (Tue, 18 Mar 2025)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Bundled Themes: A11y: Dismiss submenus with `esc` in Twenty Twenty.
Allow submenus in Twenty Twenty to be dismissed using the `esc` key to meet WCAG 1.4.13. Set focus to previous submenu parent on `esc`, and ensure that after escaping the last submenu, tab moves to the next parent item, not back into the submenu.
Props lcarevic, rcreators, pratiklondhe, poena, karmatosed, chaion07, audrasjb, mehdi01, mohonchandra, najmulsaju, saurabhdhariwal, ugyensupport, shailu25.
Fixes <a href="https://core.trac.wordpress.org/ticket/49950">#49950</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentytwentyassetsjsindexjs">trunk/src/wp-content/themes/twentytwenty/assets/js/index.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentystylertlcss">trunk/src/wp-content/themes/twentytwenty/style-rtl.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentystylecss">trunk/src/wp-content/themes/twentytwenty/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentytwentyassetsjsindexjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/assets/js/index.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/assets/js/index.js 2025-03-18 13:13:13 UTC (rev 60039)
+++ trunk/src/wp-content/themes/twentytwenty/assets/js/index.js 2025-03-18 14:39:38 UTC (rev 60040)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,29 +438,91 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> links = menu.getElementsByTagName( 'a' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Each time a menu link is focused or blurred, toggle focus.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Each time a menu link is focused, update focus.
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( i = 0, len = links.length; i < len; i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- links[i].addEventListener( 'focus', toggleFocus, true );
- links[i].addEventListener( 'blur', toggleFocus, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ links[i].addEventListener( 'focus', updateFocus, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //Sets or removes the .focus class on an element.
- function toggleFocus() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menu.addEventListener( 'focusout', removeFocus, true );
+
+ // Remove focus classes from menu.
+ function removeFocus(e){
+ const leavingMenu = ! menu.contains( e.relatedTarget );
+
+ if ( leavingMenu ) {
+ // Remove focus from all li elements of primary-menu.
+ menu.querySelectorAll( 'li' ).forEach( function( el ) {
+ if ( el.classList.contains( 'focus' ) ) {
+ el.classList.remove( 'focus', 'closed' );
+ }
+ });
+ }
+ }
+
+ // Update focus class on an element.
+ function updateFocus() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var self = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Move up through the ancestors of the current link until we hit .primary-menu.
- while ( -1 === self.className.indexOf( 'primary-menu' ) ) {
- // On li elements toggle the class .focus.
- if ( 'li' === self.tagName.toLowerCase() ) {
- if ( -1 !== self.className.indexOf( 'focus' ) ) {
- self.className = self.className.replace( ' focus', '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove focus from all li elements of primary-menu.
+ menu.querySelectorAll( 'li' ).forEach( function( el ){
+ if ( el.classList.contains( 'closed' ) ) {
+ el.classList.remove( 'closed' );
+ }
+ if ( el.classList.contains( 'focus' ) ) {
+ el.classList.remove( 'focus' );
+ }
+ });
+
+ // Set focus on current `a` element's parent `li`.
+ self.parentElement.classList.add( 'focus' );
+ // If current element is inside sub-menu find main parent li and add focus.
+ if ( self.closest( '.menu-item-has-children' ) ) {
+ twentytwentyFindParents( self, 'li.menu-item-has-children' ).forEach( function( element ) {
+ element.classList.add( 'focus' );
+ });
+ }
+ }
+
+ // When the `esc` key is pressed while in menu, move focus up one level.
+ menu.addEventListener( 'keydown', removeFocusEsc, true );
+
+ // Remove focus when `esc` key pressed.
+ function removeFocusEsc( e ) {
+ e = e || window.event;
+ var isEscape = false,
+ focusedElement = e.target;
+
+ // Find if pressed key is `esc`.
+ if ( 'key' in e ) {
+ isEscape = ( e.key === 'Escape' || e.key === 'Esc' );
+ } else {
+ isEscape = ( e.keyCode === 27 );
+ }
+
+ // If pressed key is esc, remove focus class from parent menu li.
+ if ( isEscape ) {
+ var parentLi = focusedElement.closest( 'li' ),
+ nestedParent = closestExcludingSelf( parentLi, 'li.menu-item-has-children' ),
+ focusPosition = nestedParent ? nestedParent.querySelector('a') : false;
+
+ if ( null !== nestedParent ) {
+ nestedParent.classList.add( 'focus' );
+ focusPosition.focus();
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self.className += ' focus';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parentLi.classList.remove( 'focus' );
+ parentLi.classList.add( 'closed' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
- self = self.parentElement;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ function closestExcludingSelf(element, selector) {
+ if ( ! element || ! selector ) {
+ return null;
+ }
+ const parent = element.parentElement;
+
+ return parent ? parent.closest(selector) : null;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }; // twentytwenty.primaryMenu
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentystylertlcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/style-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/style-rtl.css 2025-03-18 13:13:13 UTC (rev 60039)
+++ trunk/src/wp-content/themes/twentytwenty/style-rtl.css 2025-03-18 14:39:38 UTC (rev 60040)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1676,6 +1676,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> z-index: 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.primary-menu .closed ul {
+ display: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .primary-menu li.menu-item-has-children:hover > ul,
</span><span class="cx" style="display: block; padding: 0 10px"> .primary-menu li.menu-item-has-children:focus > ul,
</span><span class="cx" style="display: block; padding: 0 10px"> .primary-menu li.menu-item-has-children.focus > ul {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentystylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/style.css 2025-03-18 13:13:13 UTC (rev 60039)
+++ trunk/src/wp-content/themes/twentytwenty/style.css 2025-03-18 14:39:38 UTC (rev 60040)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1682,6 +1682,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> z-index: 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.primary-menu .closed ul {
+ display: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .primary-menu li.menu-item-has-children:hover > ul,
</span><span class="cx" style="display: block; padding: 0 10px"> .primary-menu li.menu-item-has-children:focus > ul,
</span><span class="cx" style="display: block; padding: 0 10px"> .primary-menu li.menu-item-has-children.focus > ul {
</span></span></pre>
</div>
</div>
</body>
</html>