Fix: Custom link UI does appears outside canvas on the sidebar naviga…

…tion. (#48633)
WordPress · Mar 3, 2023 · 0ff8a04 · 0ff8a04 · github-actions · Mar 3, 2023
1 parent dbe47a5
commit 0ff8a04
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/packages/block-editor/src/components/off-canvas-editor/link-ui.js b/packages/block-editor/src/components/off-canvas-editor/link-ui.js
@@ -137,7 +137,6 @@ export function LinkUI( props ) {
 			placement="bottom"
 			onClose={ props.onClose }
 			anchor={ props.anchor }
-			__unstableSlotName={ '__unstable-block-tools-after' }
 			shift
 		>
 			<LinkControl

diff --git a/packages/block-library/src/navigation-link/link-ui.js b/packages/block-library/src/navigation-link/link-ui.js
@@ -165,7 +165,6 @@ export function LinkUI( props ) {
 			placement="bottom"
 			onClose={ props.onClose }
 			anchor={ props.anchor }
-			__unstableSlotName={ '__unstable-block-tools-after' }
 			shift
 		>
 			<LinkControl

diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menus/index.js
@@ -16,6 +16,8 @@ import { useHistory } from '../routes';
 import NavigationMenuContent from './navigation-menu-content';
 import SidebarButton from '../sidebar-button';
 import { NavigationMenuLoader } from './loader';
+import { unlock } from '../../private-apis';
+import { store as editSiteStore } from '../../store';
 
 const noop = () => {};
 const NAVIGATION_MENUS_QUERY = { per_page: -1, status: 'publish' };
@@ -41,8 +43,9 @@ function SidebarNavigationScreenWrapper( { children, actions } ) {
 
 export default function SidebarNavigationScreenNavigationMenus() {
 	const history = useHistory();
-	const { navigationMenus, hasResolvedNavigationMenus } = useSelect(
-		( select ) => {
+	const { navigationMenus, hasResolvedNavigationMenus, storedSettings } =
+		useSelect( ( select ) => {
+			const { getSettings } = unlock( select( editSiteStore ) );
 			const { getEntityRecords, hasFinishedResolution } =
 				select( coreStore );
 
@@ -52,15 +55,14 @@ export default function SidebarNavigationScreenNavigationMenus() {
 				NAVIGATION_MENUS_QUERY,
 			];
 			return {
+				storedSettings: getSettings( false ),
 				navigationMenus: getEntityRecords( ...navigationMenusQuery ),
 				hasResolvedNavigationMenus: hasFinishedResolution(
 					'getEntityRecords',
 					navigationMenusQuery
 				),
 			};
-		},
-		[]
-	);
+		}, [] );
 
 	// Sort navigation menus by date.
 	const orderedNavigationMenus = useMemo(
@@ -124,6 +126,7 @@ export default function SidebarNavigationScreenNavigationMenus() {
 
 	return (
 		<BlockEditorProvider
+			settings={ storedSettings }
 			value={ blocks }
 			onChange={ noop }
 			onInput={ noop }