Editor: Implement the EntityHandlers component and basic template blocks.

docs/designers-developers/developers/data/data-core-editor.md

@@ -192,6 +192,8 @@ _Related_
 
 <a name="getBlocksForSerialization" href="#getBlocksForSerialization">#</a> **getBlocksForSerialization**
 
+> **Deprecated** since Gutenberg 6.2.0.
+
 Returns a set of blocks which are to be used in consideration of the post's
 generated save content.
 
@@ -215,6 +217,19 @@ _Related_
 
 -   getClientIdsWithDescendants in core/block-editor store.
 
+<a name="getCurrentEntityAttribute" href="#getCurrentEntityAttribute">#</a> **getCurrentEntityAttribute**
+
+Returns an attribute value of the saved entity.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+-   _attributeName_ `string`: Entity attribute name.
+
+_Returns_
+
+-   `*`: Entity attribute value.
+
 <a name="getCurrentPost" href="#getCurrentPost">#</a> **getCurrentPost**
 
 Returns the post currently being edited in its last known saved state, not
@@ -292,6 +307,21 @@ _Returns_
 
 -   `string`: Post type.
 
+<a name="getEditedEntityAttribute" href="#getEditedEntityAttribute">#</a> **getEditedEntityAttribute**
+
+Returns a single attribute of the entity being edited, preferring the unsaved
+edit if one exists, but falling back to the attribute for the last known
+saved state of the entity.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+-   _attributeName_ `string`: Entity attribute name.
+
+_Returns_
+
+-   `*`: Entity attribute value.
+
 <a name="getEditedPostAttribute" href="#getEditedPostAttribute">#</a> **getEditedPostAttribute**
 
 Returns a single attribute of the post being edited, preferring the unsaved
@@ -309,8 +339,7 @@ _Returns_
 
 <a name="getEditedPostContent" href="#getEditedPostContent">#</a> **getEditedPostContent**
 
-Returns the content of the post being edited, preferring raw string edit
-before falling back to serialization of block state.
+Returns the content of the post being edited.
 
 _Parameters_
 
@@ -382,6 +411,22 @@ _Related_
 
 -   getGlobalBlockCount in core/block-editor store.
 
+<a name="getHandlesFilteredEdits" href="#getHandlesFilteredEdits">#</a> **getHandlesFilteredEdits**
+
+Returns an object with the edits broken down into a
+handled edits object, an edits object that should
+be delegated to a parent editor, and the parent's
+dispatching function, if any.
+
+_Parameters_
+
+-   _state_ `Object`: Editor state.
+-   _\_edits_ `Object`: The edits, defaults to all of the entity's current edits.
+
+_Returns_
+
+-   `Object`: The object with the grouped edits and the parent's dispatching function.
+
 <a name="getInserterItems" href="#getInserterItems">#</a> **getInserterItems**
 
 _Related_
@@ -740,6 +785,7 @@ Return true if the current post has already been published.
 _Parameters_
 
 -   _state_ `Object`: Global application state.
+-   _currentPost_ `?Object`: Explicit current post for bypassing registry selector.
 
 _Returns_
 
@@ -1032,18 +1078,23 @@ _Returns_
 
 -   `Object`: Action object
 
-<a name="editPost" href="#editPost">#</a> **editPost**
+<a name="editEntity" href="#editEntity">#</a> **editEntity**
 
-Returns an action object used in signalling that attributes of the post have
+Yields an action object used in signalling that attributes of the entity have
 been edited.
 
 _Parameters_
 
--   _edits_ `Object`: Post attributes to edit.
+-   _edits_ `Object`: Entity attributes to edit.
 
-_Returns_
+<a name="editPost" href="#editPost">#</a> **editPost**
 
--   `Object`: Action object.
+Yields an action object used in signalling that attributes of the post have
+been edited.
+
+_Parameters_
+
+-   _edits_ `Object`: Post attributes to edit.
 
 <a name="enablePublishSidebar" href="#enablePublishSidebar">#</a> **enablePublishSidebar**
 
@@ -1143,10 +1194,6 @@ _Related_
 Returns an action object used in signalling that undo history should
 restore last popped state.
 
-_Returns_
-
--   `Object`: Action object.
-
 <a name="refreshPost" href="#refreshPost">#</a> **refreshPost**
 
 Action generator for handling refreshing the current post.
