diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list-item.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list-item.js index b685c766107a32..a162b775d7f005 100644 --- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list-item.js +++ b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list-item.js @@ -1,8 +1,10 @@ /** * WordPress dependencies */ -import { useEntityProp } from '@wordpress/core-data'; +import { useSelect } from '@wordpress/data'; import { __ } from '@wordpress/i18n'; +import { store as coreStore } from '@wordpress/core-data'; +import { store as editorStore } from '@wordpress/editor'; /** * Internal dependencies @@ -11,7 +13,20 @@ import SidebarNavigationItem from '../sidebar-navigation-item'; import { useLink } from '../routes/link'; export default function TemplatePartNavigationMenuListItem( { id } ) { - const [ title ] = useEntityProp( 'postType', 'wp_navigation', 'title', id ); + const title = useSelect( ( select ) => { + const { getEditedEntityRecord } = select( coreStore ); + const { __experimentalGetTemplateInfo: getTemplateInfo } = + select( editorStore ); + + const _record = getEditedEntityRecord( + 'postType', + 'wp_navigation', + id + ); + + const templateInfo = getTemplateInfo( _record ); + return templateInfo?.title || __( '(no title)' ); + } ); const linkInfo = useLink( { postId: id, @@ -22,7 +37,7 @@ export default function TemplatePartNavigationMenuListItem( { id } ) { return ( - { title || __( '(no title)' ) } + { title } ); } diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list.js index 4171b1e782575e..4f128a8d127d37 100644 --- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list.js +++ b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/template-part-navigation-menu-list.js @@ -10,7 +10,7 @@ import TemplatePartNavigationMenuListItem from './template-part-navigation-menu- export default function TemplatePartNavigationMenuList( { menus } ) { return ( - { menus.map( ( menuId ) => ( + { [ ...new Set( menus ) ].map( ( menuId ) => (