Enable list view (#29936)

* enable listview, reorder items * removes the hasListViewModal prop as it is not used anymore Co-authored-by: Andrei Draganescu <github@andreidraganescu.info>
WordPress · Mar 22, 2021 · 2e4a284 · 2e4a284
1 parent 1c2c0ae
commit 2e4a284
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/packages/block-library/src/navigation/edit.js b/packages/block-library/src/navigation/edit.js
@@ -41,7 +41,6 @@ function Navigation( {
 	className,
 	hasSubmenuIndicatorSetting = true,
 	hasItemJustificationControls = attributes.orientation === 'horizontal',
-	hasListViewModal = true,
 } ) {
 	const [ isPlaceholderShown, setIsPlaceholderShown ] = useState(
 		! hasExistingNavItems
@@ -124,11 +123,9 @@ function Navigation( {
 						} }
 					/>
 				) }
-				{ hasListViewModal && (
-					<ToolbarGroup>{ navigatorToolbarButton }</ToolbarGroup>
-				) }
+				<ToolbarGroup>{ navigatorToolbarButton }</ToolbarGroup>
 			</BlockControls>
-			{ hasListViewModal && navigatorModal }
+			{ navigatorModal }
 			<InspectorControls>
 				{ hasSubmenuIndicatorSetting && (
 					<PanelBody title={ __( 'Display settings' ) }>

diff --git a/packages/edit-navigation/src/filters/add-menu-name-editor.js b/packages/edit-navigation/src/filters/add-menu-name-editor.js
@@ -15,8 +15,8 @@ const addMenuNameEditor = createHigherOrderComponent(
 		}
 		return (
 			<>
-				<BlockEdit { ...props } />
 				<NameDisplay />
+				<BlockEdit { ...props } />
 			</>
 		);
 	},

diff --git a/packages/edit-navigation/src/filters/remove-edit-unsupported-features.js b/packages/edit-navigation/src/filters/remove-edit-unsupported-features.js
@@ -15,7 +15,6 @@ const removeNavigationBlockEditUnsupportedFeatures = createHigherOrderComponent(
 				{ ...props }
 				hasSubmenuIndicatorSetting={ false }
 				hasItemJustificationControls={ false }
-				hasListViewModal={ false }
 			/>
 		);
 	},