[Navigation editor] Save menu items using the REST API

lib/class-wp-rest-menu-items-controller.php

@@ -391,6 +391,7 @@ protected function prepare_item_for_database( $request ) {
 				'menu-item-object'      => $menu_item_obj->object,
 				'menu-item-parent-id'   => $menu_item_obj->menu_item_parent,
 				'menu-item-position'    => $position,
+				'menu-item-type'        => $menu_item_obj->type,
 				'menu-item-title'       => $menu_item_obj->title,
 				'menu-item-url'         => $menu_item_obj->url,
 				'menu-item-description' => $menu_item_obj->description,

packages/core-data/src/entities.js

@@ -116,6 +116,7 @@ export const defaultEntities = [
 		baseURLParams: { context: 'edit' },
 		plural: 'menuItems',
 		label: __( 'Menu Item' ),
+		rawAttributes: [ 'title', 'content' ],
 	},
 	{
 		name: 'menuLocation',

packages/edit-navigation/src/components/block-placeholder/index.js

@@ -24,7 +24,7 @@ import { chevronDown } from '@wordpress/icons';
  */
 import { useMenuEntityProp, useSelectedMenuId } from '../../hooks';
 import useNavigationEntities from './use-navigation-entities';
-import menuItemsToBlocks from './menu-items-to-blocks';
+import { menuItemsToBlocks } from '../../store/transform';
 
 /**
  * Convert pages to blocks.

packages/edit-navigation/src/components/block-placeholder/menu-items-to-blocks.js

@@ -11,7 +11,7 @@ import { createBlock } from '@wordpress/blocks';
 /**
  * Internal dependencies
  */
-import { menuItemToBlockAttributes } from '../../store/utils';
+import { menuItemToBlockAttributes } from '../../store/transform';
 
 /**
  * Convert a flat menu item structure to a nested blocks structure.

packages/edit-navigation/src/components/layout/index.js

@@ -7,6 +7,7 @@ import {
 	BlockTools,
 	__unstableUseBlockSelectionClearer as useBlockSelectionClearer,
 } from '@wordpress/block-editor';
+import { useEntityBlockEditor } from '@wordpress/core-data';
 import { Popover, SlotFillProvider, Spinner } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { useEffect, useMemo, useState } from '@wordpress/element';
@@ -25,7 +26,6 @@ import UnselectedMenuState from './unselected-menu-state';
 import {
 	IsMenuNameControlFocusedContext,
 	useNavigationEditor,
-	useNavigationBlockEditor,
 	useMenuNotifications,
 } from '../../hooks';
 import ErrorBoundary from '../error-boundary';
@@ -68,8 +68,12 @@ export default function Layout( { blockEditorSettings } ) {
 		isMenuSelected,
 	} = useNavigationEditor();
 
-	const [ blocks, onInput, onChange ] = useNavigationBlockEditor(
-		navigationPost
+	const [ blocks, onInput, onChange ] = useEntityBlockEditor(
+		'root',
+		'postType',
+		{
+			id: navigationPost?.id,
+		}
 	);
 
 	const { hasSidebarEnabled, isInserterOpened } = useSelect(

packages/edit-navigation/src/hooks/index.js

@@ -10,7 +10,6 @@ export const IsMenuNameControlFocusedContext = createContext();
 export { default as useMenuEntity } from './use-menu-entity';
 export { default as useMenuEntityProp } from './use-menu-entity-prop';
 export { default as useNavigationEditor } from './use-navigation-editor';
-export { default as useNavigationBlockEditor } from './use-navigation-block-editor';
 export { default as useMenuNotifications } from './use-menu-notifications';
 export { default as useSelectedMenuId } from './use-selected-menu-id';
 export { default as useMenuLocations } from './use-menu-locations';