@wordpress/editor 14.33.4 → 14.33.6

package/src/components/collab-sidebar/style.scss

@@ -163,8 +163,24 @@
 	border-style: solid;
 	padding: var(--wp-admin-border-width-focus);
 	background: $white;
+	box-sizing: border-box;
 
 	&:first-child {
 		margin-left: 0;
 	}
 }
+
+.show-icon-labels {
+	.comment-avatar-indicator {
+		width: auto;
+		// Hide the user avatars container when labels are set to display...
+		div {
+			display: none;
+		}
+		// ... and display labels.
+		&::after {
+			content: attr(aria-label);
+			font-size: $helptext-font-size;
+		}
+	}
+}

package/src/components/collab-sidebar/utils.js

@@ -109,8 +109,8 @@ export function focusCommentThread( commentId, container, additionalSelector ) {
 
 	// A thread without a commentId is a new comment thread.
 	const threadSelector = commentId
-		? `[role=listitem][id="comment-thread-${ commentId }"]`
-		: '[role=listitem]:not([id])';
+		? `[role=treeitem][id="comment-thread-${ commentId }"]`
+		: '[role=treeitem]:not([id])';
 	const selector = additionalSelector
 		? `${ threadSelector } ${ additionalSelector }`
 		: threadSelector;
@@ -129,6 +129,7 @@ export function focusCommentThread( commentId, container, additionalSelector ) {
 				resolve( container.querySelector( selector ) );
 			}
 		} );
