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,32 @@ _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="getCurrentEntityKind" href="#getCurrentEntityKind">#</a> **getCurrentEntityKind**
+
+Returns the kind of the entity currently being edited, or null if the entity has
+not yet been saved.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+
+_Returns_
+
+-   `?string`: The entity kind.
+
 <a name="getCurrentPost" href="#getCurrentPost">#</a> **getCurrentPost**
 
 Returns the post currently being edited in its last known saved state, not
@@ -244,7 +272,7 @@ _Returns_
 
 <a name="getCurrentPostId" href="#getCurrentPostId">#</a> **getCurrentPostId**
 
-Returns the ID of the post currently being edited, or null if the post has
+Returns the ID of the post currently being edited, or undefined if the post has
 not yet been saved.
 
 _Parameters_
@@ -292,6 +320,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 +352,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 +424,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 +798,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 +1091,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 +1207,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 +1265,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 +1292,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 +1390,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

@@ -28,6 +28,7 @@ function gutenberg_reregister_core_block_types() {
 		'shortcode.php'       => 'core/shortcode',
 		'search.php'          => 'core/search',
 		'tag-cloud.php'       => 'core/tag-cloud',
+		'site-title.php'      => 'core/site-title',
 	);
 
 	$registry = WP_Block_Type_Registry::get_instance();
@@ -46,6 +47,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/README.md

@@ -210,6 +210,12 @@ _Returns_
 
 Undocumented declaration.
 
+<a name="EntityProvider" href="#EntityProvider">#</a> **EntityProvider**
+
+Context provider component for providing
+the implementations of the entity getter
+and setters.
+
 <a name="FontSizePicker" href="#FontSizePicker">#</a> **FontSizePicker**
 
 Undocumented declaration.
@@ -438,6 +444,62 @@ _Related_
 
 -   <https://github.com/WordPress/gutenberg/blob/master/packages/block-editor/src/components/url-popover/README.md>
 
+<a name="useCurrentEntityAttribute" href="#useCurrentEntityAttribute">#</a> **useCurrentEntityAttribute**
+
+Hook for getting the currently persisted value
+for an entity attribute.
+
+If there is no provider or it does not provide
+an implementation for the required hook,
+undefined is returned.
+
+_Parameters_
+
+-   _args_ `...*`: Any arguments the implementation might require.
+
+_Returns_
+
+-   `*`: The value.
+
+<a name="useEditedEntityAttribute" href="#useEditedEntityAttribute">#</a> **useEditedEntityAttribute**
+
+Hook for getting the edited value for an entity attribute,
+falling back to the persisted value if there isn't
+one.
+
+If there is no provider or it does not provide
+an implementation for the required hook,
+undefined is returned.
+
+_Parameters_
+
+-   _args_ `...*`: Any arguments the implementation might require.
+
+_Returns_
+
+-   `*`: The value.
+
+<a name="useEditEntity" href="#useEditEntity">#</a> **useEditEntity**
+
+Hook for accessing the entity's main edit function.
+
+If there is no provider or it does not provide
+an implementation for the required hook,
+a "noop" function is returned.
+
+_Returns_
+
+-   `Function`: The function or "noop".
+
+<a name="useEntity" href="#useEntity">#</a> **useEntity**
+
+Hook for accessing the entity getters and setters
+provided by the nearest parent entity provider.
+
+_Returns_
+
+-   `Object`: The object with getters and setters.
+
 <a name="Warning" href="#Warning">#</a> **Warning**
 
 Undocumented declaration.

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() {