@wordpress/editor 14.33.2 → 14.33.3

package/src/components/editor/index.js

@@ -13,6 +13,7 @@ import { TEMPLATE_POST_TYPE } from '../../store/constants';
 import EditorInterface from '../editor-interface';
 import { ExperimentalEditorProvider } from '../provider';
 import Sidebar from '../sidebar';
+import NotesSidebar from '../collab-sidebar';
 
 function Editor( {
 	postType,
@@ -86,6 +87,7 @@ function Editor( {
 						{ extraContent }
 					</EditorInterface>
 					{ children }
+					<NotesSidebar />
 					<Sidebar
 						onActionPerformed={ onActionPerformed }
 						extraPanels={ extraSidebarPanels }

package/src/components/header/index.js

@@ -12,7 +12,6 @@ import { PinnedItems } from '@wordpress/interface';
 /**
  * Internal dependencies
  */
-import CollabSidebar from '../collab-sidebar';
 import BackButton, { useHasBackButton } from './back-button';
 import CollapsibleBlockToolbar from '../collapsible-block-toolbar';
 import DocumentBar from '../document-bar';
@@ -24,7 +23,6 @@ import PostSavedState from '../post-saved-state';
 import PostViewLink from '../post-view-link';
 import PreviewDropdown from '../preview-dropdown';
 import ZoomOutToggle from '../zoom-out-toggle';
-import PostTypeSupportCheck from '../post-type-support-check';
 import { store as editorStore } from '../../store';
 import {
 	TEMPLATE_PART_POST_TYPE,
@@ -193,11 +191,6 @@ function Header( {
 						}
 					/>
 				) }
-
-				<PostTypeSupportCheck supportKeys="editor.notes">
-					<CollabSidebar />
-				</PostTypeSupportCheck>
-
 				{ customSaveButton }
 				<MoreMenu />
 			</motion.div>

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

@@ -52,57 +52,16 @@ export function useAllowSwitchingTemplates() {
 }
 
 function useTemplates( postType ) {
-	// To do: create a new selector to checks if templates exist at all instead
-	// of and unbound request. In the modal, the user templates should be
-	// paginated and we should not make an unbound request.
-	const { defaultTemplateTypes, registeredTemplates, userTemplates } =
-		useSelect(
-			( select ) => {
-				return {
-					defaultTemplateTypes:
-						select( coreStore ).getCurrentTheme()
-							?.default_template_types,
-					registeredTemplates: select( coreStore ).getEntityRecords(
-						'postType',
-						'wp_registered_template',
-						{
-							per_page: -1,
-							post_type: postType,
-						}
-					),
-					userTemplates: select( coreStore ).getEntityRecords(
-						'postType',
-						'wp_template',
-						{ per_page: -1, combinedTemplates: false }
-					),
-				};
-			},
-			[ postType ]
-		);
-
-	return useMemo( () => {
-		if (
-			! defaultTemplateTypes ||
-			! registeredTemplates ||
-			! userTemplates
-		) {
-			return [];
-		}
-		return [
-			...registeredTemplates,
-			...userTemplates.filter(
-				( template ) =>
-					// Only give "custom" templates as an option, which
-					// means the is_wp_suggestion meta field is not set and
-					// the slug is not found in the default template types.
-					// https://github.com/WordPress/wordpress-develop/blob/97382397b2bd7c85aef6d4cd1c10bafd397957fc/src/wp-includes/block-template-utils.php#L858-L867
-					! template.meta.is_wp_suggestion &&
-					! defaultTemplateTypes.find(
-						( type ) => type.slug === template.slug
-					)
-			),
-		];
-	}, [ registeredTemplates, userTemplates, defaultTemplateTypes ] );
+	return useSelect(
+		( select ) =>
+			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 ]
+	);
 }
 
 export function useAvailableTemplates( postType ) {

package/src/components/provider/index.js

@@ -220,10 +220,7 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 		const defaultBlockContext = useMemo( () => {
 			const postContext = {};
 			// If it is a template, try to inherit the post type from the name.
-			if (
-				post.type === 'wp_template' ||
-				post.type === 'wp_registered_template'
-			) {
+			if ( post.type === 'wp_template' ) {
 				if ( post.slug === 'page' ) {
 					postContext.postType = 'page';
 				} else if ( post.slug === 'single' ) {

package/src/store/actions.js

@@ -734,7 +734,10 @@ export function updateEditorSettings( settings ) {
 export const setRenderingMode =
 	( mode ) =>
 	( { dispatch, registry, select } ) => {
-		if ( select.__unstableIsEditorReady() ) {
+		if (
+			select.__unstableIsEditorReady() &&
+			! select.getEditorSettings().isPreviewMode
+		) {
 			// 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 } );