Ticket #36678: 36678.2.diff

src/wp-admin/js/customize-controls.js

@@ -3899 +3899 @@
                         var state = new api.Values(),
                                 saved = state.create( 'saved' ),
                                 activated = state.create( 'activated' ),
-                                processing = state.create( 'processing' );
+                                processing = state.create( 'processing' ),
+                                paneVisible = state.create( 'paneVisible' );
 
                         state.bind( 'change', function() {
                                 if ( ! activated() ) {
@@ -3920 +3921 @@
                         saved( true );
                         activated( api.settings.theme.active );
                         processing( 0 );
+                        paneVisible( true );
 
                         api.bind( 'change', function() {
                                 state('saved').set( false );
@@ -3961 +3963 @@
                 });
 
                 $( '.collapse-sidebar' ).on( 'click', function() {
-                        if ( 'true' === $( this ).attr( 'aria-expanded' ) ) {
+
+                        if ( api.state( 'paneVisible' )() === true ) {
+                                api.trigger( 'paneVisible', false );
+                        } else {
+                                api.trigger( 'paneVisible', true );
+                        }
+
+                });
+
+                api.bind( 'paneVisible', function( paneVisible ) {
+
+                        if ( paneVisible === false ) {
                                 $( this ).attr({ 'aria-expanded': 'false', 'aria-label': api.l10n.expandSidebar });
+                                overlay.addClass( 'collapsed' ).removeClass( 'expanded' );
+                                api.state( 'paneVisible' ).set(false);
                         } else {
                                 $( this ).attr({ 'aria-expanded': 'true', 'aria-label': api.l10n.collapseSidebar });
+                                overlay.removeClass( 'collapsed' ).addClass( 'expanded' );
+                                api.state( 'paneVisible' ).set(true);
                         }
 
-                        overlay.toggleClass( 'collapsed' ).toggleClass( 'expanded' );
                 });
 
                 // Keyboard shortcuts - esc to exit section/panel.
@@ -4202 +4218 @@
                         if ( matchedControl ) {
                                 matchedControl.focus();
                         }
+                        api.trigger( 'paneVisible', true );
                 } );
 
                 // Refresh the preview when it requests.

src/wp-admin/js/customize-nav-menus.js

@@ -2931 +2931 @@
                 var control = api.Menus.getMenuItemControl( menuItemId );
 
                 if ( control ) {
+                        api.trigger( 'paneVisible', true );
                         control.focus();
                 }
         };

src/wp-admin/js/customize-widgets.js

@@ -2099 +2099 @@
                 var control = api.Widgets.getWidgetFormControlForWidget( widgetId );
 
                 if ( control ) {
+                        api.trigger( 'paneVisible', true );
                         control.focus();
                 }
         },