@wordpress/edit-site 5.22.0 → 5.24.0

package/src/hooks/commands/use-edit-mode-commands.js

@@ -24,6 +24,7 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { store as preferencesStore } from '@wordpress/preferences';
 import { store as interfaceStore } from '@wordpress/interface';
 import { store as noticesStore } from '@wordpress/notices';
+import { store as editorStore } from '@wordpress/editor';
 
 /**
  * Internal dependencies
@@ -42,15 +43,18 @@ const { useHistory } = unlock( routerPrivateApis );
 
 function usePageContentFocusCommands() {
 	const { record: template } = useEditedEntityRecord();
-	const { isPage, canvasMode, hasPageContentFocus } = useSelect(
-		( select ) => ( {
-			isPage: select( editSiteStore ).isPage(),
-			canvasMode: unlock( select( editSiteStore ) ).getCanvasMode(),
-			hasPageContentFocus: select( editSiteStore ).hasPageContentFocus(),
-		} ),
-		[]
-	);
-	const { setHasPageContentFocus } = useDispatch( editSiteStore );
+	const { isPage, canvasMode, renderingMode } = useSelect( ( select ) => {
+		const { isPage: _isPage, getCanvasMode } = unlock(
+			select( editSiteStore )
+		);
+		const { getRenderingMode } = select( editorStore );
+		return {
+			isPage: _isPage(),
+			canvasMode: getCanvasMode(),
+			renderingMode: getRenderingMode(),
+		};
+	}, [] );
+	const { setRenderingMode } = useDispatch( editorStore );
 
 	if ( ! isPage || canvasMode !== 'edit' ) {
 		return { isLoading: false, commands: [] };
@@ -58,7 +62,7 @@ function usePageContentFocusCommands() {
 
 	const commands = [];
 
-	if ( hasPageContentFocus ) {
+	if ( renderingMode !== 'template-only' ) {
 		commands.push( {
 			name: 'core/switch-to-template-focus',
 			/* translators: %1$s: template title */
@@ -68,7 +72,7 @@ function usePageContentFocusCommands() {
 			),
 			icon: layout,
 			callback: ( { close } ) => {
-				setHasPageContentFocus( false );
+				setRenderingMode( 'template-only' );
 				close();
 			},
 		} );
@@ -78,7 +82,7 @@ function usePageContentFocusCommands() {
 			label: __( 'Back to page' ),
 			icon: page,
 			callback: ( { close } ) => {
-				setHasPageContentFocus( true );
+				setRenderingMode( 'template-locked' );
 				close();
 			},
 		} );
