@wordpress/edit-site 5.19.0 → 5.19.2

package/build-module/utils/template-part-create.js.map

@@ -1 +1 @@
-{"version":3,"names":["paramCase","kebabCase","useSelect","store","coreStore","useExistingTemplateParts","select","getEntityRecords","per_page","getUniqueTemplatePartTitle","title","templateParts","lowercaseTitle","toLowerCase","existingTitles","map","templatePart","rendered","includes","suffix","getCleanTemplatePartSlug","replace"],"sources":["@wordpress/edit-site/src/utils/template-part-create.js"],"sourcesContent":["/**\n * External dependencies\n */\nimport { paramCase as kebabCase } from 'change-case';\n\n/**\n * WordPress dependencies\n */\nimport { useSelect } from '@wordpress/data';\nimport { store as coreStore } from '@wordpress/core-data';\n\nexport const useExistingTemplateParts = () => {\n\treturn useSelect(\n\t\t( select ) =>\n\t\t\tselect( coreStore ).getEntityRecords(\n\t\t\t\t'postType',\n\t\t\t\t'wp_template_part',\n\t\t\t\t{\n\t\t\t\t\tper_page: -1,\n\t\t\t\t}\n\t\t\t),\n\t\t[]\n\t);\n};\n\n/**\n * Return a unique template part title based on\n * the given title and existing template parts.\n *\n * @param {string} title         The original template part title.\n * @param {Object} templateParts The array of template part entities.\n * @return {string} A unique template part title.\n */\nexport const getUniqueTemplatePartTitle = ( title, templateParts ) => {\n\tconst lowercaseTitle = title.toLowerCase();\n\tconst existingTitles = templateParts.map( ( templatePart ) =>\n\t\ttemplatePart.title.rendered.toLowerCase()\n\t);\n\n\tif ( ! existingTitles.includes( lowercaseTitle ) ) {\n\t\treturn title;\n\t}\n\n\tlet suffix = 2;\n\twhile ( existingTitles.includes( `${ lowercaseTitle } ${ suffix }` ) ) {\n\t\tsuffix++;\n\t}\n\n\treturn `${ title } ${ suffix }`;\n};\n\n/**\n * Get a valid slug for a template part.\n * Currently template parts only allow latin chars.\n * The fallback slug will receive suffix by default.\n *\n * @param {string} title The template part title.\n * @return {string} A valid template part slug.\n */\nexport const getCleanTemplatePartSlug = ( title ) => {\n\treturn kebabCase( title ).replace( /[^\\w-]+/g, '' ) || 'wp-custom-part';\n};\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,SAAS,IAAIC,SAAS,QAAQ,aAAa;;AAEpD;AACA;AACA;AACA,SAASC,SAAS,QAAQ,iBAAiB;AAC3C,SAASC,KAAK,IAAIC,SAAS,QAAQ,sBAAsB;AAEzD,OAAO,MAAMC,wBAAwB,GAAGA,CAAA,KAAM;EAC7C,OAAOH,SAAS,CACbI,MAAM,IACPA,MAAM,CAAEF,SAAU,CAAC,CAACG,gBAAgB,CACnC,UAAU,EACV,kBAAkB,EAClB;IACCC,QAAQ,EAAE,CAAC;EACZ,CACD,CAAC,EACF,EACD,CAAC;AACF,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,0BAA0B,GAAGA,CAAEC,KAAK,EAAEC,aAAa,KAAM;EACrE,MAAMC,cAAc,GAAGF,KAAK,CAACG,WAAW,CAAC,CAAC;EAC1C,MAAMC,cAAc,GAAGH,aAAa,CAACI,GAAG,CAAIC,YAAY,IACvDA,YAAY,CAACN,KAAK,CAACO,QAAQ,CAACJ,WAAW,CAAC,CACzC,CAAC;EAED,IAAK,CAAEC,cAAc,CAACI,QAAQ,CAAEN,cAAe,CAAC,EAAG;IAClD,OAAOF,KAAK;EACb;EAEA,IAAIS,MAAM,GAAG,CAAC;EACd,OAAQL,cAAc,CAACI,QAAQ,CAAG,GAAGN,cAAgB,IAAIO,MAAQ,EAAE,CAAC,EAAG;IACtEA,MAAM,EAAE;EACT;EAEA,OAAQ,GAAGT,KAAO,IAAIS,MAAQ,EAAC;AAChC,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,wBAAwB,GAAKV,KAAK,IAAM;EACpD,OAAOT,SAAS,CAAES,KAAM,CAAC,CAACW,OAAO,CAAE,UAAU,EAAE,EAAG,CAAC,IAAI,gBAAgB;AACxE,CAAC"}
+{"version":3,"names":["paramCase","kebabCase","useSelect","store","coreStore","TEMPLATE_PART_POST_TYPE","useExistingTemplateParts","select","getEntityRecords","per_page","getUniqueTemplatePartTitle","title","templateParts","lowercaseTitle","toLowerCase","existingTitles","map","templatePart","rendered","includes","suffix","getCleanTemplatePartSlug","replace"],"sources":["@wordpress/edit-site/src/utils/template-part-create.js"],"sourcesContent":["/**\n * External dependencies\n */\nimport { paramCase as kebabCase } from 'change-case';\n\n/**\n * WordPress dependencies\n */\nimport { useSelect } from '@wordpress/data';\nimport { store as coreStore } from '@wordpress/core-data';\n\n/**\n * Internal dependencies\n */\nimport { TEMPLATE_PART_POST_TYPE } from './constants';\n\nexport const useExistingTemplateParts = () => {\n\treturn useSelect(\n\t\t( select ) =>\n\t\t\tselect( coreStore ).getEntityRecords(\n\t\t\t\t'postType',\n\t\t\t\tTEMPLATE_PART_POST_TYPE,\n\t\t\t\t{\n\t\t\t\t\tper_page: -1,\n\t\t\t\t}\n\t\t\t),\n\t\t[]\n\t);\n};\n\n/**\n * Return a unique template part title based on\n * the given title and existing template parts.\n *\n * @param {string} title         The original template part title.\n * @param {Object} templateParts The array of template part entities.\n * @return {string} A unique template part title.\n */\nexport const getUniqueTemplatePartTitle = ( title, templateParts ) => {\n\tconst lowercaseTitle = title.toLowerCase();\n\tconst existingTitles = templateParts.map( ( templatePart ) =>\n\t\ttemplatePart.title.rendered.toLowerCase()\n\t);\n\n\tif ( ! existingTitles.includes( lowercaseTitle ) ) {\n\t\treturn title;\n\t}\n\n\tlet suffix = 2;\n\twhile ( existingTitles.includes( `${ lowercaseTitle } ${ suffix }` ) ) {\n\t\tsuffix++;\n\t}\n\n\treturn `${ title } ${ suffix }`;\n};\n\n/**\n * Get a valid slug for a template part.\n * Currently template parts only allow latin chars.\n * The fallback slug will receive suffix by default.\n *\n * @param {string} title The template part title.\n * @return {string} A valid template part slug.\n */\nexport const getCleanTemplatePartSlug = ( title ) => {\n\treturn kebabCase( title ).replace( /[^\\w-]+/g, '' ) || 'wp-custom-part';\n};\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,SAAS,IAAIC,SAAS,QAAQ,aAAa;;AAEpD;AACA;AACA;AACA,SAASC,SAAS,QAAQ,iBAAiB;AAC3C,SAASC,KAAK,IAAIC,SAAS,QAAQ,sBAAsB;;AAEzD;AACA;AACA;AACA,SAASC,uBAAuB,QAAQ,aAAa;AAErD,OAAO,MAAMC,wBAAwB,GAAGA,CAAA,KAAM;EAC7C,OAAOJ,SAAS,CACbK,MAAM,IACPA,MAAM,CAAEH,SAAU,CAAC,CAACI,gBAAgB,CACnC,UAAU,EACVH,uBAAuB,EACvB;IACCI,QAAQ,EAAE,CAAC;EACZ,CACD,CAAC,EACF,EACD,CAAC;AACF,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,0BAA0B,GAAGA,CAAEC,KAAK,EAAEC,aAAa,KAAM;EACrE,MAAMC,cAAc,GAAGF,KAAK,CAACG,WAAW,CAAC,CAAC;EAC1C,MAAMC,cAAc,GAAGH,aAAa,CAACI,GAAG,CAAIC,YAAY,IACvDA,YAAY,CAACN,KAAK,CAACO,QAAQ,CAACJ,WAAW,CAAC,CACzC,CAAC;EAED,IAAK,CAAEC,cAAc,CAACI,QAAQ,CAAEN,cAAe,CAAC,EAAG;IAClD,OAAOF,KAAK;EACb;EAEA,IAAIS,MAAM,GAAG,CAAC;EACd,OAAQL,cAAc,CAACI,QAAQ,CAAG,GAAGN,cAAgB,IAAIO,MAAQ,EAAE,CAAC,EAAG;IACtEA,MAAM,EAAE;EACT;EAEA,OAAQ,GAAGT,KAAO,IAAIS,MAAQ,EAAC;AAChC,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,wBAAwB,GAAKV,KAAK,IAAM;EACpD,OAAOV,SAAS,CAAEU,KAAM,CAAC,CAACW,OAAO,CAAE,UAAU,EAAE,EAAG,CAAC,IAAI,gBAAgB;AACxE,CAAC"}

package/build-style/style-rtl.css

@@ -2321,6 +2321,10 @@ body.is-fullscreen-mode .edit-site-list-header {
   width: 30%;
 }
 
+.edit-site-page-panels-edit-template__dropdown .components-popover__content {
+  min-width: 240px;
+}
+
 .components-panel__header.edit-site-sidebar-edit-mode__panel-tabs {
   justify-content: flex-start;
   padding-right: 0;
@@ -3807,6 +3811,11 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
   width: 100%;
 }
 
+@media (min-width: 782px) {
+  .font-library-modal.font-library-modal {
+    width: 65vw;
+  }
+}
 .font-library-modal .components-modal__header {
   border-bottom: none;
 }
@@ -3907,6 +3916,20 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
   background: linear-gradient(to left, rgba(255, 255, 255, 0), white);
 }
 
+.font-library__google-fonts-confirm {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.font-library__google-fonts-confirm h3 {
+  font-size: 1.4rem;
+}
+.font-library__google-fonts-confirm .components-card {
+  width: 50%;
+  min-width: 250px;
+  max-width: 350px;
+}
+
 body.js #wpadminbar {
   display: none;
 }

package/build-style/style.css

@@ -2322,6 +2322,10 @@ body.is-fullscreen-mode .edit-site-list-header {
   width: 30%;
 }
 
+.edit-site-page-panels-edit-template__dropdown .components-popover__content {
+  min-width: 240px;
+}
+
 .components-panel__header.edit-site-sidebar-edit-mode__panel-tabs {
   justify-content: flex-start;
   padding-left: 0;
@@ -3808,6 +3812,11 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
   width: 100%;
 }
 
+@media (min-width: 782px) {
+  .font-library-modal.font-library-modal {
+    width: 65vw;
+  }
+}
 .font-library-modal .components-modal__header {
   border-bottom: none;
 }
@@ -3908,6 +3917,20 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
   background: linear-gradient(to right, rgba(255, 255, 255, 0), white);
 }
 
