Mobile Web: Ensure that sidebar is closed on the first visit

WordPress · Oct 11, 2019 · e78d12d · e78d12d
1 parent 4c68cb2
commit e78d12d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/packages/edit-post/src/components/editor-initialization/index.js b/packages/edit-post/src/components/editor-initialization/index.js
@@ -21,8 +21,8 @@ import {
  * @return {null} This is a data component so does not render any ui.
  */
 export default function( { postId } ) {
-	useAdjustSidebarListener( postId );
 	useBlockSelectionListener( postId );
+	useAdjustSidebarListener( postId );
 	useUpdatePostLinkListener( postId );
 	const { triggerGuide } = useDispatch( 'core/nux' );
 	useEffect( () => {

diff --git a/packages/edit-post/src/components/editor-initialization/listener-hooks.js b/packages/edit-post/src/components/editor-initialization/listener-hooks.js
@@ -64,7 +64,7 @@ export const useAdjustSidebarListener = ( postId ) => {
 
 	const { openGeneralSidebar, closeGeneralSidebar } = useDispatch( STORE_KEY );
 
-	const previousIsSmall = useRef( isSmall );
+	const previousIsSmall = useRef( null );
 	const sidebarToReOpenOnExpand = useRef( null );
 
 	useEffect( () => {

diff --git a/packages/edit-post/src/components/editor-initialization/test/listener-hooks.js b/packages/edit-post/src/components/editor-initialization/test/listener-hooks.js
@@ -137,11 +137,10 @@ describe( 'listener hook tests', () => {
 				getSpyedFunction( STORE_KEY, 'closeGeneralSidebar' )
 			).not.toHaveBeenCalled();
 		} );
-		it( 'does not close sidebar if viewport is small and there is an active ' +
+		it( 'closes sidebar if viewport is small and there is an active ' +
 			'sidebar name available on initial render', () => {
 			setMockReturnValue( 'core/viewport', 'isViewportMatch', true );
 			setMockReturnValue( STORE_KEY, 'getActiveGeneralSidebarName', 'foo' );
-			// initial render does nothing (and sidebar will be closed already)
 			act( () => {
 				renderComponent( useAdjustSidebarListener, 10 );
 			} );
@@ -150,7 +149,7 @@ describe( 'listener hook tests', () => {
 			).not.toHaveBeenCalled();
 			expect(
 				getSpyedFunction( STORE_KEY, 'closeGeneralSidebar' )
-			).not.toHaveBeenCalled();
+			).toHaveBeenCalled();
 		} );
 		it( 'closes sidebar if viewport is small and there is an active ' +
 			'sidebar name available when viewport size changes', () => {