@@ -122,8 +126,10 @@ function useManipulateDocumentCommands() {
 	const { isLoaded, record: template } = useEditedEntityRecord();
 	const { removeTemplate, revertTemplate } = useDispatch( editSiteStore );
 	const history = useHistory();
-	const hasPageContentFocus = useSelect(
-		( select ) => select( editSiteStore ).hasPageContentFocus(),
+	const isEditingPage = useSelect(
+		( select ) =>
+			select( editSiteStore ).isPage() &&
+			select( editorStore ).getRenderingMode() !== 'template-only',
 		[]
 	);
 
@@ -133,7 +139,7 @@ function useManipulateDocumentCommands() {
 
 	const commands = [];
 
-	if ( isTemplateRevertable( template ) && ! hasPageContentFocus ) {
+	if ( isTemplateRevertable( template ) && ! isEditingPage ) {
 		const label =
 			template.type === TEMPLATE_POST_TYPE
 				? /* translators: %1$s: template title */
@@ -157,7 +163,7 @@ function useManipulateDocumentCommands() {
 		} );
 	}
 
-	if ( isTemplateRemovable( template ) && ! hasPageContentFocus ) {
+	if ( isTemplateRemovable( template ) && ! isEditingPage ) {
 		const label =
 			template.type === TEMPLATE_POST_TYPE
 				? /* translators: %1$s: template title */

package/src/hooks/push-changes-to-global-styles/index.js

@@ -17,8 +17,9 @@ import {
 	hasBlockSupport,
 } from '@wordpress/blocks';
 import { useContext, useMemo, useCallback } from '@wordpress/element';
-import { useDispatch } from '@wordpress/data';
+import { useDispatch, useSelect } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
+import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
@@ -391,6 +392,10 @@ function PushChangesToGlobalStylesControl( {
 const withPushChangesToGlobalStyles = createHigherOrderComponent(
 	( BlockEdit ) => ( props ) => {
 		const blockEditingMode = useBlockEditingMode();
+		const isBlockBasedTheme = useSelect(
+			( select ) => select( coreStore ).getCurrentTheme()?.is_block_theme,
+			[]
+		);
 		const supportsStyles = SUPPORTED_STYLES.some( ( feature ) =>
 			hasBlockSupport( props.name, feature )
 		);
@@ -398,11 +403,13 @@ const withPushChangesToGlobalStyles = createHigherOrderComponent(
 		return (
 			<>
 				<BlockEdit { ...props } />
-				{ blockEditingMode === 'default' && supportsStyles && (
-					<InspectorAdvancedControls>
-						<PushChangesToGlobalStylesControl { ...props } />
-					</InspectorAdvancedControls>
-				) }
+				{ blockEditingMode === 'default' &&
+					supportsStyles &&
+					isBlockBasedTheme && (
+						<InspectorAdvancedControls>
+							<PushChangesToGlobalStylesControl { ...props } />
+						</InspectorAdvancedControls>
+					) }
 			</>
 		);
 	}

package/src/hooks/template-part-edit.js

@@ -24,11 +24,13 @@ function EditTemplatePartMenuItem( { attributes } ) {
 	const { params } = useLocation();
 	const templatePart = useSelect(
 		( select ) => {
-			return select( coreStore ).getEntityRecord(
+			const { getCurrentTheme, getEntityRecord } = select( coreStore );
+
+			return getEntityRecord(
 				'postType',
 				TEMPLATE_PART_POST_TYPE,
 				// Ideally this should be an official public API.
-				`${ theme }//${ slug }`
+				`${ theme || getCurrentTheme()?.stylesheet }//${ slug }`
 			);
 		},
 		[ theme, slug ]

package/src/index.js

@@ -10,10 +10,6 @@ import {
 import { dispatch } from '@wordpress/data';
 import deprecated from '@wordpress/deprecated';
 import { createRoot } from '@wordpress/element';
-import {
-	__experimentalFetchLinkSuggestions as fetchLinkSuggestions,
-	__experimentalFetchUrlData as fetchUrlData,
-} from '@wordpress/core-data';
 import { store as editorStore } from '@wordpress/editor';
 import { store as interfaceStore } from '@wordpress/interface';
 import { store as preferencesStore } from '@wordpress/preferences';
@@ -39,10 +35,6 @@ export function initializeEditor( id, settings ) {
 	const target = document.getElementById( id );
 	const root = createRoot( target );
 
-	settings.__experimentalFetchLinkSuggestions = ( search, searchOptions ) =>
-		fetchLinkSuggestions( search, searchOptions, settings );
-	settings.__experimentalFetchRichUrlData = fetchUrlData;
-
 	dispatch( blocksStore ).reapplyBlockTypeFilters();
 	const coreBlocks = __experimentalGetCoreBlocks().filter(
 		( { name } ) => name !== 'core/freeform'

package/src/store/actions.js

@@ -31,11 +31,14 @@ import {
  */
 export function toggleFeature( featureName ) {
 	return function ( { registry } ) {
-		deprecated( "select( 'core/edit-site' ).toggleFeature( featureName )", {
-			since: '6.0',
-			alternative:
-				"select( 'core/preferences').toggle( 'core/edit-site', featureName )",
-		} );
+		deprecated(
+			"dispatch( 'core/edit-site' ).toggleFeature( featureName )",
+			{
+				since: '6.0',
+				alternative:
+					"dispatch( 'core/preferences').toggle( 'core/edit-site', featureName )",
+			}
+		);
 
 		registry
 			.dispatch( preferencesStore )
@@ -60,44 +63,38 @@ export function __experimentalSetPreviewDeviceType( deviceType ) {
 /**
  * Action that sets a template, optionally fetching it from REST API.
  *
- * @param {number} templateId   The template ID.
- * @param {string} templateSlug The template slug.
  * @return {Object} Action object.
  */
-export const setTemplate =
-	( templateId, templateSlug ) =>
-	async ( { dispatch, registry } ) => {
-		if ( ! templateSlug ) {
-			try {
-				const template = await registry
-					.resolveSelect( coreStore )
-					.getEntityRecord(
-						'postType',
-						TEMPLATE_POST_TYPE,
-						templateId
-					);
-				templateSlug = template?.slug;
-			} catch ( error ) {}
-		}
+export function setTemplate() {
+	deprecated( "dispatch( 'core/edit-site' ).setTemplate", {
+		since: '6.5',
+		version: '6.8',
+		hint: 'The setTemplate is not needed anymore, the correct entity is resolved from the URL automatically.',
+	} );
 
-		dispatch( {
-			type: 'SET_EDITED_POST',
-			postType: TEMPLATE_POST_TYPE,
-			id: templateId,
-			context: { templateSlug },
-		} );
+	return {
+		type: 'NOTHING',
 	};
+}
 
 /**
  * Action that adds a new template and sets it as the current template.
  *
  * @param {Object} template The template.
  *
+ * @deprecated
+ *
  * @return {Object} Action object used to set the current template.
  */
 export const addTemplate =
 	( template ) =>
 	async ( { dispatch, registry } ) => {
+		deprecated( "dispatch( 'core/edit-site' ).addTemplate", {
+			since: '6.5',
+			version: '6.8',
+			hint: 'use saveEntityRecord directly',
+		} );
+
 		const newTemplate = await registry
 			.dispatch( coreStore )
 			.saveEntityRecord( 'postType', TEMPLATE_POST_TYPE, template );
@@ -118,7 +115,6 @@ export const addTemplate =
 			type: 'SET_EDITED_POST',
 			postType: TEMPLATE_POST_TYPE,
 			id: newTemplate.id,
-			context: { templateSlug: newTemplate.slug },
 		} );
 	};
 
@@ -211,14 +207,16 @@ export function setNavigationMenu( navigationMenuId ) {
  *
  * @param {string} postType The entity's post type.
  * @param {string} postId   The entity's ID.
+ * @param {Object} context  The entity's context.
  *
  * @return {Object} Action object.
  */
-export function setEditedEntity( postType, postId ) {
+export function setEditedEntity( postType, postId, context ) {
 	return {
 		type: 'SET_EDITED_POST',
 		postType,
 		id: postId,
+		context,
 	};
 }
 
@@ -254,75 +252,19 @@ export function setEditedPostContext( context ) {
  * Resolves the template for a page and displays both. If no path is given, attempts
  * to use the postId to generate a path like `?p=${ postId }`.
  *
- * @param {Object} page         The page object.
- * @param {string} page.type    The page type.
- * @param {string} page.slug    The page slug.
- * @param {string} page.path    The page path.
- * @param {Object} page.context The page context.
+ * @deprecated
  *
  * @return {number} The resolved template ID for the page route.
  */
-export const setPage =
-	( page ) =>
-	async ( { dispatch, registry } ) => {
-		let template;
-		const getDefaultTemplate = async ( slug ) =>
-			apiFetch( {
-				path: addQueryArgs( '/wp/v2/templates/lookup', {
-					slug: `page-${ slug }`,
-				} ),
-			} );
-
-		if ( page.path ) {
-			template = await registry
-				.resolveSelect( coreStore )
-				.__experimentalGetTemplateForLink( page.path );
-		} else {
-			const editedEntity = await registry
-				.resolveSelect( coreStore )
-				.getEditedEntityRecord(
-					'postType',
-					page.context?.postType || 'post',
-					page.context?.postId
-				);
-			const currentTemplateSlug = editedEntity?.template;
-			if ( currentTemplateSlug ) {
-				const currentTemplate = (
-					await registry
-						.resolveSelect( coreStore )
-						.getEntityRecords( 'postType', TEMPLATE_POST_TYPE, {
-							per_page: -1,
-						} )
-				)?.find( ( { slug } ) => slug === currentTemplateSlug );
-				if ( currentTemplate ) {
-					template = currentTemplate;
-				} else {
-					// If a page has a `template` set and is not included in the list
-					// of the current theme's templates, query for current theme's default template.
-					template = await getDefaultTemplate( editedEntity?.slug );
-				}
-			} else {
-				// Page's `template` is empty, that indicates we need to use the default template for the page.
-				template = await getDefaultTemplate( editedEntity?.slug );
-			}
-		}
-
-		if ( ! template ) {
-			return;
-		}
-
-		dispatch( {
-			type: 'SET_EDITED_POST',
-			postType: TEMPLATE_POST_TYPE,
-			id: template.id,
-			context: {
-				...page.context,
-				templateSlug: template.slug,
-			},
-		} );
+export function setPage() {
+	deprecated( "dispatch( 'core/edit-site' ).setPage", {
+		since: '6.5',
+		version: '6.8',
+		hint: 'The setPage is not needed anymore, the correct entity is resolved from the URL automatically.',
+	} );
 
-		return template.id;
-	};
+	return { type: 'NOTHING' };
+}
 
 /**
  * Action that sets the active navigation panel menu.
@@ -633,6 +575,10 @@ export const switchEditorMode =
 export const setHasPageContentFocus =
 	( hasPageContentFocus ) =>
 	( { dispatch, registry } ) => {
+		deprecated( `dispatch( 'core/edit-site' ).setHasPageContentFocus`, {
+			since: '6.5',
+		} );
+
 		if ( hasPageContentFocus ) {
 			registry.dispatch( blockEditorStore ).clearSelectedBlock();
 		}
@@ -657,7 +603,7 @@ export const toggleDistractionFree =
 			registry.batch( () => {
 				registry
 					.dispatch( preferencesStore )
-					.set( 'core/edit-site', 'fixedToolbar', false );
+					.set( 'core/edit-site', 'fixedToolbar', true );
 				dispatch.setIsInserterOpened( false );
 				dispatch.setIsListViewOpened( false );
 				dispatch.closeGeneralSidebar();

package/src/store/private-actions.js

@@ -11,7 +11,7 @@ import { store as preferencesStore } from '@wordpress/preferences';
  */
 export const setCanvasMode =
 	( mode ) =>
-	( { registry, dispatch, select } ) => {
+	( { registry, dispatch } ) => {
 		registry.dispatch( blockEditorStore ).__unstableSetEditorMode( 'edit' );
 		dispatch( {
 			type: 'SET_CANVAS_MODE',
@@ -30,10 +30,6 @@ export const setCanvasMode =
 		) {
 			dispatch.setIsListViewOpened( true );
 		}
-		// Switch focus away from editing the template when switching to view mode.
-		if ( mode === 'view' && select.isPage() ) {
-			dispatch.setHasPageContentFocus( true );
-		}
 	};
 
 /**
@@ -49,22 +45,3 @@ export const setEditorCanvasContainerView =
 			view,
 		} );
 	};
-
-/**
- * Sets the type of page content focus. Can be one of:
- *
- * - `'disableTemplate'`: Disable the blocks belonging to the page's template.
- * - `'hideTemplate'`: Hide the blocks belonging to the page's template.
- *
- * @param {'disableTemplate'|'hideTemplate'} pageContentFocusType The type of page content focus.
- *
- * @return {Object} Action object.
- */
-export const setPageContentFocusType =
-	( pageContentFocusType ) =>
-	( { dispatch } ) => {
-		dispatch( {
-			type: 'SET_PAGE_CONTENT_FOCUS_TYPE',
-			pageContentFocusType,
-		} );
-	};

package/src/store/private-selectors.js

@@ -1,8 +1,3 @@
-/**
- * Internal dependencies
- */
-import { hasPageContentFocus } from './selectors';
-
 /**
  * Returns the current canvas mode.
  *
@@ -24,20 +19,3 @@ export function getCanvasMode( state ) {
 export function getEditorCanvasContainerView( state ) {
 	return state.editorCanvasContainerView;
 }
-
-/**
- * Returns the type of the current page content focus, or null if there is no
- * page content focus.
- *
- * Possible values are:
- *
- * - `'disableTemplate'`: Disable the blocks belonging to the page's template.
- * - `'hideTemplate'`: Hide the blocks belonging to the page's template.
- *
- * @param {Object} state Global application state.
- *
- * @return {'disableTemplate'|'hideTemplate'|null} Type of the current page content focus.
- */
-export function getPageContentFocusType( state ) {
-	return hasPageContentFocus( state ) ? state.pageContentFocusType : null;
-}

package/src/store/reducer.js

@@ -157,43 +157,6 @@ function editorCanvasContainerView( state = undefined, action ) {
 	return state;
 }
 
-/**
- * Reducer used to track whether the editor allows only page content to be
- * edited.
- *
- * @param {boolean} state  Current state.
- * @param {Object}  action Dispatched action.
- *
- * @return {boolean} Updated state.
- */
-export function hasPageContentFocus( state = false, action ) {
-	switch ( action.type ) {
-		case 'SET_EDITED_POST':
-			return !! action.context?.postId;
-		case 'SET_HAS_PAGE_CONTENT_FOCUS':
-			return action.hasPageContentFocus;
-	}
-
-	return state;
-}
-
-/**
- * Reducer used to track the type of page content focus.
- *
- * @param {string} state  Current state.
- * @param {Object} action Dispatched action.
- *
- * @return {string} Updated state.
- */
-export function pageContentFocusType( state = 'disableTemplate', action ) {
-	switch ( action.type ) {
-		case 'SET_PAGE_CONTENT_FOCUS_TYPE':
-			return action.pageContentFocusType;
-	}
-
-	return state;
-}
-
 export default combineReducers( {
 	deviceType,
 	settings,
@@ -203,6 +166,4 @@ export default combineReducers( {
 	saveViewPanel,
 	canvasMode,
 	editorCanvasContainerView,
-	hasPageContentFocus,
-	pageContentFocusType,
 } );