+.font-library__google-fonts-confirm {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.font-library__google-fonts-confirm h3 {
+  font-size: 1.4rem;
+}
+.font-library__google-fonts-confirm .components-card {
+  width: 50%;
+  min-width: 250px;
+  max-width: 350px;
+}
+
 body.js #wpadminbar {
   display: none;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.19.0",
+	"version": "5.19.2",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,44 +27,44 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.42.0",
-		"@wordpress/api-fetch": "^6.39.0",
-		"@wordpress/block-editor": "^12.10.0",
-		"@wordpress/block-library": "^8.19.0",
-		"@wordpress/blocks": "^12.19.0",
-		"@wordpress/commands": "^0.13.0",
-		"@wordpress/components": "^25.8.0",
-		"@wordpress/compose": "^6.19.0",
-		"@wordpress/core-commands": "^0.11.0",
-		"@wordpress/core-data": "^6.19.0",
-		"@wordpress/data": "^9.12.0",
-		"@wordpress/date": "^4.42.0",
-		"@wordpress/deprecated": "^3.42.0",
-		"@wordpress/dom": "^3.42.0",
-		"@wordpress/editor": "^13.19.0",
-		"@wordpress/element": "^5.19.0",
-		"@wordpress/escape-html": "^2.42.0",
-		"@wordpress/hooks": "^3.42.0",
-		"@wordpress/html-entities": "^3.42.0",
-		"@wordpress/i18n": "^4.42.0",
-		"@wordpress/icons": "^9.33.0",
-		"@wordpress/interface": "^5.19.0",
-		"@wordpress/keyboard-shortcuts": "^4.19.0",
-		"@wordpress/keycodes": "^3.42.0",
-		"@wordpress/media-utils": "^4.33.0",
-		"@wordpress/notices": "^4.10.0",
-		"@wordpress/patterns": "^1.3.0",
-		"@wordpress/plugins": "^6.10.0",
-		"@wordpress/preferences": "^3.19.0",
-		"@wordpress/primitives": "^3.40.0",
-		"@wordpress/private-apis": "^0.24.0",
-		"@wordpress/reusable-blocks": "^4.19.0",
-		"@wordpress/router": "^0.11.0",
-		"@wordpress/style-engine": "^1.25.0",
-		"@wordpress/url": "^3.43.0",
-		"@wordpress/viewport": "^5.19.0",
-		"@wordpress/widgets": "^3.19.0",
-		"@wordpress/wordcount": "^3.42.0",
+		"@wordpress/a11y": "^3.42.2",
+		"@wordpress/api-fetch": "^6.39.2",
+		"@wordpress/block-editor": "^12.10.2",
+		"@wordpress/block-library": "^8.19.2",
+		"@wordpress/blocks": "^12.19.2",
+		"@wordpress/commands": "^0.13.2",
+		"@wordpress/components": "^25.8.2",
+		"@wordpress/compose": "^6.19.2",
+		"@wordpress/core-commands": "^0.11.2",
+		"@wordpress/core-data": "^6.19.2",
+		"@wordpress/data": "^9.12.2",
+		"@wordpress/date": "^4.42.2",
+		"@wordpress/deprecated": "^3.42.2",
+		"@wordpress/dom": "^3.42.2",
+		"@wordpress/editor": "^13.19.2",
+		"@wordpress/element": "^5.19.2",
+		"@wordpress/escape-html": "^2.42.2",
+		"@wordpress/hooks": "^3.42.2",
+		"@wordpress/html-entities": "^3.42.2",
+		"@wordpress/i18n": "^4.42.2",
+		"@wordpress/icons": "^9.33.2",
+		"@wordpress/interface": "^5.19.2",
+		"@wordpress/keyboard-shortcuts": "^4.19.2",
+		"@wordpress/keycodes": "^3.42.2",
+		"@wordpress/media-utils": "^4.33.2",
+		"@wordpress/notices": "^4.10.2",
+		"@wordpress/patterns": "^1.3.2",
+		"@wordpress/plugins": "^6.10.2",
+		"@wordpress/preferences": "^3.19.2",
+		"@wordpress/primitives": "^3.40.2",
+		"@wordpress/private-apis": "^0.24.2",
+		"@wordpress/reusable-blocks": "^4.19.2",
+		"@wordpress/router": "^0.11.2",
+		"@wordpress/style-engine": "^1.25.2",
+		"@wordpress/url": "^3.43.2",
+		"@wordpress/viewport": "^5.19.2",
+		"@wordpress/widgets": "^3.19.2",
+		"@wordpress/wordcount": "^3.42.2",
 		"change-case": "^4.1.2",
 		"classnames": "^2.3.1",
 		"colord": "^2.9.2",
@@ -84,5 +84,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "cc35f517ed017ab7131319af3e87c359e8de175d"
+	"gitHead": "5d2e3d07cc97af8090fc32c1e5d5013a2967e752"
 }