@@ -1205,10 +1252,6 @@ _Parameters_
 -   _blocks_ `Array`: Block Array.
 -   _options_ `?Object`: Optional options.
 
-_Returns_
-
--   `Object`: Action object
-
 <a name="resetPost" href="#resetPost">#</a> **resetPost**
 
 Returns an action object used in signalling that the latest version of the
@@ -1236,6 +1279,18 @@ _Related_
 
 -   selectBlock in core/block-editor store.
 
+<a name="serializeBlocks" href="#serializeBlocks">#</a> **serializeBlocks**
+
+Serializes blocks following backwards compatibility conventions.
+
+_Parameters_
+
+-   _blocksForSerialization_ `Array`: The blocks to serialize.
+
+_Returns_
+
+-   `string`: The blocks serialization.
+
 <a name="setTemplateValidity" href="#setTemplateValidity">#</a> **setTemplateValidity**
 
 _Related_
@@ -1322,10 +1377,6 @@ Action generator for trashing the current post in the editor.
 
 Returns an action object used in signalling that undo history should pop.
 
-_Returns_
-
--   `Object`: Action object.
-
 <a name="unlockPostSaving" href="#unlockPostSaving">#</a> **unlockPostSaving**
 
 Returns an action object used to signal that post saving is unlocked.

lib/blocks.php

@@ -46,6 +46,26 @@ function gutenberg_reregister_core_block_types() {
 }
 add_action( 'init', 'gutenberg_reregister_core_block_types' );
 
