Ticket #53951: 53951-3.diff

src/wp-content/themes/twentytwenty/assets/js/index.js

@@ -678 +678 @@
 /* Toggle an attribute ----------------------- */
 
 function twentytwentyToggleAttribute( element, attribute, trueVal, falseVal ) {
-        if ( element.classList.contains( 'close-search-toggle' ) ) {
+        if ( element.classList.contains( 'skip-aria-expanded' ) ) {
                 return;
         }
         if ( trueVal === undefined ) {

src/wp-content/themes/twentytwenty/header.php

@@ -45 +45 @@
 
                                                 ?>
 
-                                                <button class="toggle search-toggle mobile-search-toggle" data-toggle-target=".search-modal" data-toggle-body-class="showing-search-modal" data-set-focus=".search-modal .search-field" aria-expanded="false">
+                                                <button class="toggle search-toggle mobile-search-toggle skip-aria-expanded" data-toggle-target=".search-modal" data-toggle-body-class="showing-search-modal" data-set-focus=".search-modal .search-field">
                                                         <span class="toggle-inner">
                                                                 <span class="toggle-icon">
                                                                         <?php twentytwenty_the_theme_svg( 'search' ); ?>
@@ -151 +151 @@
 
                                                         <div class="toggle-wrapper search-toggle-wrapper">
 
-                                                                <button class="toggle search-toggle desktop-search-toggle" data-toggle-target=".search-modal" data-toggle-body-class="showing-search-modal" data-set-focus=".search-modal .search-field" aria-expanded="false">
+                                                                <button class="toggle search-toggle desktop-search-toggle skip-aria-expanded" data-toggle-target=".search-modal" data-toggle-body-class="showing-search-modal" data-set-focus=".search-modal .search-field">
                                                                         <span class="toggle-inner">
                                                                                 <?php twentytwenty_the_theme_svg( 'search' ); ?>
                                                                                 <span class="toggle-text"><?php _ex( 'Search', 'toggle text', 'twentytwenty' ); ?></span>

src/wp-content/themes/twentytwenty/template-parts/modal-search.php

@@ -8 +8 @@
  */
 
 ?>
-<div class="search-modal cover-modal header-footer-group" data-modal-target-string=".search-modal">
+<div class="search-modal cover-modal header-footer-group" data-modal-target-string=".search-modal" data-untoggle-on-escape="true" role="dialog" tabindex="-1">
 
         <div class="search-modal-inner modal-inner">
 
@@ -22 +22 @@
                         );
                         ?>
 
-                        <button class="toggle search-untoggle close-search-toggle fill-children-current-color" data-toggle-target=".search-modal" data-toggle-body-class="showing-search-modal" data-set-focus=".search-modal .search-field">
+                        <button class="toggle search-untoggle close-search-toggle fill-children-current-color skip-aria-expanded" data-toggle-target=".search-modal" data-toggle-body-class="showing-search-modal" data-set-focus=".search-modal .search-field">
                                 <span class="screen-reader-text"><?php _e( 'Close search', 'twentytwenty' ); ?></span>
                                 <?php twentytwenty_the_theme_svg( 'cross' ); ?>
                         </button><!-- .search-toggle -->