Add a Submenu block for use in Navigation

lib/blocks.php

@@ -33,6 +33,7 @@ function gutenberg_reregister_core_block_types() {
 				'missing',
 				'more',
 				'navigation-link',
+				'navigation-submenu',
 				'nextpage',
 				'paragraph',
 				'preformatted',
@@ -59,6 +60,7 @@ function gutenberg_reregister_core_block_types() {
 				'loginout.php'                  => 'core/loginout',
 				'navigation.php'                => 'core/navigation',
 				'navigation-link.php'           => 'core/navigation-link',
+				'navigation-submenu.php'        => 'core/navigation-submenu',
 				'home-link.php'                 => 'core/home-link',
 				'rss.php'                       => 'core/rss',
 				'search.php'                    => 'core/search',

packages/block-library/src/editor.scss

@@ -18,6 +18,7 @@
 @import "./more/editor.scss";
 @import "./navigation/editor.scss";
 @import "./navigation-link/editor.scss";
+@import "./navigation-submenu/editor.scss";
 @import "./nextpage/editor.scss";
 @import "./page-list/editor.scss";
 @import "./paragraph/editor.scss";

packages/block-library/src/index.js

@@ -33,6 +33,7 @@ import * as html from './html';
 import * as mediaText from './media-text';
 import * as navigation from './navigation';
 import * as navigationLink from './navigation-link';
+import * as navigationSubmenu from './navigation-submenu';
 import * as homeLink from './home-link';
 import * as latestComments from './latest-comments';
 import * as latestPosts from './latest-posts';
@@ -231,6 +232,7 @@ export const __experimentalRegisterExperimentalCoreBlocks =
 					navigation,
 					navigationLink,
 					homeLink,
+					navigationSubmenu,
 
 					// Register Full Site Editing Blocks.
 					...( enableFSEBlocks

packages/block-library/src/navigation-link/edit.js

@@ -292,7 +292,7 @@ export default function NavigationLinkEdit( {
 	const { showSubmenuIcon } = context;
 	const { saveEntityRecord } = useDispatch( coreStore );
 	const {
-		insertBlock,
+		replaceBlock,
 		__unstableMarkNextChangeAsNotPersistent,
 	} = useDispatch( blockEditorStore );
 	const [ isLinkOpen, setIsLinkOpen ] = useState( false );
@@ -302,18 +302,19 @@ export default function NavigationLinkEdit( {
 	const ref = useRef();
 
 	const {
+		innerBlocks,
 		isAtMaxNesting,
 		isTopLevelLink,
 		isParentOfSelectedBlock,
 		isImmediateParentOfSelectedBlock,
 		hasDescendants,
 		selectedBlockHasDescendants,
-		numberOfDescendants,
 		userCanCreatePages,
 		userCanCreatePosts,
 	} = useSelect(
 		( select ) => {
 			const {
+				getBlocks,
 				getClientIdsOfDescendants,
 				hasSelectedInnerBlock,
 				getSelectedBlockClientId,
@@ -326,11 +327,16 @@ export default function NavigationLinkEdit( {
 				.length;
 
 			return {
+				innerBlocks: getBlocks( clientId ),
 				isAtMaxNesting:
 					getBlockParentsByBlockName( clientId, name ).length >=
 					MAX_NESTING,
+				// Temporary fix until navigation link submenus are properly deprecated.
 				isTopLevelLink:
-					getBlockParentsByBlockName( clientId, name ).length === 0,
+					getBlockParentsByBlockName( clientId, [
+						name,
+						'core/navigation-submenu',
+					] ).length === 0,
 				isParentOfSelectedBlock: hasSelectedInnerBlock(
 					clientId,
 					true
@@ -343,7 +349,6 @@ export default function NavigationLinkEdit( {
 				selectedBlockHasDescendants: !! getClientIdsOfDescendants( [
 					selectedBlockId,
 				] )?.length,
-				numberOfDescendants: descendants,
 				userCanCreatePages: select( coreStore ).canUser(
 					'create',
 					'pages'
@@ -367,12 +372,15 @@ export default function NavigationLinkEdit( {
 	}, [ isTopLevelLink ] );
 
 	/**
-	 * Insert a link block when submenu is added.
+	 * Transform to submenu block.
 	 */
-	function insertLinkBlock() {
-		const insertionPoint = numberOfDescendants;
-		const blockToInsert = createBlock( 'core/navigation-link' );
-		insertBlock( blockToInsert, insertionPoint, clientId );
+	function transformToSubmenu() {
+		const newSubmenu = createBlock(
+			'core/navigation-submenu',
+			attributes,
+			innerBlocks
+		);
+		replaceBlock( clientId, newSubmenu );
 	}
 
 	// Show the LinkControl on mount if the URL is empty
@@ -596,7 +604,7 @@ export default function NavigationLinkEdit( {
 							name="submenu"
 							icon={ addSubmenu }
 							title={ __( 'Add submenu' ) }
-							onClick={ insertLinkBlock }
+							onClick={ transformToSubmenu }
 						/>
 					) }
 				</ToolbarGroup>

packages/block-library/src/navigation-link/index.js

@@ -5,6 +5,7 @@ import { _x } from '@wordpress/i18n';
 import { customLink as linkIcon } from '@wordpress/icons';
 import { InnerBlocks } from '@wordpress/block-editor';
 import { addFilter } from '@wordpress/hooks';
+import { createBlock } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -84,6 +85,20 @@ export const settings = {
 			},
 		},
 	],
+	transforms: {
+		to: [
+			{
+				type: 'block',
+				blocks: [ 'core/navigation-submenu' ],
+				transform: ( attributes, innerBlocks ) =>
+					createBlock(
+						'core/navigation-submenu',
+						attributes,
+						innerBlocks
+					),
+			},
+		],
+	},
 };
 
 // importing this file includes side effects. This is whitelisted in block-library/package.json under sideEffects

packages/block-library/src/navigation-submenu/block.json

@@ -0,0 +1,67 @@
+{
+	"apiVersion": 2,
+	"name": "core/navigation-submenu",
+	"title": "Submenu",
+	"category": "design",
+	"parent": [
+		"core/navigation"
+	],
+	"description": "Add a submenu to your navigation.",
+	"textdomain": "default",
+	"attributes": {
+		"label": {
+			"type": "string"
+		},
+		"type": {
+			"type": "string"
+		},
+		"description": {
+			"type": "string"
+		},
+		"rel": {
+			"type": "string"
+		},
+		"id": {
+			"type": "number"
+		},
+		"opensInNewTab": {
+			"type": "boolean",
+			"default": false
+		},
+		"url": {
+			"type": "string"
+		},
+		"title": {
+			"type": "string"
+		},
+		"kind": {
+			"type": "string"
+		},
+		"isTopLevelItem": {
+			"type": "boolean"
+		}
+	},
+	"usesContext": [
+		"textColor",
+		"customTextColor",
+		"backgroundColor",
+		"customBackgroundColor",
+		"overlayTextColor",
+		"customOverlayTextColor",
+		"overlayBackgroundColor",
+		"customOverlayBackgroundColor",
+		"fontSize",
+		"customFontSize",
+		"showSubmenuIcon",
+		"openSubmenusOnClick",
+		"style"
+	],
+	"supports": {
+		"reusable": false,
+		"html": false,
+		"inserter": false
+	},
+	"viewScript": "file:./view.min.js",
+	"editorStyle": "wp-block-navigation-submenu-editor",
+	"style": "wp-block-navigation-submenu"
+}