Enable backspace to remove empty Navigation Links.

WordPress · May 1, 2020 · bb599bb · bb599bb
1 parent f9f6e1c
commit bb599bb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
@@ -54,6 +54,8 @@ function NavigationLinkEdit( {
 	rgbBackgroundColor,
 	saveEntityRecord,
 	userCanCreatePages = false,
+	mergeBlocks,
+	onReplace,
 } ) {
 	const { label, opensInNewTab, url, nofollow, description } = attributes;
 	const link = {
@@ -217,6 +219,8 @@ function NavigationLinkEdit( {
 						onChange={ ( labelValue ) =>
 							setAttributes( { label: labelValue } )
 						}
+						onMerge={ mergeBlocks }
+						onRemove={ () => onReplace( [] ) }
 						placeholder={ itemLabelPlaceholder }
 						keepPlaceholderOnFocus
 						withoutInteractiveFormatting

diff --git a/packages/block-library/src/navigation-link/index.js b/packages/block-library/src/navigation-link/index.js
@@ -12,25 +12,26 @@ import edit from './edit';
 import save from './save';
 
 const { name } = metadata;
+
 export { metadata, name };
 
 export const settings = {
 	title: __( 'Navigation Link' ),
-
 	parent: [ 'core/navigation' ],
-
 	icon,
-
 	description: __( 'Add a page, link, or another item to your navigation.' ),
-
 	supports: {
 		reusable: false,
 		html: false,
 		lightBlockWrapper: true,
 	},
-
 	__experimentalLabel: ( { label } ) => label,
-
+	merge( attributes, attributesToMerge ) {
+		return {
+			label:
+				( attributes.label || '' ) + ( attributesToMerge.label || '' ),
+		};
+	},
 	edit,
 	save,
 };