From dcfd4f11cfded53d8f50a2b5db2fe4712b9fbedd Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 22 Mar 2022 16:19:42 +0000
Subject: [PATCH 1/2] Show confirmatory notice when menu is deleted

---
 packages/block-library/src/navigation/edit/index.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
index 0c60ff4993aa56..e1db13f03332ea 100644
--- a/packages/block-library/src/navigation/edit/index.js
+++ b/packages/block-library/src/navigation/edit/index.js
@@ -167,6 +167,11 @@ function Navigation( {
 	// the Select Menu dropdown.
 	useNavigationEntities();
 
+	const [ showNavigationMenuDeleteNotice ] = useNavigationNotice( {
+		name: 'block-library/core/navigation/delete',
+		message: __( 'Navigation Menu successfully deleted.' ),
+	} );
+
 	const [
 		showNavigationMenuCreateNotice,
 		hideNavigationMenuCreateNotice,
@@ -794,7 +799,10 @@ function Navigation( {
 						{ hasResolvedCanUserDeleteNavigationMenu &&
 							canUserDeleteNavigationMenu && (
 								<NavigationMenuDeleteControl
-									onDelete={ resetToEmptyBlock }
+									onDelete={ () => {
+										resetToEmptyBlock();
+										showNavigationMenuDeleteNotice();
+									} }
 								/>
 							) }
 					</InspectorControls>

From 98cca66665592469e7125427a2795c1784523291 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 22 Mar 2022 16:26:04 +0000
Subject: [PATCH 2/2] Show name of deleted menu in notice

---
 .../block-library/src/navigation/edit/index.js    | 15 +++++++++++----
 .../edit/navigation-menu-delete-control.js        |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
index e1db13f03332ea..b9c36518e7cc71 100644
--- a/packages/block-library/src/navigation/edit/index.js
+++ b/packages/block-library/src/navigation/edit/index.js
@@ -38,7 +38,7 @@ import {
 	Button,
 	Spinner,
 } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 import { speak } from '@wordpress/a11y';
 
 /**
@@ -169,7 +169,6 @@ function Navigation( {
 
 	const [ showNavigationMenuDeleteNotice ] = useNavigationNotice( {
 		name: 'block-library/core/navigation/delete',
-		message: __( 'Navigation Menu successfully deleted.' ),
 	} );
 
 	const [
@@ -799,9 +798,17 @@ function Navigation( {
 						{ hasResolvedCanUserDeleteNavigationMenu &&
 							canUserDeleteNavigationMenu && (
 								<NavigationMenuDeleteControl
-									onDelete={ () => {
+									onDelete={ ( deletedMenuTitle = '' ) => {
 										resetToEmptyBlock();
-										showNavigationMenuDeleteNotice();
+										showNavigationMenuDeleteNotice(
+											sprintf(
+												// translators: %s: the name of a menu (e.g. Header navigation).
+												__(
+													'Navigation menu %s successfully deleted.'
+												),
+												deletedMenuTitle
+											)
+										);
 									} }
 								/>
 							) }
diff --git a/packages/block-library/src/navigation/edit/navigation-menu-delete-control.js b/packages/block-library/src/navigation/edit/navigation-menu-delete-control.js
index b9594c7d620d0d..6137a7b42a47a7 100644
--- a/packages/block-library/src/navigation/edit/navigation-menu-delete-control.js
+++ b/packages/block-library/src/navigation/edit/navigation-menu-delete-control.js
@@ -67,7 +67,7 @@ export default function NavigationMenuDeleteControl( { onDelete } ) {
 										id,
 										{ force: true }
 									);
-									onDelete();
+									onDelete( title );
 								} }
 							>
 								{ __( 'Confirm' ) }