package/src/components/add-new-pattern/index.js

@@ -51,8 +51,8 @@ export default function AddNewPattern() {
 
 		history.push( {
 			postId: pattern.id,
-			postType: 'wp_block',
-			categoryType: 'wp_block',
+			postType: PATTERN_TYPES.user,
+			categoryType: PATTERN_TYPES.user,
 			categoryId,
 			canvas: 'edit',
 		} );
@@ -64,7 +64,7 @@ export default function AddNewPattern() {
 		// Navigate to the created template part editor.
 		history.push( {
 			postId: templatePart.id,
-			postType: 'wp_template_part',
+			postType: TEMPLATE_PART_POST_TYPE,
 			canvas: 'edit',
 		} );
 	}

package/src/components/block-editor/block-editor-provider/default-block-editor-provider.js

@@ -0,0 +1,70 @@
+/**
+ * WordPress dependencies
+ */
+import { useEntityBlockEditor } from '@wordpress/core-data';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { store as editSiteStore } from '../../../store';
+import { unlock } from '../../../lock-unlock';
+import useSiteEditorSettings from '../use-site-editor-settings';
+import usePageContentBlocks from './use-page-content-blocks';
+
+const { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );
+
+const noop = () => {};
+
+/**
+ * The default block editor provider for the site editor. Typically used when
+ * the post type is `'wp_template_part'` or `'wp_template'` and allows editing
+ * of the template and its nested entities.
+ *
+ * If the page content focus type is `'hideTemplate'`, the provider will provide
+ * a set of page content blocks wrapped in a container that, together,
+ * mimic the look and feel of the post editor and
+ * allow editing of the page content only.
+ *
+ * @param {Object}    props
+ * @param {WPElement} props.children
+ */
+export default function DefaultBlockEditorProvider( { children } ) {
+	const settings = useSiteEditorSettings();
+
+	const { templateType, isTemplateHidden } = useSelect( ( select ) => {
+		const { getEditedPostType } = select( editSiteStore );
+		const { getPageContentFocusType, getCanvasMode } = unlock(
+			select( editSiteStore )
+		);
+		return {
+			templateType: getEditedPostType(),
+			isTemplateHidden:
+				getCanvasMode() === 'edit' &&
+				getPageContentFocusType() === 'hideTemplate',
+			canvasMode: unlock( select( editSiteStore ) ).getCanvasMode(),
+		};
+	}, [] );
+
+	const [ blocks, onInput, onChange ] = useEntityBlockEditor(
+		'postType',
+		templateType
+	);
+	const pageContentBlock = usePageContentBlocks( blocks, isTemplateHidden );
+	return (
+		<ExperimentalBlockEditorProvider
+			settings={ settings }
+			value={
+				isTemplateHidden && pageContentBlock.length
+					? pageContentBlock
+					: blocks
+			}
+			onInput={ isTemplateHidden ? noop : onInput }
+			onChange={ isTemplateHidden ? noop : onChange }
+			useSubRegistry={ false }
+		>
+			{ children }
+		</ExperimentalBlockEditorProvider>
+	);
+}

package/src/components/block-editor/block-editor-provider/index.js

@@ -0,0 +1,29 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { store as editSiteStore } from '../../../store';
+import DefaultBlockEditorProvider from './default-block-editor-provider';
+import NavigationBlockEditorProvider from './navigation-block-editor-provider';
+import { NAVIGATION_POST_TYPE } from '../../../utils/constants';
+
+export default function BlockEditorProvider( { children } ) {
+	const entityType = useSelect(
+		( select ) => select( editSiteStore ).getEditedPostType(),
+		[]
+	);
+	if ( entityType === NAVIGATION_POST_TYPE ) {
+		return (
+			<NavigationBlockEditorProvider>
+				{ children }
+			</NavigationBlockEditorProvider>
+		);
+	}
+	return (
+		<DefaultBlockEditorProvider>{ children }</DefaultBlockEditorProvider>
+	);
+}

package/src/components/block-editor/{providers → block-editor-provider}/navigation-block-editor-provider.js

@@ -16,6 +16,7 @@ import { createBlock } from '@wordpress/blocks';
 import { unlock } from '../../../lock-unlock';
 import useSiteEditorSettings from '../use-site-editor-settings';
 import { store as editSiteStore } from '../../../store';
+import { NAVIGATION_POST_TYPE } from '../../../utils/constants';
 
 const { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );
 
@@ -37,7 +38,7 @@ const noop = () => {};
 export default function NavigationBlockEditorProvider( { children } ) {
 	const defaultSettings = useSiteEditorSettings();
 
-	const navigationMenuId = useEntityId( 'postType', 'wp_navigation' );
+	const navigationMenuId = useEntityId( 'postType', NAVIGATION_POST_TYPE );
 
 	const blocks = useMemo( () => {
 		return [

package/src/components/block-editor/block-editor-provider/test/use-page-content-blocks.js

@@ -0,0 +1,87 @@
+/**
+ * External dependencies
+ */
+import { renderHook } from '@testing-library/react';
+/**
+ * WordPress dependencies
+ */
+import { createBlock } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import usePageContentBlocks from '../use-page-content-blocks';
+
+jest.mock( '@wordpress/blocks', () => {
+	return {
+		__esModule: true,
+		...jest.requireActual( '@wordpress/blocks' ),
+		createBlock( name, attributes = {}, innerBlocks = [] ) {
+			return {
+				name,
+				attributes,
+				innerBlocks,
+			};
+		},
+	};
+} );
+
+describe( 'usePageContentBlocks', () => {
+	const blocksList = [
+		createBlock( 'core/group', {}, [
+			createBlock( 'core/post-title' ),
+			createBlock( 'core/post-featured-image' ),
+			createBlock( 'core/query', {}, [
+				createBlock( 'core/post-title' ),
+				createBlock( 'core/post-featured-image' ),
+				createBlock( 'core/post-content' ),
+			] ),
+			createBlock( 'core/post-content' ),
+		] ),
+		createBlock( 'core/query' ),
+		createBlock( 'core/paragraph' ),
+		createBlock( 'core/post-content' ),
+	];
+	it( 'should return empty array if `isPageContentFocused` is `false`', () => {
+		const { result } = renderHook( () =>
+			usePageContentBlocks( blocksList, false )
+		);
+		expect( result.current ).toEqual( [] );
+	} );
+	it( 'should return empty array if `blocks` is undefined', () => {
+		const { result } = renderHook( () =>
+			usePageContentBlocks( undefined, true )
+		);
+		expect( result.current ).toEqual( [] );
+	} );
+	it( 'should return empty array if `blocks` is an empty array', () => {
+		const { result } = renderHook( () => usePageContentBlocks( [], true ) );
+		expect( result.current ).toEqual( [] );
+	} );
+	it( 'should return new block list', () => {
+		const { result } = renderHook( () =>
+			usePageContentBlocks( blocksList, true )
+		);
+		expect( result.current ).toEqual( [
+			{
+				name: 'core/group',
+				attributes: {
+					layout: { type: 'constrained' },
+					style: {
+						spacing: {
+							margin: {
+								top: '4em', // Mimics the post editor.
+							},
+						},
+					},
+				},
+				innerBlocks: [
+					createBlock( 'core/post-title' ),
+					createBlock( 'core/post-featured-image' ),
+					createBlock( 'core/post-content' ),
+					createBlock( 'core/post-content' ),
+				],
+			},
+		] );
+	} );
+} );

package/src/components/block-editor/block-editor-provider/use-page-content-blocks.js

@@ -0,0 +1,77 @@
+/**
+ * WordPress dependencies
+ */
+import { useMemo } from '@wordpress/element';
+import { createBlock } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { PAGE_CONTENT_BLOCK_TYPES } from '../../../utils/constants';
+
+/**
+ * Helper method to iterate through all blocks, recursing into allowed inner blocks.
+ * Returns a flattened object of transformed blocks.
+ *
+ * @param {Array}    blocks    Blocks to flatten.
+ * @param {Function} transform Transforming function to be applied to each block. If transform returns `undefined`, the block is skipped.
+ *
+ * @return {Array} Flattened object.
+ */
+function flattenBlocks( blocks, transform ) {
+	const result = [];
+	for ( let i = 0; i < blocks.length; i++ ) {
+		// Since the Query Block could contain PAGE_CONTENT_BLOCK_TYPES block types,
+		// we skip it because we only want to render stand-alone page content blocks in the block list.
+		if ( [ 'core/query' ].includes( blocks[ i ].name ) ) {
+			continue;
+		}
+		const transformedBlock = transform( blocks[ i ] );
+		if ( transformedBlock ) {
+			result.push( transformedBlock );
+		}
+		result.push( ...flattenBlocks( blocks[ i ].innerBlocks, transform ) );
+	}
+
+	return result;
+}
+
+/**
+ * Returns a memoized array of blocks that contain only page content blocks,
+ * surrounded by a group block to mimic the post editor.
+ *
+ * @param {Array}   blocks               Block list.
+ * @param {boolean} isPageContentFocused Whether the page content has focus. If `true` return page content blocks. Default `false`.
+ *
+ * @return {Array} Page content blocks.
+ */
+export default function usePageContentBlocks(
+	blocks,
+	isPageContentFocused = false
+) {
+	return useMemo( () => {
+		if ( ! isPageContentFocused || ! blocks || ! blocks.length ) {
+			return [];
+		}
+		return [
+			createBlock(
+				'core/group',
+				{
+					layout: { type: 'constrained' },
+					style: {
+						spacing: {
+							margin: {
+								top: '4em', // Mimics the post editor.
+							},
+						},
+					},
+				},
+				flattenBlocks( blocks, ( block ) => {
+					if ( PAGE_CONTENT_BLOCK_TYPES[ block.name ] ) {
+						return createBlock( block.name );
+					}
+				} )
+			),
+		];
+	}, [ blocks, isPageContentFocused ] );
+}

package/src/components/block-editor/index.js

@@ -1,7 +1,6 @@
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
 import { BlockInspector } from '@wordpress/block-editor';
 import { privateApis as editPatternsPrivateApis } from '@wordpress/patterns';
 
@@ -10,31 +9,19 @@ import { privateApis as editPatternsPrivateApis } from '@wordpress/patterns';
  */
 import TemplatePartConverter from '../template-part-converter';
 import { SidebarInspectorFill } from '../sidebar-edit-mode';
-import { store as editSiteStore } from '../../store';
 import SiteEditorCanvas from './site-editor-canvas';
-import getBlockEditorProvider from './get-block-editor-provider';
+import BlockEditorProvider from './block-editor-provider';
 
 import { unlock } from '../../lock-unlock';
 const { PatternsMenuItems } = unlock( editPatternsPrivateApis );
 export default function BlockEditor() {
-	const entityType = useSelect(
-		( select ) => select( editSiteStore ).getEditedPostType(),
-		[]
-	);
-
-	// Choose the provider based on the entity type currently
-	// being edited.
-	const BlockEditorProvider = getBlockEditorProvider( entityType );
-
 	return (
 		<BlockEditorProvider>
 			<TemplatePartConverter />
 			<SidebarInspectorFill>
 				<BlockInspector />
 			</SidebarInspectorFill>
-
 			<SiteEditorCanvas />
-
 			<PatternsMenuItems />
 		</BlockEditorProvider>
 	);

package/src/components/block-editor/site-editor-canvas.js

@@ -22,7 +22,10 @@ import EditorCanvas from './editor-canvas';
 import EditorCanvasContainer from '../editor-canvas-container';
 import useSiteEditorSettings from './use-site-editor-settings';
 import { store as editSiteStore } from '../../store';
-import { FOCUSABLE_ENTITIES } from '../../utils/constants';
+import {
+	FOCUSABLE_ENTITIES,
+	NAVIGATION_POST_TYPE,
+} from '../../utils/constants';
 import { unlock } from '../../lock-unlock';
 import PageContentFocusManager from '../page-content-focus-manager';
 
@@ -71,7 +74,7 @@ export default function SiteEditorCanvas() {
 		! isMobileViewport;
 
 	const contentRef = useRef();
-	const isTemplateTypeNavigation = templateType === 'wp_navigation';
+	const isTemplateTypeNavigation = templateType === NAVIGATION_POST_TYPE;
 
 	const isNavigationFocusMode = isTemplateTypeNavigation && isFocusMode;
 

package/src/components/create-template-part-modal/index.js

@@ -28,7 +28,10 @@ import { serialize } from '@wordpress/blocks';
 /**
  * Internal dependencies
  */
-import { TEMPLATE_PART_AREA_GENERAL } from '../../store/constants';
+import {
+	TEMPLATE_PART_POST_TYPE,
+	TEMPLATE_PART_AREA_DEFAULT_CATEGORY,
+} from '../../utils/constants';
 import {
 	useExistingTemplateParts,
 	getUniqueTemplatePartTitle,
@@ -46,7 +49,7 @@ export default function CreateTemplatePartModal( {
 	const existingTemplateParts = useExistingTemplateParts();
 
 	const [ title, setTitle ] = useState( '' );
-	const [ area, setArea ] = useState( TEMPLATE_PART_AREA_GENERAL );
+	const [ area, setArea ] = useState( TEMPLATE_PART_AREA_DEFAULT_CATEGORY );
 	const [ isSubmitting, setIsSubmitting ] = useState( false );
 	const instanceId = useInstanceId( CreateTemplatePartModal );
 
@@ -57,14 +60,12 @@ export default function CreateTemplatePartModal( {
 	);
 
 	async function createTemplatePart() {
-		if ( ! title ) {
-			createErrorNotice( __( 'Please enter a title.' ), {
-				type: 'snackbar',
-			} );
+		if ( ! title || isSubmitting ) {
 			return;
 		}
 
 		try {
+			setIsSubmitting( true );
 			const uniqueTitle = getUniqueTemplatePartTitle(
 				title,
 				existingTemplateParts
@@ -73,7 +74,7 @@ export default function CreateTemplatePartModal( {
 
 			const templatePart = await saveEntityRecord(
 				'postType',
-				'wp_template_part',
+				TEMPLATE_PART_POST_TYPE,
 				{
 					slug: cleanSlug,
 					title: uniqueTitle,
@@ -96,6 +97,8 @@ export default function CreateTemplatePartModal( {
 			createErrorNotice( errorMessage, { type: 'snackbar' } );
 
 			onError?.();
+		} finally {
+			setIsSubmitting( false );
 		}
 	}
 
@@ -108,10 +111,6 @@ export default function CreateTemplatePartModal( {
 			<form
 				onSubmit={ async ( event ) => {
 					event.preventDefault();
-					if ( ! title ) {
-						return;
-					}
-					setIsSubmitting( true );
 					await createTemplatePart();
 				} }
 			>
@@ -179,7 +178,7 @@ export default function CreateTemplatePartModal( {
 						<Button
 							variant="primary"
 							type="submit"
-							disabled={ ! title }
+							aria-disabled={ ! title || isSubmitting }
 							isBusy={ isSubmitting }
 						>
 							{ __( 'Create' ) }

package/src/components/editor/index.js

@@ -71,7 +71,7 @@ const blockRemovalRules = {
 	),
 };
 
-export default function Editor( { isLoading } ) {
+export default function Editor( { listViewToggleElement, isLoading } ) {
 	const {
 		record: editedPost,
 		getTitle,
@@ -247,7 +247,11 @@ export default function Editor( { isLoading } ) {
 									<InserterSidebar />
 								) ) ||
 									( shouldShowListView && (
-										<ListViewSidebar />
+										<ListViewSidebar
+											listViewToggleElement={
+												listViewToggleElement
+											}
+										/>
 									) ) )
 							}
 							sidebar={