Merge branch 'master' into add/440-script-versioning-cachebust

Author: kopepasah

blocks/components/editable/index.js

@@ -153,12 +153,8 @@ export default class Editable extends wp.element.Component {
 		if ( this.props.onMerge && event.keyCode === KEYCODE_BACKSPACE && this.isStartOfEditor() ) {
 			this.onChange();
 			this.props.onMerge( this.editor.getContent() );
-
-			// If merge causes editor to be removed, stop other callbacks from
-			// trying to handle the event
-			if ( this.editor.removed ) {
-				event.stopImmediatePropagation();
-			}
+			event.preventDefault();
+			event.stopImmediatePropagation();
 		}
 	}
 
@@ -266,8 +262,14 @@ export default class Editable extends wp.element.Component {
 	}
 
 	focus() {
-		if ( this.props.focus ) {
+		const { focus } = this.props;
+		if ( focus ) {
 			this.editor.focus();
+			// Offset = -1 means we should focus the end of the editable
+			if ( focus.offset === -1 ) {
+				this.editor.selection.select( this.editor.getBody(), true );
+				this.editor.selection.collapse( false );
+			}
 		}
 	}
 

blocks/library/quote/index.js

@@ -74,12 +74,12 @@ registerBlock( 'core/quote', {
 		);
 	},
 
-	save( attributes ) {
+	save( { attributes } ) {
 		const { value, citation, style = 1 } = attributes;
 
 		return (
 			<blockquote className={ `blocks-quote-style-${ style }` }>
-				{ value && value.map( ( paragraph, i ) => (
+				{ value && wp.element.Children.map( value, ( paragraph, i ) => (
 					<p key={ i }>{ paragraph }</p>
 				) ) }
 				<footer>{ citation }</footer>

editor/components/toolbar/style.scss

@@ -5,7 +5,7 @@
 	background-color: $white;
 }
 
-.editor-toolbar__control {
+.editor-toolbar__control.editor-button {
 	display: inline-flex;
 	margin: 3px;
 	margin-left: 0;
@@ -24,7 +24,7 @@
 	&.is-active,
 	&:hover,
 	&:not(:disabled):hover {
-		border-color: $dark-gray-500;
+		border: 1px solid $dark-gray-500;
 		color: $dark-gray-500;
 	}
 

editor/modes/visual-editor/block.js

@@ -4,6 +4,7 @@
 import { connect } from 'react-redux';
 import classnames from 'classnames';
 import { Slot } from 'react-slot-fill';
+import { partial } from 'lodash';
 
 /**
  * Internal dependencies
@@ -63,7 +64,7 @@ class VisualEditorBlock extends wp.element.Component {
 	}
 
 	mergeWithPrevious() {
-		const { block, previousBlock, onRemove, onChange } = this.props;
+		const { block, previousBlock, onRemove, onChange, onFocus } = this.props;
 
 		// Do nothing when it's the first block
 		if ( ! previousBlock ) {
@@ -90,6 +91,7 @@ class VisualEditorBlock extends wp.element.Component {
 
 		// Calling the merge to update the attributes and remove the block to be merged
 		const updatedAttributes = previousBlockSettings.merge( previousBlock.attributes, blockWithTheSameType.attributes );
+		onFocus( previousBlock.uid, { offset: -1 } );
 		onChange( previousBlock.uid, {
 			attributes: {
 				...previousBlock.attributes,
@@ -174,7 +176,7 @@ class VisualEditorBlock extends wp.element.Component {
 					attributes={ block.attributes }
 					setAttributes={ this.setAttributes }
 					insertBlockAfter={ onInsertAfter }
-					setFocus={ onFocus }
+					setFocus={ partial( onFocus, block.uid ) }
 					mergeWithPrevious={ this.mergeWithPrevious }
 				/>
 			</div>
@@ -247,10 +249,10 @@ export default connect(
 			} );
 		},
 
-		onFocus( config ) {
+		onFocus( uid, config ) {
 			dispatch( {
 				type: 'UPDATE_FOCUS',
-				uid: ownProps.uid,
+				uid,
 				config
 			} );
 		},