Use blocks in same order as template

packages/edit-site/src/components/block-editor/block-editor-provider/default-block-editor-provider.js

@@ -0,0 +1,94 @@
+/**
+ * WordPress dependencies
+ */
+import { useEntityBlockEditor } from '@wordpress/core-data';
+import {
+	privateApis as blockEditorPrivateApis,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
+import { createBlock } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { store as editSiteStore } from '../../../store';
+import { unlock } from '../../../lock-unlock';
+import useSiteEditorSettings from '../use-site-editor-settings';
+
+const { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );
+
+const noop = () => {};
+
+export default function DefaultBlockEditorProvider( { children } ) {
+	const settings = useSiteEditorSettings();
+
+	const { templateType, pageContentFocusMode } = useSelect( ( select ) => {
+		const { getEditedPostType, getPageContentFocusMode } =
+			select( editSiteStore );
+
+		return {
+			templateType: getEditedPostType(),
+			pageContentFocusMode: getPageContentFocusMode(),
+		};
+	}, [] );
+
+	const [ blocks, onInput, onChange ] = useEntityBlockEditor(
+		'postType',
+		templateType
+	);
+
+	const pageBlocks = usePageBlocks();
+
+	return (
+		<ExperimentalBlockEditorProvider
+			settings={ settings }
+			value={
+				pageContentFocusMode === 'withoutTemplate' ? pageBlocks : blocks
+			}
+			onInput={
+				pageContentFocusMode === 'withoutTemplate' ? noop : onInput
+			}
+			onChange={
+				pageContentFocusMode === 'withoutTemplate' ? noop : onChange
+			}
+			useSubRegistry={ false }
+		>
+			{ children }
+		</ExperimentalBlockEditorProvider>
+	);
+}
+
+function usePageBlocks() {
+	const pageBlockNames = useSelect( ( select ) => {
+		const { __experimentalGetGlobalBlocksByName, getBlockNamesByClientId } =
+			select( blockEditorStore );
+		return getBlockNamesByClientId(
+			__experimentalGetGlobalBlocksByName( [
+				'core/post-title',
+				'core/post-featured-image',
+				'core/post-content',
+			] )
+		);
+	}, [] );
+
+	return useMemo( () => {
+		return [
+			createBlock(
+				'core/group',
+				{
+					layout: { type: 'constrained' },
+					style: {
+						spacing: {
+							margin: {
+								top: '4em',
+							},
+						},
+					},
+				},
+				pageBlockNames.map( ( name ) => createBlock( name ) )
+			),
+		];
+	}, [ pageBlockNames ] );
+}

packages/edit-site/src/components/block-editor/block-editor-provider/index.js

@@ -0,0 +1,28 @@
+/**
+ * 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';
+
+export default function BlockEditorProvider( { children } ) {
+	const entityType = useSelect(
+		( select ) => select( editSiteStore ).getEditedPostType(),
+		[]
+	);
+	if ( entityType === 'wp_navigation' ) {
+		return (
+			<NavigationBlockEditorProvider>
+				{ children }
+			</NavigationBlockEditorProvider>
+		);
+	}
+	return (
+		<DefaultBlockEditorProvider>{ children }</DefaultBlockEditorProvider>
+	);
+}