Editor: Integrate post-title and post-content with custom sources.

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

@@ -1,4 +1,5 @@
 {
 	"name": "core/post-content",
-	"category": "common"
+	"category": "common",
+	"multiple": false
 }

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

@@ -3,7 +3,9 @@
 	"category": "common",
 	"attributes": {
 		"title": {
-			"type": "string"
+			"type": "string",
+			"source": "post",
+			"attribute": "title"
 		}
 	}
 }

packages/blocks/src/api/templates.js

@@ -55,14 +55,21 @@ export function synchronizeBlocksWithTemplate( blocks = [], template ) {
 	}
 
 	return map( template, ( templateBlock, index ) => {
-		const [ name, attributes, innerBlocksTemplate ] = Array.isArray( templateBlock ) ?
+		const [ name, attributes, _innerBlocksTemplate ] = Array.isArray( templateBlock ) ?
 			templateBlock :
-			[ templateBlock.name, templateBlock.attributes, templateBlock.innerBlocksTemplate ];
+			[ templateBlock.name, templateBlock.attributes, templateBlock.innerBlocks ];
 		const block = blocks[ index ];
+		let innerBlocksTemplate = _innerBlocksTemplate;
 
-		if ( block && block.name === name ) {
-			const innerBlocks = synchronizeBlocksWithTemplate( block.innerBlocks, innerBlocksTemplate );
-			return { ...block, innerBlocks };
+		if ( block ) {
+			if ( block.name === name ) {
+				const innerBlocks = synchronizeBlocksWithTemplate( block.innerBlocks, innerBlocksTemplate );
+				return { ...block, innerBlocks };
+			}
+
+			if ( 'core/post-content' === name ) {
+				innerBlocksTemplate = blocks;
+			}
 		}
 
 		// To support old templates that were using the "children" format

packages/editor/src/store/actions.js

@@ -12,6 +12,7 @@ import { dispatch, select, apiFetch } from '@wordpress/data-controls';
 import {
 	parse,
 	synchronizeBlocksWithTemplate,
+	serialize,
 } from '@wordpress/blocks';
 import isShallowEqual from '@wordpress/is-shallow-equal';
 
@@ -453,7 +454,8 @@ export function* savePost( options = {} ) {
 				content: editedPostContent,
 			},
 		} );
-		editedPostContent = '';
+		const postContentBlock = ( yield select( STORE_KEY, 'getBlocksForSerialization' ) ).find( ( block ) => block.name === 'core/post-content' );
+		editedPostContent = postContentBlock ? serialize( postContentBlock.innerBlocks ) : '';
 	}
 
 	let toSend = {

packages/editor/src/store/block-sources/index.js

@@ -1,6 +1,7 @@
 /**
  * Internal dependencies
  */
+import * as post from './post';
 import * as meta from './meta';
 
-export { meta };
+export { post, meta };

packages/editor/src/store/block-sources/post.js

@@ -0,0 +1,46 @@
+/**
+ * External dependencies
+ */
+import { get, set } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { select } from '@wordpress/data-controls';
+
+/**
+ * Internal dependencies
+ */
+import { editPost } from '../actions';
+import { EDIT_MERGE_PROPERTIES } from '../constants';
+
+export function* getDependencies() {
+	return {
+		post: yield select( 'core/editor', 'getCurrentPost' ),
+		content: yield select( 'core/editor', 'getEditedPostContent' ),
+		edits: yield select( 'core/editor', 'getPostEdits' ),
+	};
+}
+
+export function apply( { attribute }, { post, content, edits } ) {
+	if ( 'content' === attribute ) {
+		return content;
+	}
+
+	if ( undefined === get( edits, attribute ) ) {
+		return get( post, attribute );
+	}
+
+	if ( EDIT_MERGE_PROPERTIES.has( attribute ) ) {
+		return {
+			...get( post, attribute ),
+			...get( edits, attribute ),
+		};
+	}
+
+	return get( edits, attribute );
+}
+
+export function* update( { attribute }, value ) {
+	yield editPost( set( {}, attribute, value ) );
+}