@wordpress/editor 14.50.0 → 14.51.1-next.v.202607070741.0

package/src/components/post-taxonomies/flat-term-selector.js

@@ -279,7 +279,6 @@ export function FlatTermSelector( { slug } ) {
 	return (
 		<Stack direction="column" gap="lg">
 			<FormTokenField
-				__next40pxDefaultSize
 				value={ values }
 				suggestions={ suggestions }
 				onChange={ onChange }

package/src/components/post-taxonomies/hierarchical-term-selector.js

@@ -417,7 +417,6 @@ export function HierarchicalTermSelector( { slug } ) {
 		<Flex direction="column" gap="4">
 			{ showFilter && ! loading && (
 				<SearchControl
-					__next40pxDefaultSize
 					label={ filterLabel }
 					placeholder={ filterLabel }
 					value={ filterValue }
@@ -470,7 +469,6 @@ export function HierarchicalTermSelector( { slug } ) {
 						/>
 						{ !! availableTerms.length && (
 							<TreeSelect
-								__next40pxDefaultSize
 								label={ parentSelectLabel }
 								noOptionLabel={ noParentOption }
 								onChange={ onChangeFormParent }

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

@@ -159,7 +159,6 @@ function PostTemplateDropdownContent( { onClose } ) {
 				</Notice>
 			) : (
 				<SelectControl
-					__next40pxDefaultSize
 					hideLabelFromVision
 					label={ __( 'Template' ) }
 					value={ selectedOption?.value ?? '' }

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

@@ -126,30 +126,48 @@ function PreferencesModalContents( { extraSections = {} } ) {
 									label={ __( 'Show starter patterns' ) }
 								/>
 								{ showCollaborationOptions && (
-									<>
-										<PreferenceToggleControl
-											scope="core"
-											featureName="showCollaborationCursor"
-											help={ __(
-												'Show your own avatar inside blocks during collaborative editing sessions.'
-											) }
-											label={ __(
-												'Show avatar in blocks'
-											) }
-										/>
-										<PreferenceToggleControl
-											scope="core"
-											featureName="showCollaborationNotifications"
-											help={ __(
-												'Show notifications when collaborators join, leave, or save the post.'
-											) }
-											label={ __(
-												'Show collaboration notifications'
-											) }
-										/>
-									</>
+									<PreferenceToggleControl
+										scope="core"
+										featureName="showCollaborationCursor"
+										help={ __(
+											'Show your own avatar inside blocks during collaborative editing sessions.'
+										) }
+										label={ __( 'Show avatar in blocks' ) }
+									/>
 								) }
 							</PreferencesModalSection>
+							{ showCollaborationOptions && (
+								<PreferencesModalSection
+									title={ __(
+										'Collaboration notifications'
+									) }
+								>
+									<PreferenceToggleControl
+										scope="core"
+										featureName="showCollaborationJoinNotifications"
+										help={ __(
+											'Show notifications when collaborators join the post.'
+										) }
+										label={ __( 'Collaborator joined' ) }
+									/>
+									<PreferenceToggleControl
+										scope="core"
+										featureName="showCollaborationLeaveNotifications"
+										help={ __(
+											'Show notifications when collaborators leave the post.'
+										) }
+										label={ __( 'Collaborator left' ) }
+									/>
+									<PreferenceToggleControl
+										scope="core"
+										featureName="showCollaborationPostSaveNotifications"
+										help={ __(
+											'Show notifications when collaborators save, update, or publish the post.'
+										) }
+										label={ __( 'Post updated' ) }
+									/>
+								</PreferencesModalSection>
+							) }
 							<PreferencesModalSection
 								title={ __( 'Document settings' ) }
 								description={ __(

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

@@ -2,22 +2,84 @@
  * External dependencies
  */
 import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 /**
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
+import { useViewportMatch } from '@wordpress/compose';
+import { store as preferencesStore } from '@wordpress/preferences';
+import { store as interfaceStore } from '@wordpress/interface';
+import { store as coreStore } from '@wordpress/core-data';
+import { SlotFillProvider } from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import EditPostPreferencesModal from '../';
+import { store as editorStore } from '../../../store';
+import { lock } from '../../../lock-unlock';
 
 // This allows us to tweak the returned value on each test.
 jest.mock( '@wordpress/data/src/components/use-select', () => jest.fn() );
 jest.mock( '@wordpress/compose/src/hooks/use-viewport-match', () => jest.fn() );
 
+function setupActiveModal( preferences = {} ) {
+	const user = userEvent.setup();
+	const editorSelectors = {
+		getCurrentPostType: () => 'post',
+		getEditedPostAttribute: () => 'post',
+		isPublishSidebarEnabled: () => false,
+	};
+	lock( editorSelectors, {
+		getEditorSettings: () => ( {
+			richEditingEnabled: true,
+		} ),
+		isCollaborationEnabledForCurrentPost: () => true,
+	} );
+
+	useViewportMatch.mockReturnValue( true );
+	useSelect.mockImplementation( ( mapSelect ) =>
+		mapSelect( ( store ) => {
+			if ( store === interfaceStore ) {
+				return {
+					isModalActive: () => true,
+				};
+			}
+			if ( store === editorStore ) {
+				return editorSelectors;
+			}
+			if ( store === preferencesStore ) {
+				return {
+					get: ( scope, featureName ) => preferences[ featureName ],
+				};
+			}
+			if ( store === coreStore ) {
+				return {
+					getEntityRecords: () => [],
+					getPostType: () => ( { supports: {} } ),
+					getThemeSupports: () => ( {} ),
+				};
+			}
+		} )
+	);
+
+	render(
+		<SlotFillProvider>
+			<EditPostPreferencesModal />
+		</SlotFillProvider>
+	);
+
+	return user;
+}
+
 describe( 'EditPostPreferencesModal', () => {
+	beforeEach( () => {
+		useSelect.mockReset();
+		useViewportMatch.mockReset();
+	} );
+
 	it( 'should not render when the modal is not active', () => {
 		useSelect.mockImplementation( () => false );
 		render( <EditPostPreferencesModal /> );
@@ -25,4 +87,25 @@ describe( 'EditPostPreferencesModal', () => {
 			screen.queryByRole( 'dialog', { name: 'Preferences' } )
 		).not.toBeInTheDocument();
 	} );
+
+	it( 'shows collaboration notification controls', async () => {
+		const user = setupActiveModal();
+		await user.click( screen.getByRole( 'tab', { name: 'General' } ) );
+
+		expect(
+			await screen.findByRole( 'checkbox', {
+				name: 'Collaborator joined',
+			} )
+		).toBeInTheDocument();
+		expect(
+			screen.getByRole( 'checkbox', {
+				name: 'Collaborator left',
+			} )
+		).toBeInTheDocument();
+		expect(
+			screen.getByRole( 'checkbox', {
+				name: 'Post updated',
+			} )
+		).toBeInTheDocument();
+	} );
 } );

package/src/components/preview-dropdown/index.js

@@ -133,7 +133,7 @@ export default function PreviewDropdown( { forceIsAutosaveable, disabled } ) {
 			label: __( 'Tablet' ),
 			icon: tablet,
 			info: isResponsiveEditing
-				? __( 'Make tablet exclusive changes.' )
+				? __( 'Make tablet exclusive style changes.' )
 				: __( 'Preview tablet viewport.' ),
 		},
 		{
@@ -141,7 +141,7 @@ export default function PreviewDropdown( { forceIsAutosaveable, disabled } ) {
 			label: __( 'Mobile' ),
 			icon: mobile,
 			info: isResponsiveEditing
-				? __( 'Make mobile exclusive changes.' )
+				? __( 'Make mobile exclusive style changes.' )
 				: __( 'Preview mobile viewport.' ),
 		},
 	];
@@ -175,7 +175,7 @@ export default function PreviewDropdown( { forceIsAutosaveable, disabled } ) {
 							role="menuitemcheckbox"
 							onClick={ handleResponsiveEditingChange }
 							info={ __(
-								'Edits apply only to the current state.'
+								'Style changes apply only to the current viewport.'
 							) }
 						>
 							{ __( 'Responsive editing' ) }

package/src/components/provider/use-block-editor-settings.js

@@ -22,10 +22,11 @@ import { privateApis as mediaEditorPrivateApis } from '@wordpress/media-editor';
 /**
  * Internal dependencies
  */
-import inserterMediaCategories from '../media-categories';
+import getInserterMediaCategories from '../media-categories';
 import { mediaUpload } from '../../utils';
 import mediaUploadOnSuccess from '../../utils/media-upload/on-success';
 import { default as mediaSideload } from '../../utils/media-sideload';
+import { default as mediaSideloadFromUrl } from '../../utils/media-sideload-from-url';
 import { default as mediaFinalize } from '../../utils/media-finalize';
 import { default as mediaDelete } from '../../utils/media-delete';
 import { store as editorStore } from '../../store';
@@ -117,6 +118,7 @@ const {
 	isNavigationOverlayContextKey,
 	isNavigationPostEditorKey,
 	mediaUploadOnSuccessKey,
+	mediaSideloadFromUrlKey,
 	openMediaEditorModalKey,
 } = unlock( privateApis );
 
@@ -152,6 +154,8 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 		deviceType,
 		isNavigationOverlayContext,
 		isRevisionsMode,
+		viewablePostTypeLabel,
+		currentPostId,
 	} = useSelect(
 		( select ) => {
 			const {
@@ -159,9 +163,12 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 				getRawEntityRecord,
 				getEntityRecord,
 				getBlockPatternCategories,
+				getPostType,
 			} = select( coreStore );
 			const { get } = select( preferencesStore );
 			const { getBlockTypes } = select( blocksStore );
+			const { getCurrentPostId, getCurrentPostType } =
+				select( editorStore );
 			const { getDeviceType, isRevisionsMode: _isRevisionsMode } = unlock(
 				select( editorStore )
 			);
@@ -177,6 +184,19 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 			// Fetch image sizes from REST API index for client-side media processing.
 			const baseData = getEntityRecord( 'root', '__unstableBase' );
 
+			// The attached-images category follows the post being edited, not the
+			// root-level entity in `postType`/`postId`. With "Show template" on,
+			// the root becomes the template (wp_template), but media still attaches
+			// to the page being edited.
+			//
+			// Guard on a truthy slug: `getPostType()` with no slug resolves the
+			// whole `/wp/v2/types` collection rather than the single, already
+			// fetched record for the current type.
+			const currentPostType = getCurrentPostType();
+			const postTypeObject = currentPostType
+				? getPostType( currentPostType )
+				: undefined;
+
 			function getSectionRootBlock() {
 				if ( renderingMode === 'template-locked' ) {
 					return getBlocksByName( 'core/post-content' )?.[ 0 ] ?? '';
@@ -220,6 +240,14 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 				} ),
 				pageOnFront: siteSettings?.page_on_front,
 				pageForPosts: siteSettings?.page_for_posts,
+				// The post type's singular name, but only for real, front-end
+				// rendered content (`viewable`). Empty for synced patterns,
+				// navigation and templates, which gates the attached-images
+				// category off for them and words its copy for everything else.
+				viewablePostTypeLabel: postTypeObject?.viewable
+					? postTypeObject?.labels?.singular_name
+					: undefined,
+				currentPostId: getCurrentPostId(),
 				restBlockPatternCategories: getBlockPatternCategories(),
 				sectionRootClientId: getSectionRootBlock(),
 				deviceType: getDeviceType(),
@@ -321,6 +349,15 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 
 	const forceDisableFocusMode = settings.focusMode === false;
 
+	// The "Attachments" media category depends on the edited post and its post
+	// type label (which gates whether it's offered and words its copy), so the
+	// categories are derived rather than being a static list.
+	const inserterMediaCategories = useMemo(
+		() =>
+			getInserterMediaCategories( currentPostId, viewablePostTypeLabel ),
+		[ currentPostId, viewablePostTypeLabel ]
+	);
+
 	return useMemo( () => {
 		const blockEditorSettings = {
 			...Object.fromEntries(
@@ -355,6 +392,9 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 				? mediaUploadOnSuccess
 				: undefined,
 			mediaSideload: hasUploadPermissions ? mediaSideload : undefined,
+			[ mediaSideloadFromUrlKey ]: hasUploadPermissions
+				? mediaSideloadFromUrl
+				: undefined,
 			mediaFinalize: hasUploadPermissions ? mediaFinalize : undefined,
 			mediaDelete: hasUploadPermissions ? mediaDelete : undefined,
 			__experimentalBlockPatterns: blockPatterns,
@@ -435,6 +475,7 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 		hasUploadPermissions,
 		blockPatterns,
 		blockPatternCategories,
+		inserterMediaCategories,
 		canUseUnfilteredHTML,
 		undo,
 		createPageEntity,

package/src/components/sidebar/dataform-post-summary.js

@@ -13,6 +13,7 @@ import { useViewConfig } from '@wordpress/views';
  * Internal dependencies
  */
 import PostCardPanel from '../post-card-panel';
+import PluginPostStatusInfo from '../plugin-post-status-info';
 import PostPanelSection from '../post-panel-section';
 import { store as editorStore } from '../../store';
 import PostTrash from '../post-trash';
@@ -394,7 +395,18 @@ export default function DataFormPostSummary( { onActionPerformed } ) {
 					onChange={ onChange }
 				/>
 				{ ! isPostStatusRemoved && (
-					<PostTrash onActionPerformed={ onActionPerformed } />
+					<>
+						<PluginPostStatusInfo.Slot>
+							{ ( fills ) =>
+								fills.length > 0 && (
+									<Stack direction="column" gap="xs">
+										{ fills }
+									</Stack>
+								)
+							}
+						</PluginPostStatusInfo.Slot>
+						<PostTrash onActionPerformed={ onActionPerformed } />
+					</>
 				) }
 			</Stack>
 		</PostPanelSection>

package/src/components/sidebar/index.js

@@ -20,6 +20,7 @@ import PatternOverridesPanel from '../pattern-overrides-panel';
 import PluginDocumentSettingPanel from '../plugin-document-setting-panel';
 import PluginSidebar from '../plugin-sidebar';
 import PostSummary from './post-summary';
+import DataFormPostSummary from './dataform-post-summary';
 import PostRevisionSummary from './post-revision-summary';
 import PostTaxonomiesPanel from '../post-taxonomies/panel';
 import PostTransformPanel from '../post-transform-panel';
@@ -32,11 +33,6 @@ import useAutoSwitchEditorSidebars from '../provider/use-auto-switch-editor-side
 import { sidebars } from './constants';
 import { unlock } from '../../lock-unlock';
 import { store as editorStore } from '../../store';
-import {
-	NAVIGATION_POST_TYPE,
-	TEMPLATE_PART_POST_TYPE,
-	TEMPLATE_POST_TYPE,
-} from '../../store/constants';
 
 const { Tabs } = unlock( componentsPrivateApis );
 
@@ -47,7 +43,6 @@ const SidebarContent = ( {
 	keyboardShortcut,
 	onActionPerformed,
 	extraPanels,
-	postType,
 } ) => {
 	const tabListRef = useRef( null );
 	// Because `PluginSidebar` renders a `ComplementaryArea`, we
@@ -89,15 +84,20 @@ const SidebarContent = ( {
 	if ( isRevisionsMode ) {
 		tabContent = <PostRevisionSummary />;
 	} else {
+		const isDataFormInspectorEnabled =
+			window?.__experimentalDataFormInspector;
 		tabContent = (
 			<>
-				<PostSummary onActionPerformed={ onActionPerformed } />
+				{ isDataFormInspectorEnabled ? (
+					<DataFormPostSummary
+						onActionPerformed={ onActionPerformed }
+					/>
+				) : (
+					<PostSummary onActionPerformed={ onActionPerformed } />
+				) }
 				<PluginDocumentSettingPanel.Slot />
 				<TemplateContentPanel />
-				{ window?.__experimentalDataFormInspector &&
-					[ 'page', 'post' ].includes( postType ) && (
-						<TemplateActionsPanel />
-					) }
+				{ isDataFormInspectorEnabled && <TemplateActionsPanel /> }
 				<TemplatePartContentPanel />
 				<PostTransformPanel />
 				<PostTaxonomiesPanel />
@@ -144,42 +144,29 @@ const SidebarContent = ( {
 
 const Sidebar = ( { extraPanels, onActionPerformed } ) => {
 	useAutoSwitchEditorSidebars();
-	const { tabName, keyboardShortcut, showSummary, postType } = useSelect(
-		( select ) => {
-			const shortcut = select(
-				keyboardShortcutsStore
-			).getShortcutRepresentation( 'core/editor/toggle-sidebar' );
-
-			const sidebar =
-				select( interfaceStore ).getActiveComplementaryArea( 'core' );
-			const _isEditorSidebarOpened = [
-				sidebars.block,
-				sidebars.document,
-			].includes( sidebar );
-			let _tabName = sidebar;
-			if ( ! _isEditorSidebarOpened ) {
-				_tabName = !! select(
-					blockEditorStore
-				).getBlockSelectionStart()
-					? sidebars.block
-					: sidebars.document;
-			}
+	const { tabName, keyboardShortcut } = useSelect( ( select ) => {
+		const shortcut = select(
+			keyboardShortcutsStore
+		).getShortcutRepresentation( 'core/editor/toggle-sidebar' );
 
-			const _postType = select( editorStore ).getCurrentPostType();
+		const sidebar =
+			select( interfaceStore ).getActiveComplementaryArea( 'core' );
+		const _isEditorSidebarOpened = [
+			sidebars.block,
+			sidebars.document,
+		].includes( sidebar );
+		let _tabName = sidebar;
+		if ( ! _isEditorSidebarOpened ) {
+			_tabName = !! select( blockEditorStore ).getBlockSelectionStart()
+				? sidebars.block
+				: sidebars.document;
+		}
 
-			return {
-				tabName: _tabName,
-				keyboardShortcut: shortcut,
-				showSummary: ! [
-					TEMPLATE_POST_TYPE,
-					TEMPLATE_PART_POST_TYPE,
-					NAVIGATION_POST_TYPE,
-				].includes( _postType ),
-				postType: _postType,
-			};
-		},
-		[]
-	);
+		return {
+			tabName: _tabName,
+			keyboardShortcut: shortcut,
+		};
+	}, [] );
 
 	const { enableComplementaryArea } = useDispatch( interfaceStore );
 
@@ -201,10 +188,8 @@ const Sidebar = ( { extraPanels, onActionPerformed } ) => {
 			<SidebarContent
 				tabName={ tabName }
 				keyboardShortcut={ keyboardShortcut }
-				showSummary={ showSummary }
 				onActionPerformed={ onActionPerformed }
 				extraPanels={ extraPanels }
-				postType={ postType }
 			/>
 		</Tabs>
 	);

package/src/components/sidebar/post-summary.js

@@ -7,7 +7,6 @@ import { useSelect } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import DataFormPostSummary from './dataform-post-summary';
 import PluginPostStatusInfo from '../plugin-post-status-info';
 import PostAuthorPanel from '../post-author/panel';
 import PostCardPanel from '../post-card-panel';
@@ -37,22 +36,6 @@ import PostTrash from '../post-trash';
 const PANEL_NAME = 'post-status';
 
 export default function PostSummary( { onActionPerformed } ) {
-	const postType = useSelect(
-		( select ) => select( editorStore ).getCurrentPostType(),
-		[]
-	);
-	if (
-		window?.__experimentalDataFormInspector &&
-		[ 'page', 'post', 'wp_template', 'wp_template_part' ].includes(
-			postType
-		)
-	) {
-		return <DataFormPostSummary onActionPerformed={ onActionPerformed } />;
-	}
-	return <ClassicPostSummary onActionPerformed={ onActionPerformed } />;
-}
-
-function ClassicPostSummary( { onActionPerformed } ) {
 	const { isRemovedPostStatusPanel, postType, postId } = useSelect(
 		( select ) => {
 			// We use isEditorPanelRemoved to hide the panel if it was programmatically removed. We do

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

@@ -37,6 +37,8 @@ import {
 	templateTitleField,
 	pageTitleField,
 	patternTitleField,
+	patternDescriptionField,
+	patternSyncStatusField,
 	notesField,
 	scheduledDateField,
 	lastEditedDateField,
@@ -265,59 +267,59 @@ export const registerPostTypeSchema =
 		if ( postType === ATTACHMENT_POST_TYPE ) {
 			fields = ORDERED_MEDIA_FIELDS;
 		} else {
+			const postTypeSlug = postTypeConfig.slug;
+			const isDesignPostType = DESIGN_POST_TYPES.includes( postTypeSlug );
+			const isPattern = postTypeSlug === 'wp_block';
+
 			fields = [
 				postTypeConfig.supports?.thumbnail &&
 					currentTheme?.theme_supports?.[ 'post-thumbnails' ] &&
 					featuredImageField,
-				! DESIGN_POST_TYPES.includes( postTypeConfig.slug ) &&
+				! isDesignPostType &&
 					postTypeConfig.supports?.author &&
 					authorField,
-				postTypeConfig.slug === 'wp_template' && templateAuthorField,
-				postTypeConfig.slug === 'wp_template_part' &&
-					templatePartAuthorField,
-				! DESIGN_POST_TYPES.includes( postTypeConfig.slug ) &&
-					statusField,
-				! DESIGN_POST_TYPES.includes( postTypeConfig.slug ) &&
-					dateField,
-				! DESIGN_POST_TYPES.includes( postTypeConfig.slug ) &&
-					scheduledDateField,
+				postTypeSlug === 'wp_template' && templateAuthorField,
+				postTypeSlug === 'wp_template_part' && templatePartAuthorField,
+				! isDesignPostType && statusField,
+				! isDesignPostType && dateField,
+				! isDesignPostType && scheduledDateField,
 				lastEditedDateField,
-				! DESIGN_POST_TYPES.includes( postTypeConfig.slug ) &&
-					slugField,
-				! DESIGN_POST_TYPES.includes( postTypeConfig.slug ) &&
+				! isDesignPostType && slugField,
+				! isDesignPostType &&
 					postTypeConfig.supports?.excerpt &&
 					excerptField,
+				isPattern &&
+					postTypeConfig.supports?.excerpt &&
+					patternDescriptionField,
 				postTypeConfig.supports?.[ 'page-attributes' ] && parentField,
 				postTypeConfig.supports?.comments && commentStatusField,
 				postTypeConfig.supports?.trackbacks && pingStatusField,
 				( postTypeConfig.supports?.comments ||
 					postTypeConfig.supports?.trackbacks ) &&
 					discussionField,
-				! DESIGN_POST_TYPES.includes( postTypeConfig.slug ) &&
-					templateField,
+				! isDesignPostType && templateField,
 				postTypeConfig.supports?.[ 'post-formats' ] &&
 					! disablePostFormats &&
 					formatField,
-				! DESIGN_POST_TYPES.includes( postTypeConfig.slug ) &&
+				( ! isDesignPostType || isPattern ) &&
 					postTypeConfig.supports?.editor &&
 					postContentInfoField,
-				! DESIGN_POST_TYPES.includes( postTypeConfig.slug ) &&
-					passwordField,
-				postTypeConfig.slug === 'post' && stickyField,
-				postTypeConfig.slug === 'wp_template' && descriptionField,
-				postTypeConfig.slug === 'wp_template' &&
-					readOnlyDescriptionField,
+				! isDesignPostType && passwordField,
+				postTypeSlug === 'post' && stickyField,
+				postTypeSlug === 'wp_template' && descriptionField,
+				postTypeSlug === 'wp_template' && readOnlyDescriptionField,
 				// The `home`/`index` template summary exposes a few fields that
 				// target other entities (`root/site` and the posts page).
 				// `DataFormPostSummary` overrides them to read/write the right
 				// entity and to control their visibility.
-				postTypeConfig.slug === 'wp_template' && postsPageTitleField,
-				postTypeConfig.slug === 'wp_template' && postsPerPageField,
-				postTypeConfig.slug === 'wp_template' && siteDiscussionField,
+				postTypeSlug === 'wp_template' && postsPageTitleField,
+				postTypeSlug === 'wp_template' && postsPerPageField,
+				postTypeSlug === 'wp_template' && siteDiscussionField,
 				postTypeConfig.supports?.editor &&
 					postTypeConfig.viewable &&
 					postPreviewField,
 				hasEditorNotesSupport( postTypeConfig.supports ) && notesField,
+				isPattern && patternSyncStatusField,
 			].filter( Boolean );
 			if ( postTypeConfig.supports?.title ) {
 				let _titleField;
@@ -325,7 +327,9 @@ export const registerPostTypeSchema =
 					_titleField = pageTitleField;
 				} else if ( postType === 'wp_template' ) {
 					_titleField = templateTitleField;
-				} else if ( postType === 'wp_block' ) {
+				} else if (
+					[ 'wp_block', 'wp_template_part' ].includes( postType )
+				) {
 					_titleField = patternTitleField;
 				} else {
 					_titleField = titleField;

package/src/store/private-actions.js

@@ -209,9 +209,13 @@ export const saveDirtyEntities =
 		registry
 			.dispatch( blockEditorStore )
 			.__unstableMarkLastChangeAsPersistent();
+
 		Promise.all( pendingSavedRecords )
-			.then( ( values ) => {
-				return onSave ? onSave( values ) : values;
+			.then( async ( values ) => {
+				if ( onSave ) {
+					await onSave();
+				}
+				return values;
 			} )
 			.then( ( values ) => {
 				if (