Blocks: Merge paragraph and cover text blocks

WordPress · Aug 17, 2017 · d81b784 · d81b784
1 parent de51e24
commit d81b784
Show file tree

Hide file tree

Showing 19 changed files with 99 additions and 278 deletions.
diff --git a/blocks/api/parser.js b/blocks/api/parser.js
@@ -162,7 +162,7 @@ export function createBlockWithFallback( name, rawContent, attributes ) {
 
 	// Convert 'core/text' blocks in existing content to the new
 	// 'core/paragraph'.
-	if ( name === 'core/text' ) {
+	if ( name === 'core/text' || name === 'core/cover-text' ) {
 		name = 'core/paragraph';
 	}
 

diff --git a/blocks/editable/index.js b/blocks/editable/index.js
@@ -551,6 +551,7 @@ export default class Editable extends Component {
 			style,
 			value,
 			focus,
+			wrapperClassname,
 			className,
 			inlineToolbar = false,
 			formattingControls,
@@ -563,7 +564,7 @@ export default class Editable extends Component {
 		// mount and initialize a new child element in its place.
 		const key = [ 'editor', Tagname ].join();
 		const isPlaceholderVisible = placeholder && ! focus && this.state.empty;
-		const classes = classnames( className, 'blocks-editable' );
+		const classes = classnames( wrapperClassname, 'blocks-editable' );
 
 		const formatToolbar = (
 			<FormatToolbar
@@ -595,6 +596,7 @@ export default class Editable extends Component {
 					defaultValue={ value }
 					isPlaceholderVisible={ isPlaceholderVisible }
 					label={ placeholder }
+					className={ className }
 					key={ key }
 				/>
 				{ isPlaceholderVisible &&

diff --git a/blocks/editable/tinymce.js b/blocks/editable/tinymce.js
@@ -34,6 +34,10 @@ export default class TinyMCE extends Component {
 		if ( ! isEqual( this.props.style, nextProps.style ) ) {
 			Object.assign( this.editorNode.style, nextProps.style );
 		}
+
+		if ( ! isEqual( this.props.className, nextProps.className ) ) {
+			this.editorNode.className = classnames( nextProps.className, 'blocks-editable__tinymce' );
+		}
 	}
 
 	componentWillUnmount() {

diff --git a/blocks/inspector-controls/range-control/index.js b/blocks/inspector-controls/range-control/index.js
@@ -1,15 +1,16 @@
 /**
  * WordPress dependencies
  */
-import { Dashicon, withInstanceId } from '@wordpress/components';
+import { Dashicon, withInstanceId, Button } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import BaseControl from './../base-control';
 import './style.scss';
 
-function RangeControl( { label, value, instanceId, onChange, beforeIcon, afterIcon, ...props } ) {
+function RangeControl( { label, value, instanceId, onChange, beforeIcon, afterIcon, allowReset, ...props } ) {
 	const id = 'inspector-range-control-' + instanceId;
 	const onChangeValue = ( event ) => onChange( Number( event.target.value ) );
 
@@ -31,6 +32,11 @@ function RangeControl( { label, value, instanceId, onChange, beforeIcon, afterIc
 				value={ value }
 				{ ...props }
 			/>
+			{ allowReset &&
+				<Button onClick={ () => onChange() } disabled={ value === undefined }>
+					{ __( 'Reset' ) }
+				</Button>
+			}
 		</BaseControl>
 	);
 }

diff --git a/blocks/library/cover-text/editor.scss b/blocks/library/cover-text/editor.scss
diff --git a/blocks/library/cover-text/index.js b/blocks/library/cover-text/index.js
diff --git a/blocks/library/cover-text/style.scss b/blocks/library/cover-text/style.scss
diff --git a/blocks/library/index.js b/blocks/library/index.js
@@ -17,7 +17,6 @@ import './freeform';
 import './latest-posts';
 import './categories';
 import './cover-image';
-import './cover-text';
 import './shortcode';
 import './text-columns';
 import './verse';

diff --git a/blocks/library/list/index.js b/blocks/library/list/index.js
@@ -318,7 +318,7 @@ registerBlockType( 'core/list', {
 					value={ values }
 					focus={ focus }
 					onFocus={ setFocus }
-					className="blocks-list"
+					wrapperClassname="blocks-list"
 					placeholder={ __( 'Write list…' ) }
 					onMerge={ mergeBlocks }
 					onSplit={ ( before, after, ...blocks ) => {