+
 		observer.observe( container, {
 			childList: true,
 			subtree: true,

package/src/components/editor/index.js

@@ -87,11 +87,11 @@ function Editor( {
 						{ extraContent }
 					</EditorInterface>
 					{ children }
-					<NotesSidebar />
 					<Sidebar
 						onActionPerformed={ onActionPerformed }
 						extraPanels={ extraSidebarPanels }
 					/>
+					<NotesSidebar />
 				</ExperimentalEditorProvider>
 			) }
 		</>

package/src/components/post-excerpt/panel.js

@@ -23,7 +23,6 @@ import PostExcerptCheck from './check';
 import PluginPostExcerpt from './plugin';
 import { TEMPLATE_ORIGINS } from '../../store/constants';
 import { store as editorStore } from '../../store';
-import { getTemplateInfo } from '../../utils/get-template-info';
 
 /**
  * Module Constants
@@ -133,22 +132,13 @@ function PrivateExcerpt() {
 					postType,
 					getCurrentPostId()
 				);
-			const fallback =
-				! _excerpt && isTemplateOrTemplatePart
-					? getTemplateInfo( {
-							template,
-							templateTypes:
-								select( coreStore ).getCurrentTheme()
-									?.default_template_types,
-					  } )?.description
-					: undefined;
 			// For post types that use excerpt as description, we do not abide
 			// by the `isEnabled` panel flag in order to render them as text.
 			const _shouldRender =
 				isEditorPanelEnabled( PANEL_NAME ) ||
 				_shouldBeUsedAsDescription;
 			return {
-				excerpt: _excerpt ?? fallback,
+				excerpt: _excerpt,
 				shouldRender: _shouldRender,
 				shouldBeUsedAsDescription: _shouldBeUsedAsDescription,
 				// If we should render, allow editing for all post types that are not used as description.

package/src/components/post-template/block-theme.js

@@ -31,15 +31,10 @@ export default function BlockThemeControl( { id } ) {
 		onNavigateToEntityRecord,
 		getEditorSettings,
 		hasGoBack,
-		hasSpecificTemplate,
 	} = useSelect( ( select ) => {
-		const {
-			getRenderingMode,
-			getEditorSettings: _getEditorSettings,
-			getCurrentPost,
-		} = unlock( select( editorStore ) );
+		const { getRenderingMode, getEditorSettings: _getEditorSettings } =
+			unlock( select( editorStore ) );
 		const editorSettings = _getEditorSettings();
-		const currentPost = getCurrentPost();
 		return {
 			isTemplateHidden: getRenderingMode() === 'post-only',
 			onNavigateToEntityRecord: editorSettings.onNavigateToEntityRecord,
@@ -47,7 +42,6 @@ export default function BlockThemeControl( { id } ) {
 			hasGoBack: editorSettings.hasOwnProperty(
 				'onNavigateToPreviousEntityRecord'
 			),
-			hasSpecificTemplate: !! currentPost.template,
 		};
 	}, [] );
 
@@ -58,8 +52,6 @@ export default function BlockThemeControl( { id } ) {
 		'wp_template',
 		id
 	);
-	const { getEntityRecord } = useSelect( coreStore );
-	const { editEntityRecord } = useDispatch( coreStore );
 	const { createSuccessNotice } = useDispatch( noticesStore );
 	const { setRenderingMode, setDefaultRenderingMode } = unlock(
 		useDispatch( editorStore )
@@ -134,45 +126,11 @@ export default function BlockThemeControl( { id } ) {
 						<MenuGroup>
 							{ canCreateTemplate && (
 								<MenuItem
-									onClick={ async () => {
+									onClick={ () => {
 										onNavigateToEntityRecord( {
 											postId: template.id,
 											postType: 'wp_template',
 										} );
-										// When editing a global template,
-										// activate the auto-draft. This is not
-										// immediately live (we're not saving
-										// site options), and when nothing is
-										// saved, the setting will be ignored.
-										// In the future, we should make the
-										// duplication explicit, so there
-										// wouldn't be an "edit" button for
-										// static theme templates.
-										if ( ! hasSpecificTemplate ) {
-											const activeTemplates =
-												await getEntityRecord(
-													'root',
-													'site'
-												).active_templates;
-											if (
-												activeTemplates[
-													template.slug
-												] !== template.id
-											) {
-												editEntityRecord(
-													'root',
-													'site',
-													undefined,
-													{
-														active_templates: {
-															...activeTemplates,
-															[ template.slug ]:
-																template.id,
-														},
-													}
-												);
-											}
-										}
 										onClose();
 										mayShowTemplateEditNotice();
 									} }

package/src/components/post-template/create-new-template-modal.js

@@ -99,7 +99,6 @@ export default function CreateNewTemplateModal( { onClose } ) {
 			slug: kebabCase( title || DEFAULT_TITLE ) || 'wp-custom-template',
 			content: newTemplateContent,
 			title: title || DEFAULT_TITLE,
-			status: 'publish',
 		} );
 
 		setIsBusy( false );

package/src/components/post-template/hooks.js

@@ -57,8 +57,6 @@ function useTemplates( postType ) {
 			select( coreStore ).getEntityRecords( 'postType', 'wp_template', {
 				per_page: -1,
 				post_type: postType,
-				// We look at the combined templates for now (old endpoint)
-				// because posts only accept slugs for templates, not IDs.
 			} ),
 		[ postType ]
 	);
@@ -73,7 +71,7 @@ export function useAvailableTemplates( postType ) {
 			allowSwitchingTemplate &&
 			templates?.filter(
 				( template ) =>
-					( template.is_custom || template.type === 'wp_template' ) &&
+					template.is_custom &&
 					template.slug !== currentTemplateSlug &&
 					!! template.content.raw // Skip empty templates.
 			),

package/src/components/preferences-modal/index.js

@@ -116,7 +116,7 @@ function PreferencesModalContents( { extraSections = {} } ) {
 									scope="core"
 									featureName="enableChoosePatternModal"
 									help={ __(
-										'Shows starter patterns when creating a new page.'
+										'Pick from starter content when creating a new page.'
 									) }
 									label={ __( 'Show starter patterns' ) }
 								/>

package/src/components/provider/index.js

@@ -282,8 +282,7 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 			setEditedPost,
 			setRenderingMode,
 		} = unlock( useDispatch( editorStore ) );
-		const { createWarningNotice, removeNotice } =
-			useDispatch( noticesStore );
+		const { createWarningNotice } = useDispatch( noticesStore );
 
 		// Ideally this should be synced on each change and not just something you do once.
 		useLayoutEffect( () => {
@@ -319,9 +318,7 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 		// Synchronizes the active post with the state
 		useEffect( () => {
 			setEditedPost( post.type, post.id );
-			// Clear any notices dependent on the post context.
-			removeNotice( 'template-activate-notice' );
-		}, [ post.type, post.id, setEditedPost, removeNotice ] );
+		}, [ post.type, post.id, setEditedPost ] );
 
 		// Synchronize the editor settings as they change.
 		useEffect( () => {

package/src/components/start-page-options/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { Flex, FlexItem, Modal, ToggleControl } from '@wordpress/components';
+import { Flex, FlexItem, Modal, CheckboxControl } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useState, useMemo, useEffect } from '@wordpress/element';
 import {
@@ -119,16 +119,15 @@ function StartPageOptionsModal( { onClose } ) {
 			</div>
 			<Flex
 				className="editor-start-page-options__modal__actions"
-				justify="flex-end"
+				justify="flex-start"
 				expanded={ false }
 			>
 				<FlexItem>
-					<ToggleControl
+					<CheckboxControl
 						__nextHasNoMarginBottom
 						checked={ showStartPatterns }
-						label={ __( 'Show starter patterns' ) }
-						help={ __(
-							'Shows starter patterns when creating a new page.'
+						label={ __(
+							'Always show starter patterns for new pages'
 						) }
 						onChange={ ( newValue ) => {
 							setShowStartPatterns( newValue );

package/src/components/start-page-options/style.scss

@@ -3,7 +3,7 @@
 @use "@wordpress/base-styles/variables" as *;
 @use "@wordpress/base-styles/z-index" as *;
 
-$actions-height: 92px;
+$actions-height: 72px;
 
 .editor-start-page-options__modal {
 	.editor-start-page-options__modal__actions {

package/src/dataviews/store/private-actions.ts

@@ -133,28 +133,19 @@ export const registerPostTypeSchema =
 			.resolveSelect( coreStore )
 			.getCurrentTheme();
 
-		let canDuplicate =
-			! [ 'wp_block', 'wp_template_part' ].includes(
-				postTypeConfig.slug
-			) &&
-			canCreate &&
-			duplicatePost;
-
-		// @ts-ignore
-		if ( ! globalThis.IS_GUTENBERG_PLUGIN ) {
-			// Outside Gutenberg, disable duplication except for wp_template.
-			if ( 'wp_template' !== postTypeConfig.slug ) {
-				canDuplicate = undefined;
-			}
-		}
-
 		const actions = [
 			postTypeConfig.viewable ? viewPost : undefined,
 			!! postTypeConfig.supports?.revisions
 				? viewPostRevisions
 				: undefined,
 			// @ts-ignore
-			canDuplicate,
+			globalThis.IS_GUTENBERG_PLUGIN
+				? ! [ 'wp_template', 'wp_block', 'wp_template_part' ].includes(
+						postTypeConfig.slug
+				  ) &&
+				  canCreate &&
+				  duplicatePost
+				: undefined,
 			postTypeConfig.slug === 'wp_template_part' &&
 			canCreate &&
 			currentTheme?.is_block_theme

package/src/store/actions.js

@@ -18,7 +18,7 @@ import {
 	doActionAsync,
 } from '@wordpress/hooks';
 import { store as preferencesStore } from '@wordpress/preferences';
-import { __, sprintf } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -264,7 +264,7 @@ export const savePost =
 			try {
 				await doActionAsync(
 					'editor.savePost',
-					{ id: previousRecord.id, type: previousRecord.type },
+					{ id: previousRecord.id },
 					options
 				);
 			} catch ( err ) {
@@ -273,15 +273,6 @@ export const savePost =
 		}
 		dispatch( { type: 'REQUEST_POST_UPDATE_FINISH', options } );
 
-		if (
-			! options.isAutosave &&
-			previousRecord.type === 'wp_template' &&
-			( typeof previousRecord.id === 'number' ||
-				/^\d+$/.test( previousRecord.id ) )
-		) {
-			templateActivationNotice( { select, dispatch, registry } );
-		}
-
 		if ( error ) {
 			const args = getNotificationArgumentsForSaveFail( {
 				post: previousRecord,
@@ -316,91 +307,6 @@ export const savePost =
 		}
 	};
 
-async function templateActivationNotice( { select, registry } ) {
-	const editorSettings = select.getEditorSettings();
-
-	// Don't open for focused entity.
-	if ( editorSettings.onNavigateToPreviousEntityRecord ) {
-		return;
-	}
-
-	const { id, slug } = select.getCurrentPost();
-	const site = await registry
-		.select( coreStore )
-		.getEntityRecord( 'root', 'site' );
-
-	// Already active.
-	if ( site.active_templates[ slug ] === id ) {
-		return;
-	}
-
-	const currentTheme = await registry
-		.resolveSelect( coreStore )
-		.getCurrentTheme();
-	const templateType = currentTheme?.default_template_types.find(
-		( type ) => type.slug === slug
-	);
-
-	await registry.dispatch( noticesStore ).createNotice(
-		'info',
-		sprintf(
-			// translators: %s: The name (or slug) of the type of template.
-			__( 'Do you want to activate this "%s" template?' ),
-			templateType?.title ?? slug
-		),
-		{
-			id: 'template-activate-notice',
-			actions: [
-				{
-					label: __( 'Activate' ),
-					onClick: async () => {
-						await registry
-							.dispatch( noticesStore )
-							.createNotice(
-								'info',
-								__( 'Activating template…' ),
-								{ id: 'template-activate-notice' }
-							);
-						try {
-							const currentSite = await registry
-								.select( coreStore )
-								.getEntityRecord( 'root', 'site' );
-							await registry
-								.dispatch( coreStore )
-								.saveEntityRecord(
-									'root',
-									'site',
-									{
-										active_templates: {
-											...currentSite.active_templates,
-											[ slug ]: id,
-										},
-									},
-									{ throwOnError: true }
-								);
-							await registry
-								.dispatch( noticesStore )
-								.createSuccessNotice(
-									__( 'Template activated.' ),
-									{ id: 'template-activate-notice' }
-								);
-						} catch ( error ) {
-							await registry
-								.dispatch( noticesStore )
-								.createErrorNotice(
-									__( 'Template activation failed.' ),
-									{ id: 'template-activate-notice' }
-								);
-							// Rethrow for debugging.
-							throw error;
-						}
-					},
-				},
-			],
-		}
-	);
-}
-
 /**
  * Action for refreshing the current post.
  *
@@ -734,10 +640,7 @@ export function updateEditorSettings( settings ) {
 export const setRenderingMode =
 	( mode ) =>
 	( { dispatch, registry, select } ) => {
-		if (
-			select.__unstableIsEditorReady() &&
-			! select.getEditorSettings().isPreviewMode
-		) {
+		if ( select.__unstableIsEditorReady() ) {
 			// We clear the block selection but we also need to clear the selection from the core store.
 			registry.dispatch( blockEditorStore ).clearSelectedBlock();
 			dispatch.editPost( { selection: undefined }, { undoIgnore: true } );