@wordpress/edit-site 6.10.0 → 6.12.0

package/src/components/sync-state-with-url/use-init-edited-entity-from-url.js

@@ -5,6 +5,7 @@ import { useEffect, useMemo } from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as coreDataStore } from '@wordpress/core-data';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -30,47 +31,33 @@ const postTypesWithoutParentTemplate = [
 const authorizedPostTypes = [ 'page', 'post' ];
 
 function useResolveEditedEntityAndContext( { postId, postType } ) {
-	const {
-		hasLoadedAllDependencies,
-		homepageId,
-		postsPageId,
-		url,
-		frontPageTemplateId,
-	} = useSelect( ( select ) => {
-		const { getEntityRecord, getEntityRecords } = select( coreDataStore );
-		const siteData = getEntityRecord( 'root', 'site' );
-		const base = getEntityRecord( 'root', '__unstableBase' );
-		const templates = getEntityRecords( 'postType', TEMPLATE_POST_TYPE, {
-			per_page: -1,
-		} );
-		const _homepageId =
-			siteData?.show_on_front === 'page' &&
-			[ 'number', 'string' ].includes( typeof siteData.page_on_front ) &&
-			!! +siteData.page_on_front // We also need to check if it's not zero(`0`).
-				? siteData.page_on_front.toString()
-				: null;
-		const _postsPageId =
-			siteData?.show_on_front === 'page' &&
-			[ 'number', 'string' ].includes( typeof siteData.page_for_posts )
-				? siteData.page_for_posts.toString()
-				: null;
-		let _frontPageTemplateId;
-		if ( templates ) {
-			const frontPageTemplate = templates.find(
-				( t ) => t.slug === 'front-page'
-			);
-			_frontPageTemplateId = frontPageTemplate
-				? frontPageTemplate.id
-				: false;
-		}
-		return {
-			hasLoadedAllDependencies: !! base && !! siteData,
-			homepageId: _homepageId,
-			postsPageId: _postsPageId,
-			url: base?.home,
-			frontPageTemplateId: _frontPageTemplateId,
-		};
-	}, [] );
+	const { hasLoadedAllDependencies, homepageId, postsPageId } = useSelect(
+		( select ) => {
+			const { getEntityRecord } = select( coreDataStore );
+			const siteData = getEntityRecord( 'root', 'site' );
+			const _homepageId =
+				siteData?.show_on_front === 'page' &&
+				[ 'number', 'string' ].includes(
+					typeof siteData.page_on_front
+				) &&
+				!! +siteData.page_on_front // We also need to check if it's not zero(`0`).
+					? siteData.page_on_front.toString()
+					: null;
+			const _postsPageId =
+				siteData?.show_on_front === 'page' &&
+				[ 'number', 'string' ].includes(
+					typeof siteData.page_for_posts
+				)
+					? siteData.page_for_posts.toString()
+					: null;
+			return {
+				hasLoadedAllDependencies: !! siteData,
+				homepageId: _homepageId,
+				postsPageId: _postsPageId,
+			};
+		},
+		[]
+	);
 
 	/**
 	 * This is a hook that recreates the logic to resolve a template for a given WordPress postID postTypeId
@@ -98,7 +85,6 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 				getEditedEntityRecord,
 				getEntityRecords,
 				getDefaultTemplateId,
-				__experimentalGetTemplateForLink,
 			} = select( coreDataStore );
 
 			function resolveTemplateForPostTypeAndId(
@@ -110,14 +96,31 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 					postTypeToResolve === 'page' &&
 					homepageId === postIdToResolve
 				) {
-					// We're still checking whether the front page template exists.
-					// Don't resolve the template yet.
-					if ( frontPageTemplateId === undefined ) {
-						return undefined;
-					}
+					// The /lookup endpoint cannot currently handle a lookup
+					// when a page is set as the front page, so specifically in
+					// that case, we want to check if there is a front page
+					// template, and instead of falling back to the home
+					// template, we want to fall back to the page template.
+					const templates = getEntityRecords(
+						'postType',
+						TEMPLATE_POST_TYPE,
+						{
+							per_page: -1,
+						}
+					);
+					if ( templates ) {
+						const id = templates?.find(
+							( { slug } ) => slug === 'front-page'
+						)?.id;
+						if ( id ) {
+							return id;
+						}
 
-					if ( !! frontPageTemplateId ) {
-						return frontPageTemplateId;
+						// If no front page template is found, continue with the
+						// logic below (fetching the page template).
+					} else {
+						// Still resolving `templates`.
+						return undefined;
 					}
 				}
 
@@ -134,8 +137,7 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 					postTypeToResolve === 'page' &&
 					postsPageId === postIdToResolve
 				) {
-					return __experimentalGetTemplateForLink( editedEntity.link )
-						?.id;
+					return getDefaultTemplateId( { slug: 'home' } );
 				}
 				// First see if the post/page has an assigned template and fetch it.
 				const currentTemplateSlug = editedEntity.template;
@@ -193,20 +195,9 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 			}
 
 			// If we're not rendering a specific page, use the front page template.
-			if ( url ) {
-				const template = __experimentalGetTemplateForLink( url );
-				return template?.id;
-			}
+			return getDefaultTemplateId( { slug: 'front-page' } );
 		},
-		[
-			homepageId,
-			postsPageId,
-			hasLoadedAllDependencies,
-			url,
-			postId,
-			postType,
-			frontPageTemplateId,
-		]
+		[ homepageId, postsPageId, hasLoadedAllDependencies, postId, postType ]
 	);
 
 	const context = useMemo( () => {
@@ -248,10 +239,19 @@ export default function useInitEditedEntityFromURL() {
 		useResolveEditedEntityAndContext( params );
 
 	const { setEditedEntity } = useDispatch( editSiteStore );
+	const { resetZoomLevel } = unlock( useDispatch( blockEditorStore ) );
 
 	useEffect( () => {
 		if ( isReady ) {
+			resetZoomLevel();
 			setEditedEntity( postType, postId, context );
 		}
-	}, [ isReady, postType, postId, context, setEditedEntity ] );
+	}, [
+		isReady,
+		postType,
+		postId,
+		context,
+		setEditedEntity,
+		resetZoomLevel,
+	] );
 }

package/src/components/welcome-guide/index.js

@@ -6,13 +6,13 @@ import WelcomeGuideStyles from './styles';
 import WelcomeGuidePage from './page';
 import WelcomeGuideTemplate from './template';
 
-export default function WelcomeGuide() {
+export default function WelcomeGuide( { postType } ) {
 	return (
 		<>
 			<WelcomeGuideEditor />
 			<WelcomeGuideStyles />
-			<WelcomeGuidePage />
-			<WelcomeGuideTemplate />
+			{ postType === 'page' && <WelcomeGuidePage /> }
+			{ postType === 'wp_template' && <WelcomeGuideTemplate /> }
 		</>
 	);
 }

package/src/components/welcome-guide/page.js

@@ -6,11 +6,6 @@ import { Guide } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { store as preferencesStore } from '@wordpress/preferences';
 
-/**
- * Internal dependencies
- */
-import { store as editSiteStore } from '../../store';
-
 export default function WelcomeGuidePage() {
 	const { toggle } = useDispatch( preferencesStore );
 
@@ -23,8 +18,7 @@ export default function WelcomeGuidePage() {
 			'core/edit-site',
 			'welcomeGuide'
 		);
-		const { isPage } = select( editSiteStore );
-		return isPageActive && ! isEditorActive && isPage();
+		return isPageActive && ! isEditorActive;
 	}, [] );
 
 	if ( ! isVisible ) {

package/src/components/welcome-guide/template.js

@@ -7,16 +7,9 @@ import { __ } from '@wordpress/i18n';
 import { store as preferencesStore } from '@wordpress/preferences';
 import { store as editorStore } from '@wordpress/editor';
 
-/**
- * Internal dependencies
- */
-import useEditedEntityRecord from '../use-edited-entity-record';
-
 export default function WelcomeGuideTemplate() {
 	const { toggle } = useDispatch( preferencesStore );
 
-	const { isLoaded, record } = useEditedEntityRecord();
-	const isPostTypeTemplate = isLoaded && record.type === 'wp_template';
 	const { isActive, hasPreviousEntity } = useSelect( ( select ) => {
 		const { getEditorSettings } = select( editorStore );
 		const { get } = select( preferencesStore );
@@ -26,7 +19,7 @@ export default function WelcomeGuideTemplate() {
 				!! getEditorSettings().onNavigateToPreviousEntityRecord,
 		};
 	}, [] );
-	const isVisible = isActive && isPostTypeTemplate && hasPreviousEntity;
+	const isVisible = isActive && hasPreviousEntity;
 
 	if ( ! isVisible ) {
 		return null;