Fix regression with Navigation blocks

WordPress · Jan 14, 2022 · 29774c9 · 29774c9
1 parent d3bf1c0
commit 29774c9
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/packages/block-library/src/navigation-submenu/edit.js b/packages/block-library/src/navigation-submenu/edit.js
@@ -47,10 +47,25 @@ import { speak } from '@wordpress/a11y';
  */
 import { ItemSubmenuIcon } from './icons';
 import { name } from './block.json';
+import navigationLinkMetadata from '../navigation-link/block.json';
 
 const ALLOWED_BLOCKS = [ 'core/navigation-link', 'core/navigation-submenu' ];
 
-const DEFAULT_BLOCK = [ 'core/navigation-link' ];
+const DEFAULT_BLOCK = [
+	'core/navigation-link',
+	{
+		...Object.entries( navigationLinkMetadata.attributes ).reduce(
+			( acc, attribute ) => ( {
+				...acc,
+				[ attribute[ 0 ] ]:
+					attribute[ 1 ].default !== undefined
+						? attribute[ 1 ].default
+						: undefined,
+			} ),
+			{}
+		),
+	},
+];
 
 const MAX_NESTING = 5;
 

diff --git a/packages/block-library/src/navigation/edit/inner-blocks.js b/packages/block-library/src/navigation/edit/inner-blocks.js
@@ -14,6 +14,7 @@ import { useMemo } from '@wordpress/element';
  * Internal dependencies
  */
 import PlaceholderPreview from './placeholder/placeholder-preview';
+import navigationLinkMetadata from '../../navigation-link/block.json';
 
 const ALLOWED_BLOCKS = [
 	'core/navigation-link',
@@ -27,7 +28,22 @@ const ALLOWED_BLOCKS = [
 	'core/navigation-submenu',
 ];
 
-const DEFAULT_BLOCK = [ 'core/navigation-link' ];
+// Set default block to use default or undefined attribute values when inserted.
+const DEFAULT_BLOCK = [
+	'core/navigation-link',
+	{
+		...Object.entries( navigationLinkMetadata.attributes ).reduce(
+			( acc, attribute ) => ( {
+				...acc,
+				[ attribute[ 0 ] ]:
+					attribute[ 1 ].default !== undefined
+						? attribute[ 1 ].default
+						: undefined,
+			} ),
+			{}
+		),
+	},
+];
 
 const LAYOUT = {
 	type: 'default',