Reusable Blocks: Add reusable blocks UI

blocks/api/factory.js

@@ -142,7 +142,8 @@ export function switchToBlockType( blocks, name ) {
  */
 export function createReusableBlock( type, attributes ) {
 	return {
-		id: uuid(),
+		id: uuid(), // Temorary id replaced when the block is saved server side
+		isTemporary: true,
 		name: __( 'Untitled block' ),
 		type,
 		attributes,

blocks/api/index.js

@@ -14,5 +14,6 @@ export {
 	getBlockType,
 	getBlockTypes,
 	hasBlockSupport,
+	isReusableBlock,
 } from './registration';
 

blocks/api/registration.js

@@ -214,3 +214,15 @@ export function hasBlockSupport( nameOrType, feature, defaultSupports ) {
 		feature,
 	], defaultSupports );
 }
+
+/**
+ * Determines whether or not the given block is a reusable block. This is a
+ * special block type that is used to point to a global block stored via the
+ * API.
+ * 
+ * @param {Object} blockOrType Block or Block Type to test
+ * @return {Boolean}           Whether the given block is a reusable block
+ */
+export function isReusableBlock( blockOrType ) {
+	return blockOrType.name === 'core/block';
+}

blocks/api/test/registration.js

@@ -18,6 +18,7 @@ import {
 	getBlockType,
 	getBlockTypes,
 	hasBlockSupport,
+	isReusableBlock,
 } from '../registration';
 
 describe( 'blocks', () => {
@@ -412,4 +413,16 @@ describe( 'blocks', () => {
 			expect( hasBlockSupport( settings, 'foo' ) ).toBe( true );
 		} );
 	} );
+
+	describe( 'isReusableBlock', () => {
+		it( 'should return true for a reusable block', () => {
+			const block = { name: 'core/block' };
+			expect( isReusableBlock( block ) ).toBe( true );
+		} );
+
+		it( 'should return false for other blocks', () => {
+			const block = { name: 'core/paragraph' };
+			expect( isReusableBlock( block ) ).toBe( false );
+		} );
+	} );
 } );

blocks/library/block/edit-panel/index.js

@@ -0,0 +1,68 @@
+/**
+ * WordPress dependencies
+ */
+import { Button } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import './style.scss';
+
+function ReusableBlockEditPanel( props ) {
+	const { isEditing, name, isSaving, onEdit, onDetach, onChangeName, onSave, onCancel } = props;
+
+	return (
+		<div className="reusable-block-edit-panel">
+			{ ! isEditing && ! isSaving && [
+				<span key="info" className="reusable-block-edit-panel__info">
+					<b>{ name }</b>
+				</span>,
+				<Button
+					key="edit"
+					isLarge
+					className="reusable-block-edit-panel__button"
+					onClick={ onEdit }>
+					{ __( 'Edit' ) }
+				</Button>,
+				<Button
+					key="detach"
+					isLarge
+					className="reusable-block-edit-panel__button"
+					onClick={ onDetach }>
+					{ __( 'Detach' ) }
+				</Button>,
+			] }
+			{ ( isEditing || isSaving ) && [
+				<input
+					key="name"
+					type="text"
+					disabled={ isSaving }
+					className="reusable-block-edit-panel__name"
+					value={ name }
+					onChange={ ( event ) => onChangeName( event.target.value ) } />,
+				<Button
+					key="save"
+					isPrimary
+					isLarge
+					isBusy={ isSaving }
+					disabled={ ! name || isSaving }
+					className="reusable-block-edit-panel__button"
+					onClick={ onSave }>
+					{ __( 'Save' ) }
+				</Button>,
+				<Button
+					key="cancel"
+					isLarge
+					disabled={ isSaving }
+					className="reusable-block-edit-panel__button"
+					onClick={ onCancel }>
+					{ __( 'Cancel' ) }
+				</Button>,
+			] }
+		</div>
+	);
+}
+
+export default ReusableBlockEditPanel;
+

blocks/library/block/edit-panel/style.scss

@@ -0,0 +1,32 @@
+.reusable-block-edit-panel {
+	align-items: center;
+	background: $light-gray-100;
+	color: $dark-gray-500;
+	display: flex;
+	font-family: $default-font;
+	font-size: $default-font-size;
+	justify-content: flex-end;
+	margin: $block-padding (-$block-padding) (-$block-padding);
+	padding: 10px $block-padding;
+
+	.reusable-block-edit-panel__spinner {
+		margin: 0 5px;
+	}
+
+	.reusable-block-edit-panel__info {
+		margin-right: auto;
+	}
+
+	.reusable-block-edit-panel__name {
+		flex-grow: 1;
+		font-size: 14px;
+		height: 30px;
+		margin: 0 auto 0 0;
+		max-width: 230px;
+	}
+
+	// Needs specificity to override the margin-bottom set by .button
+	.wp-core-ui & .reusable-block-edit-panel__button {
+		margin: 0 0 0 5px;
+	}
+}

blocks/library/block/index.js