+/**
+ * Adds new block categories needed by the Gutenberg plugin.
+ *
+ * @param array $categories List of block categories.
+ *
+ * @return array List of block categories with the new categories added.
+ */
+function gutenberg_filter_block_categories( $categories ) {
+	return array_merge(
+		$categories,
+		array(
+			array(
+				'slug'  => 'theme',
+				'title' => __( 'Theme Blocks' ),
+			),
+		)
+	);
+}
+add_filter( 'block_categories', 'gutenberg_filter_block_categories' );
+
 /**
  * Registers a new block style.
  *

packages/block-editor/src/components/block-list/block.js

@@ -702,6 +702,7 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, { select } ) => {
 		replaceBlocks,
 		toggleSelection,
 		setNavigationMode,
+		__unstableMarkLastChangeAsPersistent,
 	} = dispatch( 'core/block-editor' );
 
 	return {
@@ -755,6 +756,12 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, { select } ) => {
 			}
 		},
 		onReplace( blocks, indexToSelect ) {
+			if (
+				blocks.length &&
+				! isUnmodifiedDefaultBlock( blocks[ blocks.length - 1 ] )
+			) {
+				__unstableMarkLastChangeAsPersistent();
+			}
 			replaceBlocks( [ ownProps.clientId ], blocks, indexToSelect );
 		},
 		onShiftSelection() {

packages/block-editor/src/components/inner-blocks/index.js

@@ -44,7 +44,8 @@ class InnerBlocks extends Component {
 	}
 
 	componentDidMount() {
-		const { innerBlocks } = this.props.block;
+		const { block, blocks, replaceInnerBlocks } = this.props;
+		const { innerBlocks } = block;
 		// only synchronize innerBlocks with template if innerBlocks are empty or a locking all exists
 		if ( innerBlocks.length === 0 || this.getTemplateLock() === 'all' ) {
 			this.synchronizeBlocksWithTemplate();
@@ -55,10 +56,23 @@ class InnerBlocks extends Component {
 				templateInProcess: false,
 			} );
 		}
+
+		// Set controlled blocks value from parent, if any.
+		if ( blocks ) {
+			replaceInnerBlocks( blocks );
+		}
 	}
 
 	componentDidUpdate( prevProps ) {
-		const { template, block } = this.props;
+		const {
+			block,
+			template,
+			isLastBlockChangePersistent,
+			resetEditorBlocks,
+			resetEditorBlocksWithoutUndoLevel,
+			blocks,
+			replaceInnerBlocks,
+		} = this.props;
 		const { innerBlocks } = block;
 
 		this.updateNestedSettings();
@@ -69,6 +83,31 @@ class InnerBlocks extends Component {
 				this.synchronizeBlocksWithTemplate();
 			}
 		}
+
+		// Sync with controlled blocks value from parent, if possible.
+		if ( this.isSyncingIncomingBlocks === innerBlocks ) {
+			this.isSyncingIncomingBlocks = null;
+		} else if ( prevProps.block.innerBlocks !== innerBlocks ) {
+			this.isSyncingIncomingBlocks = null;
+
+			const resetFunc = isLastBlockChangePersistent ?
+				resetEditorBlocks :
+				resetEditorBlocksWithoutUndoLevel;
+			if ( resetFunc ) {
+				this.isSyncingOutcomingBlocks = innerBlocks;
+				resetFunc( innerBlocks );
+			}
+		}
+
+		// Accept changes to controlled blocks value from parent after a sync, if any.
+		if ( this.isSyncingOutcomingBlocks === blocks ) {
+			this.isSyncingOutcomingBlocks = null;
+		} else if ( prevProps.blocks !== blocks ) {
+			this.isSyncingOutcomingBlocks = null;
+
+			this.isSyncingIncomingBlocks = blocks;
+			replaceInnerBlocks( blocks );
+		}
 	}
 
 	/**
@@ -151,6 +190,7 @@ InnerBlocks = compose( [
 			getBlockListSettings,
 			getBlockRootClientId,
 			getTemplateLock,
+			isLastBlockChangePersistent,
 		} = select( 'core/block-editor' );
 		const { clientId } = ownProps;
 		const block = getBlock( clientId );
@@ -161,6 +201,7 @@ InnerBlocks = compose( [
 			blockListSettings: getBlockListSettings( clientId ),
 			hasOverlay: block.name !== 'core/template' && ! isBlockSelected( clientId ) && ! hasSelectedInnerBlock( clientId, true ),
 			parentLock: getTemplateLock( rootClientId ),
+			isLastBlockChangePersistent: isLastBlockChangePersistent(),
 		};
 	} ),
 	withDispatch( ( dispatch, ownProps ) => {

packages/block-library/src/index.js

@@ -62,6 +62,10 @@ import * as tagCloud from './tag-cloud';
 
 import * as classic from './classic';
 
+// Custom Entity Blocks
+import * as post from './post';
+import * as postTitle from './post-title';
+
 /**
  * Function to register an individual block.
  *
@@ -138,6 +142,10 @@ export const registerCoreBlocks = () => {
 		textColumns,
 		verse,
 		video,
+
+		// Register Custom Entity Blocks.
+		post,
+		postTitle,
 	].forEach( registerBlock );
 
 	setDefaultBlockName( paragraph.name );

packages/block-library/src/post-title/block.json

@@ -0,0 +1,4 @@
+{
+	"name": "core/post-title",
+	"category": "theme"
+}

packages/block-library/src/post-title/edit.js

@@ -0,0 +1,29 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { RichText } from '@wordpress/block-editor';
+import { cleanForSlug } from '@wordpress/editor';
+import { __ } from '@wordpress/i18n';
+
+export default function PostTitleEdit() {
+	const title = useSelect(
+		( select ) => select( 'core/editor' ).getEditedEntityAttribute( 'title' ),
+		[]
+	);
+	const dispatch = useDispatch();
+	return (
+		<RichText
+			value={ title }
+			onChange={ ( value ) =>
+				dispatch( 'core/editor' ).editEntity( {
+					title: value,
+					slug: cleanForSlug( value ),
+				} )
+			}
+			tagName="h1"
+			placeholder={ __( 'Title' ) }
+			formattingControls={ [] }
+		/>
+	);
+}

packages/block-library/src/post-title/icon.js

@@ -0,0 +1,11 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/components';
+
+export default (
+	<SVG xmlns="https://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path fill="none" d="M0 0h24v24H0V0z" />
+		<Path d="M5 4v3h5.5v12h3V7H19V4H5z" />
+	</SVG>
+);

packages/block-library/src/post-title/index.js

@@ -0,0 +1,20 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import metadata from './block.json';
+import icon from './icon';
+import edit from './edit';
+
+const { name } = metadata;
+export { metadata, name };
+
+export const settings = {
+	title: __( 'Post Title' ),
+	icon,
+	edit,
+};