Ticket #43154: 43154.diff

src/js/media/views/modal.js

@@ -137 +137 @@
                 if ( null !== this.clickedOpenerEl ) {
                         this.clickedOpenerEl.focus();
                 } else {
-                        $( '#wpbody-content' ).focus();
+                        $( '#wpbody-content' )
+                                .attr( 'tabindex', '-1' )
+                                .focus();
                 }
 
                 this.propagate('close');

src/wp-admin/admin-header.php

@@ -248 +248 @@
 
 ?>
 
-<div id="wpbody-content" aria-label="<?php esc_attr_e( 'Main content' ); ?>" tabindex="0">
+<div id="wpbody-content">
 <?php
 
 $current_screen->render_screen_meta();

src/wp-includes/class-wp-admin-bar.php

@@ -438 +438 @@
                         <?php if ( ! is_admin() ) { ?>
                                 <a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e( 'Skip to toolbar' ); ?></a>
                         <?php } ?>
-                        <div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e( 'Toolbar' ); ?>" tabindex="0">
+                        <div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e( 'Toolbar' ); ?>">
                                 <?php
                                 foreach ( $root->children as $group ) {
                                         $this->_render_group( $group );