@@ -0,0 +1,172 @@
+/**
+ * External dependencies
+ */
+import { pickBy, noop } from 'lodash';
+import { connect } from 'react-redux';
+import classnames from 'classnames';
+
+/**
+ * WordPress dependencies
+ */
+import { Component } from '@wordpress/element';
+import { Placeholder, Spinner } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { getBlockType, registerBlockType, hasBlockSupport, getBlockDefaultClassname } from '../../api';
+import ReusableBlockEditPanel from './edit-panel';
+
+class ReusableBlockEdit extends Component {
+	constructor() {
+		super( ...arguments );
+
+		this.startEditing = this.startEditing.bind( this );
+		this.stopEditing = this.stopEditing.bind( this );
+		this.setAttributes = this.setAttributes.bind( this );
+		this.setName = this.setName.bind( this );
+		this.updateReusableBlock = this.updateReusableBlock.bind( this );
+
+		this.state = {
+			isEditing: false,
+			name: null,
+			attributes: null,
+		};
+	}
+
+	componentDidMount() {
+		if ( ! this.props.reusableBlock ) {
+			this.props.fetchReusableBlock();
+		}
+	}
+
+	startEditing() {
+		this.setState( { isEditing: true } );
+	}
+
+	stopEditing() {
+		this.setState( {
+			isEditing: false,
+			name: null,
+			attributes: null,
+		} );
+	}
+
+	setAttributes( attributes ) {
+		this.setState( ( prevState ) => ( {
+			attributes: { ...prevState.attributes, ...attributes },
+		} ) );
+	}
+
+	setName( name ) {
+		this.setState( { name } );
+	}
+
+	updateReusableBlock() {
+		const { name, attributes } = this.state;
+
+		// Use pickBy to include only changed (assigned) values in payload
+		const payload = pickBy( {
+			name,
+			attributes,
+		} );
+
+		this.props.updateReusableBlock( payload );
+		this.props.saveReusableBlock();
+		this.stopEditing();
+	}
+
+	render() {
+		const { focus, reusableBlock, isSaving, convertBlockToStatic } = this.props;
+		const { isEditing, name, attributes } = this.state;
+
+		if ( ! reusableBlock ) {
+			return <Placeholder><Spinner /></Placeholder>;
+		}
+
+		const reusableBlockAttributes = { ...reusableBlock.attributes, ...attributes };
+		const blockType = getBlockType( reusableBlock.type );
+		const BlockEdit = blockType.edit || blockType.save;
+
+		// Generate a class name for the block's editable form
+		const generatedClassName = hasBlockSupport( blockType, 'className', true ) ?
+			getBlockDefaultClassname( reusableBlock.type ) :
+			null;
+		const className = classnames( generatedClassName, reusableBlockAttributes.className );
+		return [
+			// We fake the block being read-only by wrapping it with an element that has pointer-events: none
+			<div key="edit" style={ { pointerEvents: isEditing ? 'auto' : 'none' } }>
+				<BlockEdit
+					{ ...this.props }
+					focus={ isEditing ? focus : null }
+					attributes={ reusableBlockAttributes }
+					setAttributes={ isEditing ? this.setAttributes : noop }
+					className={ className }
+				/>
+			</div>,
+			focus && (
+				<ReusableBlockEditPanel
+					key="panel"
+					isEditing={ isEditing }
+					name={ name !== null ? name : reusableBlock.name }
+					isSaving={ isSaving }
+					onEdit={ this.startEditing }
+					onDetach={ convertBlockToStatic }
+					onChangeName={ this.setName }
+					onSave={ this.updateReusableBlock }
+					onCancel={ this.stopEditing }
+				/>
+			),
+		];
+	}
+}
+
+const ConnectedReusableBlockEdit = connect(
+	( state, ownProps ) => ( {
+		reusableBlock: state.reusableBlocks.data[ ownProps.attributes.ref ],
+		isSaving: state.reusableBlocks.isSaving[ ownProps.attributes.ref ],
+	} ),
+	( dispatch, ownProps ) => ( {
+		fetchReusableBlock() {
+			dispatch( {
+				type: 'FETCH_REUSABLE_BLOCKS',
+				id: ownProps.attributes.ref,
+			} );
+		},
+		updateReusableBlock( reusableBlock ) {
+			dispatch( {
+				type: 'UPDATE_REUSABLE_BLOCK',
+				id: ownProps.attributes.ref,
+				reusableBlock,
+			} );
+		},
+		saveReusableBlock() {
+			dispatch( {
+				type: 'SAVE_REUSABLE_BLOCK',
+				id: ownProps.attributes.ref,
+			} );
+		},
+		convertBlockToStatic() {
+			dispatch( {
+				type: 'CONVERT_BLOCK_TO_STATIC',
+				uid: ownProps.id,
+			} );
+		},
+	} )
+)( ReusableBlockEdit );
+
+registerBlockType( 'core/block', {
+	title: __( 'Reusable Block' ),
+	category: 'reusable-blocks',
+	isPrivate: true,
+
+	attributes: {
+		ref: {
+			type: 'string',
+		},
+	},
+
+	edit: ConnectedReusableBlockEdit,
+	save: () => null,
+} );

blocks/library/block/index.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Server-side rendering of the `core/block` block.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Renders the `core/block` block on server.
+ *
+ * @param array $attributes The block attributes.
+ *
+ * @return string Rendered HTML of the referenced block.
+ */
+function gutenberg_render_block_core_reusable_block( $attributes ) {
+	$reusable_block = get_post( $attributes['ref'] );
+	if ( ! $reusable_block ) {
+		return '';
+	}
+
+	$blocks = gutenberg_parse_blocks( $reusable_block->post_content );
+
+	$block = array_shift( $blocks );
+	if ( ! $block ) {
+		return '';
+	}
+
+	return gutenberg_render_block( $block );
+}
+
+register_block_type( 'core/block', array(
+	'attributes'      => array(
+		'ref' => array(
+			'type' => 'string',
+		),
+	),
+
+	'render_callback' => 'gutenberg_render_block_core_reusable_block',
+) );

blocks/library/index.js

@@ -21,5 +21,5 @@ import './text-columns';
 import './verse';
 import './video';
 import './audio';
-import './reusable-block';
+import './block';
 import './paragraph';