Accessibility: Media: Improve the logic to render the ARIA tabs markup after [46363].

Additionally checks for the "menu" and "router" state attributes to better determine when the ARIA tabs pattern markup is appropriate.

See #47149.

Built from https://develop.svn.wordpress.org/trunk@46438


git-svn-id: http://core.svn.wordpress.org/trunk@46236 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/js/media-views.js

@@ -3004,7 +3004,7 @@ MediaFrame = Frame.extend(/** @lends wp.media.view.MediaFrame.prototype */{
 
 		tabPanelEl.removeAttr( 'role aria-labelledby tabindex' );
 
-		if ( this.menuView && this.menuView.isVisible ) {
+		if ( this.state().get( 'menu' ) && this.menuView && this.menuView.isVisible ) {
 			ariaLabelledby = 'menu-item-' + stateId;
 
 			// Set the tab panel attributes only if the tabs are visible.
@@ -3030,13 +3030,8 @@ MediaFrame = Frame.extend(/** @lends wp.media.view.MediaFrame.prototype */{
 
 		tabPanelEl.removeAttr( 'role aria-labelledby tabindex' );
 
-		// On the Embed view the router menu is hidden.
-		if ( 'embed' === this.content._mode ) {
-			return;
-		}
-
 		// Set the tab panel attributes only if the tabs are visible.
-		if ( this.routerView && this.routerView.isVisible && this.content._mode ) {
+		if ( this.state().get( 'router' ) && this.routerView && this.routerView.isVisible && this.content._mode ) {
 			ariaLabelledby = 'menu-item-' + this.content._mode;
 
 			tabPanelEl

wp-includes/version.php

@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-beta2-46437';
+$wp_version = '5.3-beta2-46438';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.