Fix issue with navigation structure panel being always initially closed

WordPress · Apr 15, 2020 · a796f3c · a796f3c
1 parent d8be3a9
commit a796f3c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/edit-navigation/src/components/menu-editor/index.js b/packages/edit-navigation/src/components/menu-editor/index.js
@@ -5,6 +5,7 @@ import {
 	BlockEditorKeyboardShortcuts,
 	BlockEditorProvider,
 } from '@wordpress/block-editor';
+import { useViewportMatch } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -16,6 +17,7 @@ import NavigationStructurePanel from './navigation-structure-panel';
 
 export default function MenuEditor( { menuId, blockEditorSettings } ) {
 	const [ blocks, setBlocks, saveBlocks ] = useNavigationBlocks( menuId );
+	const isLargeViewport = useViewportMatch( 'medium' );
 
 	return (
 		<div className="edit-navigation-menu-editor">
@@ -34,7 +36,10 @@ export default function MenuEditor( { menuId, blockEditorSettings } ) {
 			>
 				<BlockEditorKeyboardShortcuts />
 				<MenuEditorShortcuts saveBlocks={ saveBlocks } />
-				<NavigationStructurePanel blocks={ blocks } />
+				<NavigationStructurePanel
+					blocks={ blocks }
+					initialOpen={ isLargeViewport }
+				/>
 				<BlockEditorPanel menuId={ menuId } saveBlocks={ saveBlocks } />
 			</BlockEditorProvider>
 		</div>

diff --git a/packages/edit-navigation/src/components/menu-editor/navigation-structure-panel.js b/packages/edit-navigation/src/components/menu-editor/navigation-structure-panel.js
@@ -3,17 +3,14 @@
  */
 import { __experimentalBlockNavigationList } from '@wordpress/block-editor';
 import { Panel, PanelBody } from '@wordpress/components';
-import { useViewportMatch } from '@wordpress/compose';
 import { __ } from '@wordpress/i18n';
 
-export default function NavigationStructurePanel( { blocks } ) {
-	const isLargeViewport = useViewportMatch( 'medium' );
-
+export default function NavigationStructurePanel( { blocks, initialOpen } ) {
 	return (
 		<Panel>
 			<PanelBody
 				title={ __( 'Navigation structure' ) }
-				initialOpen={ isLargeViewport }
+				initialOpen={ initialOpen }
 			>
 				{ !! blocks.length && (
 					<__experimentalBlockNavigationList