From 69f11349141898b8b740e9dd8322f905df0e20e1 Mon Sep 17 00:00:00 2001
From: Marco Ciampini <marco.ciampo@gmail.com>
Date: Thu, 1 Sep 2022 18:17:05 +0200
Subject: [PATCH 1/3] Navigation block: use new `anchor` prop for `Popover`

---
 packages/block-library/src/navigation-link/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index 57cea79ac78ef..20a38007eff9c 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -844,7 +844,7 @@ export default function NavigationLinkEdit( {
 						<Popover
 							position="bottom center"
 							onClose={ () => setIsLinkOpen( false ) }
-							anchorRef={ listItemRef.current }
+							anchor={ listItemRef.current }
 							__unstableShift
 						>
 							<LinkControl

From 5285d84465197111d34f33a67ac62291c8b91886 Mon Sep 17 00:00:00 2001
From: Marco Ciampini <marco.ciampo@gmail.com>
Date: Thu, 1 Sep 2022 18:26:40 +0200
Subject: [PATCH 2/3] Use anchor for the Navigation submenu block too

---
 packages/block-library/src/navigation-submenu/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/navigation-submenu/edit.js b/packages/block-library/src/navigation-submenu/edit.js
index 12ee3d193f749..b7d797b194ede 100644
--- a/packages/block-library/src/navigation-submenu/edit.js
+++ b/packages/block-library/src/navigation-submenu/edit.js
@@ -629,7 +629,7 @@ export default function NavigationSubmenuEdit( {
 						<Popover
 							position="bottom center"
 							onClose={ () => setIsLinkOpen( false ) }
-							anchorRef={ listItemRef.current }
+							anchor={ listItemRef.current }
 							__unstableShift
 						>
 							<LinkControl

From b4b91f74bf4f4e6d1c959f84a0a64a4afb4577b2 Mon Sep 17 00:00:00 2001
From: Marco Ciampini <marco.ciampo@gmail.com>
Date: Fri, 2 Sep 2022 10:53:45 +0200
Subject: [PATCH 3/3] Prevent anchor value from being `null`

---
 packages/block-library/src/navigation-link/edit.js    | 3 ++-
 packages/block-library/src/navigation-submenu/edit.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index 20a38007eff9c..13ff726b76f85 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -844,7 +844,8 @@ export default function NavigationLinkEdit( {
 						<Popover
 							position="bottom center"
 							onClose={ () => setIsLinkOpen( false ) }
-							anchor={ listItemRef.current }
+							// `anchor` should never be `null`
+							anchor={ listItemRef.current ?? undefined }
 							__unstableShift
 						>
 							<LinkControl
diff --git a/packages/block-library/src/navigation-submenu/edit.js b/packages/block-library/src/navigation-submenu/edit.js
index b7d797b194ede..162ece3ab9d75 100644
--- a/packages/block-library/src/navigation-submenu/edit.js
+++ b/packages/block-library/src/navigation-submenu/edit.js
@@ -629,7 +629,8 @@ export default function NavigationSubmenuEdit( {
 						<Popover
 							position="bottom center"
 							onClose={ () => setIsLinkOpen( false ) }
-							anchor={ listItemRef.current }
+							// `anchor` should never be `null`
+							anchor={ listItemRef.current ?? undefined }
 							__unstableShift
 						>
 							<LinkControl