<!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>[58449] trunk/src: Administration: A11y: Use `aria-haspopup` only if item has popup behavior.</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/58449">58449</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/58449","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>2024-06-20 19:39:50 +0000 (Thu, 20 Jun 2024)</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'>Administration: A11y: Use `aria-haspopup` only if item has popup behavior.
Update behavior of admin menu so that the `aria-haspopup` attribute is only applied in responsive mode, when there is a popup behavior present. Add `aria-expanded` attributes to report current popup state.
Props afercia, khokansardar, ryokuhi, joedolson.
Fixes <a href="https://core.trac.wordpress.org/ticket/43095">#43095</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadmincommonjs">trunk/src/js/_enqueues/admin/common.js</a></li>
<li><a href="#trunksrcwpadminmenuheaderphp">trunk/src/wp-admin/menu-header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadmincommonjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/common.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/common.js 2024-06-20 16:28:55 UTC (rev 58448)
+++ trunk/src/js/_enqueues/admin/common.js 2024-06-20 19:39:50 UTC (rev 58449)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -903,27 +903,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><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">- * Handles the `aria-haspopup` attribute on the current menu item when it has a submenu.
- *
- * @since 4.4.0
- *
- * @return {void}
- */
- function currentMenuItemHasPopup() {
- var $current = $( 'a.wp-has-current-submenu' );
-
- if ( 'folded' === menuState ) {
- // When folded or auto-folded and not responsive view, the current menu item does have a fly-out sub-menu.
- $current.attr( 'aria-haspopup', 'true' );
- } else {
- // When expanded or in responsive view, reset aria-haspopup.
- $current.attr( 'aria-haspopup', 'false' );
- }
- }
-
- $document.on( 'wp-menu-state-set wp-collapse-menu wp-responsive-activate wp-responsive-deactivate', currentMenuItemHasPopup );
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Ensures an admin submenu is within the visual viewport.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1695,8 +1674,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Modify functionality based on custom activate/deactivate event.
</span><span class="cx" style="display: block; padding: 0 10px"> $document.on( 'wp-responsive-activate.wp-responsive', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> self.activate();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self.toggleAriaHasPopup( 'add' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }).on( 'wp-responsive-deactivate.wp-responsive', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> self.deactivate();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self.toggleAriaHasPopup( 'remove' );
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#wp-admin-bar-menu-toggle a' ).attr( 'aria-expanded', 'false' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1748,7 +1729,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> setTimeout( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var focusIsInToggle = $.contains( toggleButton, focusedElement );
</span><span class="cx" style="display: block; padding: 0 10px"> var focusIsInSidebar = $.contains( sidebar, focusedElement );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! focusIsInToggle && ! focusIsInSidebar ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( toggleButton ).trigger( 'click.wp-responsive' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1762,8 +1743,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $adminmenu.data('wp-responsive') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ let state = ( 'false' === $( this ).attr( 'aria-expanded' ) ) ? 'true' : 'false';
</ins><span class="cx" style="display: block; padding: 0 10px"> $( this ).parent( 'li' ).toggleClass( 'selected' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( this ).attr( 'aria-expanded', state );
</ins><span class="cx" style="display: block; padding: 0 10px"> $( this ).trigger( 'focus' );
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1838,6 +1820,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</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">+ * Toggles the aria-haspopup attribute for the responsive admin menu.
+ *
+ * The aria-haspopup attribute is only necessary for the responsive menu.
+ * See ticket https://core.trac.wordpress.org/ticket/43095
+ *
+ * @since 6.6.0
+ *
+ * @param {string} action Whether to add or remove the aria-haspopup attribute.
+ *
+ * @return {void}
+ */
+ toggleAriaHasPopup: function( action ) {
+ var elements = $adminmenu.find( '[data-ariahaspopup]' );
+
+ if ( action === 'add' ) {
+ elements.each( function() {
+ $( this ).attr( 'aria-haspopup', 'menu' ).attr( 'aria-expanded', 'false' );
+ } );
+
+ return;
+ }
+
+ elements.each( function() {
+ $( this ).removeAttr( 'aria-haspopup' ).removeAttr( 'aria-expanded' );
+ } );
+ },
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Sets the responsiveness and enables the overlay based on the viewport width.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.8.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2034,7 +2044,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> window.wpResponsive.init();
</span><span class="cx" style="display: block; padding: 0 10px"> setPinMenu();
</span><span class="cx" style="display: block; padding: 0 10px"> setMenuState();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- currentMenuItemHasPopup();
</del><span class="cx" style="display: block; padding: 0 10px"> makeNoticesDismissible();
</span><span class="cx" style="display: block; padding: 0 10px"> aria_button_if_js();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminmenuheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/menu-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu-header.php 2024-06-20 16:28:55 UTC (rev 58448)
+++ trunk/src/wp-admin/menu-header.php 2024-06-20 19:39:50 UTC (rev 58449)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $class[] = 'wp-not-current-submenu';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $submenu_items ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $aria_attributes .= 'aria-haspopup="true"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $aria_attributes .= 'data-ariahaspopup';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>